mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-07 07:58:51 +00:00
Code Issues 1 Projects Releases Wiki Activity

configure.ac: bump required gstreamer version to 0.8.1.1 because of following changes [--ds]

Browse source 
Original commit message from CVS:
reviewed by David Schleef
* configure.ac: bump required gstreamer version to 0.8.1.1
because of following changes [--ds]
* gst-libs/gst/riff/riff-read.c:  Include gst/gstutils.h.
(gst_riff_peek_head, gst_riff_peek_list, gst_riff_read_list)
(gst_riff_read_header):  Use GST_READ_UINT*
macros to access possibly unaligned memory.
* gst/typefind/gsttypefindfunctions.c: Include gst/gstutils.h.
(mp3_type_find):  Use GST_READ_UINT*
macros to access possibly unaligned memory.
(mp3_type_find, mpeg1_parse_header, qt_type_find)
(speex_type_find): Likewise
* gst/tags/gstvorbistag.c: (ADVANCE): Likewise
* gst/qtdemux/qtdemux.c: Include stdlib.h (needed by realloc).
(QTDEMUX_GUINT32_GET, QTDEMUX_GUINT16_GET, QTDEMUX_FP32_GET)
(QTDEMUX_FP16_GET, QTDEMUX_FOURCC_GET)
(gst_qtdemux_loop_header, gst_qtdemux_loop_header)
(qtdemux_node_dump_foreach, qtdemux_tree_get_child_by_type)
(qtdemux_tree_get_sibling_by_type):  Use GST_READ_UINT*
macros to access possibly unaligned memory.
* gst/mpegstream/gstmpegpacketize.c: (parse_generic, parse_chunk):
Likewise.
* gst/mpegstream/gstmpegdemux.c: (gst_mpeg_demux_parse_syshead)
(gst_mpeg_demux_parse_packet, gst_mpeg_demux_parse_pes): Likewise.
* gst/mpegaudioparse/gstmpegaudioparse.c: (gst_mp3parse_chain):
Likewise.
* gst/mpeg2sub/gstmpeg2subt.c: (GST_BUFFER_DATA)
(gst_mpeg2subt_chain_subtitle): Likewise.
* gst/mpeg1videoparse/gstmp1videoparse.c: (mp1videoparse_parse_seq)
(gst_mp1videoparse_time_code, gst_mp1videoparse_real_chain):
Likewise.
* gst/mpeg1sys/buffer.c: (mpeg1mux_buffer_update_audio_info):
Likewise.
* gst/cdxaparse/gstcdxaparse.c: (gst_bytestream_peek_bytes):
Likewise.
* gst/asfdemux/gstasfdemux.c: (_read_var_length, _read_uint):
Likewise.
This commit is contained in:
David Schleef 2004-04-20 21:04:22 +00:00
parent f65ea43ace
commit f1b6c80c23
7 changed files with 74 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
ChangeLog
View file

