From f1b6c80c23412ee4038c3b44eddee27cfcee03f0 Mon Sep 17 00:00:00 2001 From: David Schleef Date: Tue, 20 Apr 2004 21:04:22 +0000 Subject: [PATCH] configure.ac: bump required gstreamer version to 0.8.1.1 because of following changes [--ds] 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. --- ChangeLog | 53 ++++++++++++++++++++++++++ configure.ac | 2 +- gst-libs/gst/riff/riff-read.c | 11 +++--- gst/asfdemux/gstasfdemux.c | 13 +++---- gst/mpegaudioparse/gstmpegaudioparse.c | 4 +- gst/mpegstream/gstmpegdemux.c | 6 +-- gst/mpegstream/gstmpegpacketize.c | 6 +-- 7 files changed, 74 insertions(+), 21 deletions(-) diff --git a/ChangeLog b/ChangeLog index caacad6a04..7627473181 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,56 @@ +2004-04-20 Daniel Gazard + + 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 * configure.ac: diff --git a/configure.ac b/configure.ac index 1130e9cc2d..fd895173af 100644 --- a/configure.ac +++ b/configure.ac @@ -188,7 +188,7 @@ GST_CHECK_FEATURE(GCONF, [GConf libraries], , [ ]) 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, HAVE_GST="yes", HAVE_GST="no") diff --git a/gst-libs/gst/riff/riff-read.c b/gst-libs/gst/riff/riff-read.c index a86ec86658..fa153e6823 100644 --- a/gst-libs/gst/riff/riff-read.c +++ b/gst-libs/gst/riff/riff-read.c @@ -24,6 +24,7 @@ #endif #include +#include #include "riff-ids.h" #include "riff-read.h" @@ -173,9 +174,9 @@ gst_riff_peek_head (GstRiffRead * riff, } /* parse tag + length (if wanted) */ - *tag = GUINT32_FROM_LE (((guint32 *) data)[0]); + *tag = GST_READ_UINT32_LE (data); if (length) - *length = GUINT32_FROM_LE (((guint32 *) data)[1]); + *length = GST_READ_UINT32_LE (((guint32 *) data) + 1); /* level */ if (level_up) @@ -302,7 +303,7 @@ gst_riff_peek_list (GstRiffRead * riff) 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; } gst_bytestream_flush_fast (riff->bs, 4); - *tag = GUINT32_FROM_LE (*(guint32 *) data); + *tag = GST_READ_UINT32_LE (data); /* remember level */ level = g_new (GstRiffLevel, 1); @@ -868,7 +869,7 @@ gst_riff_read_header (GstRiffRead * riff, guint32 * doctype) return FALSE; } gst_bytestream_flush_fast (riff->bs, 4); - *doctype = GUINT32_FROM_LE (*(guint32 *) data); + *doctype = GST_READ_UINT32_LE (data); /* remember level */ level = g_new (GstRiffLevel, 1); diff --git a/gst/asfdemux/gstasfdemux.c b/gst/asfdemux/gstasfdemux.c index 8127578602..477c43381e 100644 --- a/gst/asfdemux/gstasfdemux.c +++ b/gst/asfdemux/gstasfdemux.c @@ -21,6 +21,7 @@ #ifdef HAVE_CONFIG_H #include "config.h" #endif +#include #include #include "gstasfdemux.h" #include "gstasfmux.h" /* for the type registering */ @@ -276,17 +277,17 @@ _read_var_length (GstASFDemux * asf_demux, guint8 type, guint32 * rsize) switch (type) { case 1: - ret = GUINT32_FROM_LE (*(guint32 *) var) & 0xff; + ret = (GST_READ_UINT32_LE (var)) & 0xff; gst_bytestream_flush (bs, 1); *rsize += 1; break; case 2: - ret = GUINT32_FROM_LE (*(guint32 *) var) & 0xffff; + ret = (GST_READ_UINT32_LE (var)) & 0xffff; gst_bytestream_flush (bs, 2); *rsize += 2; break; case 3: - ret = GUINT32_FROM_LE (*(guint32 *) var); + ret = GST_READ_UINT32_LE (var); gst_bytestream_flush (bs, 4); *rsize += 4; break; @@ -307,7 +308,7 @@ _read_uint ## bits (GstASFDemux *asf_demux, guint ## bits *ret) \ \ do { \ 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); \ return TRUE; \ } \ @@ -317,9 +318,7 @@ _read_uint ## bits (GstASFDemux *asf_demux, guint ## bits *ret) \ return FALSE; \ } -#ifndef GUINT8_FROM_LE -# define GUINT8_FROM_LE(x) (x) -#endif +#define GST_READ_UINT8_LE(x) GST_READ_UINT8(x) READ_UINT_BITS_FUNCTION (8) READ_UINT_BITS_FUNCTION (16) READ_UINT_BITS_FUNCTION (32) diff --git a/gst/mpegaudioparse/gstmpegaudioparse.c b/gst/mpegaudioparse/gstmpegaudioparse.c index a4152dea29..7c3df7ba4a 100644 --- a/gst/mpegaudioparse/gstmpegaudioparse.c +++ b/gst/mpegaudioparse/gstmpegaudioparse.c @@ -336,7 +336,7 @@ gst_mp3parse_chain (GstPad * pad, GstData * _data) GST_DEBUG ("mp3parse: **** now at %ld skipped %d bytes", offset, skipped); } /* 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 (head_check (header)) { /* calculate the bpf of the frame */ @@ -362,7 +362,7 @@ gst_mp3parse_chain (GstPad * pad, GstData * _data) break; } /* 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", (unsigned int) header, (unsigned int) header2, bpf); diff --git a/gst/mpegstream/gstmpegdemux.c b/gst/mpegstream/gstmpegdemux.c index b7bd35c065..9d1d2813b2 100644 --- a/gst/mpegstream/gstmpegdemux.c +++ b/gst/mpegstream/gstmpegdemux.c @@ -499,7 +499,7 @@ gst_mpeg_demux_parse_syshead (GstMPEGParse * mpeg_parse, GstBuffer * buffer) buf = GST_BUFFER_DATA (buffer); 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); buf += 2; @@ -632,7 +632,7 @@ gst_mpeg_demux_parse_packet (GstMPEGParse * mpeg_parse, GstBuffer * buffer) buf += 4; /* 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); headerlen = 2; @@ -779,7 +779,7 @@ gst_mpeg_demux_parse_pes (GstMPEGParse * mpeg_parse, GstBuffer * buffer) buf += 4; /* 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); buf += 2; diff --git a/gst/mpegstream/gstmpegpacketize.c b/gst/mpegstream/gstmpegpacketize.c index a9bd0f6fb8..a701e0aa8f 100644 --- a/gst/mpegstream/gstmpegpacketize.c +++ b/gst/mpegstream/gstmpegpacketize.c @@ -124,7 +124,7 @@ parse_generic (GstMPEGPacketize * packetize) buf += 4; - length += GUINT16_FROM_BE (*(guint16 *) buf); + length += GST_READ_UINT16_BE (buf); GST_DEBUG ("packetize: header_length %d", length); got_bytes = gst_bytestream_read (packetize->bs, &outbuf, length); @@ -150,7 +150,7 @@ parse_chunk (GstMPEGPacketize * packetize) offset = 4; - code = GUINT32_FROM_BE (*((guint32 *) (buf + offset))); + code = GST_READ_UINT32_BE (buf + offset); GST_DEBUG ("code = %08x", code); @@ -192,7 +192,7 @@ find_start_code (GstMPEGPacketize * packetize) offset = 4; - code = GUINT32_FROM_BE (*((guint32 *) (buf))); + code = GST_READ_UINT32_BE (buf); GST_DEBUG ("code = %08x %p %08x", code, buf, chunksize);