@ -1,3 +1,56 @@
2004-04-20 Daniel Gazard <daniel.gazard@epita.fr>
reviewed by David Schleef
* configure.ac: bump required gstreamer version to 0.8.1.1
because of following changes [--ds]
* gst-libs/gst/riff/riff-read.c: Include gst/gstutils.h.
(gst_riff_peek_head, gst_riff_peek_list, gst_riff_read_list)
(gst_riff_read_header): Use GST_READ_UINT*
macros to access possibly unaligned memory.
* gst/typefind/gsttypefindfunctions.c: Include gst/gstutils.h.
(mp3_type_find): Use GST_READ_UINT*
macros to access possibly unaligned memory.
(mp3_type_find, mpeg1_parse_header, qt_type_find)
(speex_type_find): Likewise
* gst/tags/gstvorbistag.c: (ADVANCE): Likewise
* gst/qtdemux/qtdemux.c: Include stdlib.h (needed by realloc).
(QTDEMUX_GUINT32_GET, QTDEMUX_GUINT16_GET, QTDEMUX_FP32_GET)
(QTDEMUX_FP16_GET, QTDEMUX_FOURCC_GET)
(gst_qtdemux_loop_header, gst_qtdemux_loop_header)
(qtdemux_node_dump_foreach, qtdemux_tree_get_child_by_type)
(qtdemux_tree_get_sibling_by_type): Use GST_READ_UINT*
macros to access possibly unaligned memory.
* gst/mpegstream/gstmpegpacketize.c: (parse_generic, parse_chunk):
Likewise.
* gst/mpegstream/gstmpegdemux.c: (gst_mpeg_demux_parse_syshead)
(gst_mpeg_demux_parse_packet, gst_mpeg_demux_parse_pes): Likewise.
* gst/mpegaudioparse/gstmpegaudioparse.c: (gst_mp3parse_chain):
Likewise.
* gst/mpeg2sub/gstmpeg2subt.c: (GST_BUFFER_DATA)
(gst_mpeg2subt_chain_subtitle): Likewise.
* gst/mpeg1videoparse/gstmp1videoparse.c: (mp1videoparse_parse_seq)
(gst_mp1videoparse_time_code, gst_mp1videoparse_real_chain):
Likewise.
* gst/mpeg1sys/buffer.c: (mpeg1mux_buffer_update_audio_info):
Likewise.
* gst/cdxaparse/gstcdxaparse.c: (gst_bytestream_peek_bytes):
Likewise.
* gst/asfdemux/gstasfdemux.c: (_read_var_length, _read_uint):
Likewise.
2004-04-20 Thomas Vander Stichele <thomas at apestaart dot org> 2004-04-20 Thomas Vander Stichele <thomas at apestaart dot org>
* configure.ac: * configure.ac:

2
configure.ac
View file

@ -188,7 +188,7 @@ GST_CHECK_FEATURE(GCONF, [GConf libraries], , [
]) ])
dnl check for gstreamer; uninstalled is selected preferentially -- see pkg-config(1) dnl check for gstreamer; uninstalled is selected preferentially -- see pkg-config(1)
GST_REQ=0.8.1 GST_REQ=0.8.1.1
PKG_CHECK_MODULES(GST, gstreamer-$GST_MAJORMINOR >= $GST_REQ, PKG_CHECK_MODULES(GST, gstreamer-$GST_MAJORMINOR >= $GST_REQ,
HAVE_GST="yes", HAVE_GST="no") HAVE_GST="yes", HAVE_GST="no")

11
gst-libs/gst/riff/riff-read.c
View file

@ -24,6 +24,7 @@
#endif #endif
#include <string.h> #include <string.h>
#include <gst/gstutils.h>
#include "riff-ids.h" #include "riff-ids.h"
#include "riff-read.h" #include "riff-read.h"
@ -173,9 +174,9 @@ gst_riff_peek_head (GstRiffRead * riff,
} }
/* parse tag + length (if wanted) */ /* parse tag + length (if wanted) */
*tag = GUINT32_FROM_LE (((guint32 *) data)[0]); *tag = GST_READ_UINT32_LE (data);
if (length) if (length)
*length = GUINT32_FROM_LE (((guint32 *) data)[1]); *length = GST_READ_UINT32_LE (((guint32 *) data) + 1);
/* level */ /* level */
if (level_up) if (level_up)
@ -302,7 +303,7 @@ gst_riff_peek_list (GstRiffRead * riff)
return 0; return 0;
} }
return GUINT32_FROM_LE (((guint32 *) data)[2]); return GST_READ_UINT32_LE (((guint32 *) data) + 2);
} }
/* /*
@ -672,7 +673,7 @@ gst_riff_read_list (GstRiffRead * riff, guint32 * tag)
return FALSE; return FALSE;
} }
gst_bytestream_flush_fast (riff->bs, 4); gst_bytestream_flush_fast (riff->bs, 4);
*tag = GUINT32_FROM_LE (*(guint32 *) data); *tag = GST_READ_UINT32_LE (data);
/* remember level */ /* remember level */
level = g_new (GstRiffLevel, 1); level = g_new (GstRiffLevel, 1);
@ -868,7 +869,7 @@ gst_riff_read_header (GstRiffRead * riff, guint32 * doctype)
return FALSE; return FALSE;
} }
gst_bytestream_flush_fast (riff->bs, 4); gst_bytestream_flush_fast (riff->bs, 4);
*doctype = GUINT32_FROM_LE (*(guint32 *) data); *doctype = GST_READ_UINT32_LE (data);
/* remember level */ /* remember level */
level = g_new (GstRiffLevel, 1); level = g_new (GstRiffLevel, 1);

13
gst/asfdemux/gstasfdemux.c
View file

@ -21,6 +21,7 @@
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "config.h" #include "config.h"
#endif #endif
#include <gst/gstutils.h>
#include <gst/riff/riff-ids.h> #include <gst/riff/riff-ids.h>
#include "gstasfdemux.h" #include "gstasfdemux.h"
#include "gstasfmux.h" /* for the type registering */ #include "gstasfmux.h" /* for the type registering */
@ -276,17 +277,17 @@ _read_var_length (GstASFDemux * asf_demux, guint8 type, guint32 * rsize)
switch (type) { switch (type) {
case 1: case 1:
ret = GUINT32_FROM_LE (*(guint32 *) var) & 0xff; ret = (GST_READ_UINT32_LE (var)) & 0xff;
gst_bytestream_flush (bs, 1); gst_bytestream_flush (bs, 1);
*rsize += 1; *rsize += 1;
break; break;
case 2: case 2:
ret = GUINT32_FROM_LE (*(guint32 *) var) & 0xffff; ret = (GST_READ_UINT32_LE (var)) & 0xffff;
gst_bytestream_flush (bs, 2); gst_bytestream_flush (bs, 2);
*rsize += 2; *rsize += 2;
break; break;
case 3: case 3:
ret = GUINT32_FROM_LE (*(guint32 *) var); ret = GST_READ_UINT32_LE (var);
gst_bytestream_flush (bs, 4); gst_bytestream_flush (bs, 4);
*rsize += 4; *rsize += 4;
break; break;
@ -307,7 +308,7 @@ _read_uint ## bits (GstASFDemux *asf_demux, guint ## bits *ret) \
\ \
do { \ do { \
if (gst_bytestream_peek_bytes (asf_demux->bs, &data, bits / 8) == bits / 8) { \ if (gst_bytestream_peek_bytes (asf_demux->bs, &data, bits / 8) == bits / 8) { \
*ret = GUINT ## bits ## _FROM_LE (*((guint ## bits *) data)); \ *ret = GST_READ_UINT ## bits ## _LE (data); \
gst_bytestream_flush (asf_demux->bs, bits / 8); \ gst_bytestream_flush (asf_demux->bs, bits / 8); \
return TRUE; \ return TRUE; \
} \ } \
@ -317,9 +318,7 @@ _read_uint ## bits (GstASFDemux *asf_demux, guint ## bits *ret) \
return FALSE; \ return FALSE; \
} }
#ifndef GUINT8_FROM_LE #define GST_READ_UINT8_LE(x) GST_READ_UINT8(x)
# define GUINT8_FROM_LE(x) (x)
#endif
READ_UINT_BITS_FUNCTION (8) READ_UINT_BITS_FUNCTION (8)
READ_UINT_BITS_FUNCTION (16) READ_UINT_BITS_FUNCTION (16)
READ_UINT_BITS_FUNCTION (32) READ_UINT_BITS_FUNCTION (32)

4
gst/mpegaudioparse/gstmpegaudioparse.c
View file

@ -336,7 +336,7 @@ gst_mp3parse_chain (GstPad * pad, GstData * _data)
GST_DEBUG ("mp3parse: **** now at %ld skipped %d bytes", offset, skipped); GST_DEBUG ("mp3parse: **** now at %ld skipped %d bytes", offset, skipped);
} }
/* construct the header word */ /* construct the header word */
header = GUINT32_FROM_BE (*((guint32 *) (data + offset))); header = GST_READ_UINT32_BE (data + offset);
/* if it's a valid header, go ahead and send off the frame */ /* if it's a valid header, go ahead and send off the frame */
if (head_check (header)) { if (head_check (header)) {
/* calculate the bpf of the frame */ /* calculate the bpf of the frame */
@ -362,7 +362,7 @@ gst_mp3parse_chain (GstPad * pad, GstData * _data)
break; break;
} }
/* wait until we have the the entire current frame as well as the next frame header */ /* wait until we have the the entire current frame as well as the next frame header */
header2 = GUINT32_FROM_BE (*((guint32 *) (data + offset + bpf))); header2 = GST_READ_UINT32_BE (data + offset + bpf);
GST_DEBUG ("mp3parse: header=%08X, header2=%08X, bpf=%d", GST_DEBUG ("mp3parse: header=%08X, header2=%08X, bpf=%d",
(unsigned int) header, (unsigned int) header2, bpf); (unsigned int) header, (unsigned int) header2, bpf);

6
gst/mpegstream/gstmpegdemux.c
View file

@ -499,7 +499,7 @@ gst_mpeg_demux_parse_syshead (GstMPEGParse * mpeg_parse, GstBuffer * buffer)
buf = GST_BUFFER_DATA (buffer); buf = GST_BUFFER_DATA (buffer);
buf += 4; buf += 4;
header_length = GUINT16_FROM_BE (*(guint16 *) buf); header_length = GST_READ_UINT16_BE (buf);
GST_DEBUG_OBJECT (mpeg_demux, "header_length %d", header_length); GST_DEBUG_OBJECT (mpeg_demux, "header_length %d", header_length);
buf += 2; buf += 2;
@ -632,7 +632,7 @@ gst_mpeg_demux_parse_packet (GstMPEGParse * mpeg_parse, GstBuffer * buffer)
buf += 4; buf += 4;
/* start parsing */ /* start parsing */
packet_length = GUINT16_FROM_BE (*((guint16 *) buf)); packet_length = GST_READ_UINT16_BE (buf);
GST_DEBUG_OBJECT (mpeg_demux, "got packet_length %d", packet_length); GST_DEBUG_OBJECT (mpeg_demux, "got packet_length %d", packet_length);
headerlen = 2; headerlen = 2;
@ -779,7 +779,7 @@ gst_mpeg_demux_parse_pes (GstMPEGParse * mpeg_parse, GstBuffer * buffer)
buf += 4; buf += 4;
/* start parsing */ /* start parsing */
packet_length = GUINT16_FROM_BE (*((guint16 *) buf)); packet_length = GST_READ_UINT16_BE (buf);
GST_DEBUG_OBJECT (mpeg_demux, "packet_length %d", packet_length); GST_DEBUG_OBJECT (mpeg_demux, "packet_length %d", packet_length);
buf += 2; buf += 2;

6
gst/mpegstream/gstmpegpacketize.c
View file

@ -124,7 +124,7 @@ parse_generic (GstMPEGPacketize * packetize)
buf += 4; buf += 4;
length += GUINT16_FROM_BE (*(guint16 *) buf); length += GST_READ_UINT16_BE (buf);
GST_DEBUG ("packetize: header_length %d", length); GST_DEBUG ("packetize: header_length %d", length);
got_bytes = gst_bytestream_read (packetize->bs, &outbuf, length); got_bytes = gst_bytestream_read (packetize->bs, &outbuf, length);
@ -150,7 +150,7 @@ parse_chunk (GstMPEGPacketize * packetize)
offset = 4; offset = 4;
code = GUINT32_FROM_BE (*((guint32 *) (buf + offset))); code = GST_READ_UINT32_BE (buf + offset);
GST_DEBUG ("code = %08x", code); GST_DEBUG ("code = %08x", code);
@ -192,7 +192,7 @@ find_start_code (GstMPEGPacketize * packetize)
offset = 4; offset = 4;
code = GUINT32_FROM_BE (*((guint32 *) (buf))); code = GST_READ_UINT32_BE (buf);
GST_DEBUG ("code = %08x %p %08x", code, buf, chunksize); GST_DEBUG ("code = %08x %p %08x", code, buf, chunksize);