mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 12:11:13 +00:00
Code Issues 1 Projects Releases Wiki Activity

gst/mpegaudioparse/gstmpegaudioparse.c: Guard against 0 values in the Xing header as frame count and byte count and c...

Browse source 
Original commit message from CVS:
* gst/mpegaudioparse/gstmpegaudioparse.c:
(gst_mp3parse_handle_first_frame):
Guard against 0 values in the Xing header as frame count and
byte count and calculate the bitrate when we have all values
we need and not before.
This commit is contained in:
Sebastian Dröge 2008-01-14 09:13:29 +00:00
parent ec9cf651e2
commit 1db9aa8d23
2 changed files with 37 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
2008-01-14 Sebastian Dröge <slomo@circular-chaos.org>
* gst/mpegaudioparse/gstmpegaudioparse.c:
(gst_mp3parse_handle_first_frame):
Guard against 0 values in the Xing header as frame count and
byte count and calculate the bitrate when we have all values
we need and not before.
2008-01-10 Tim-Philipp Müller <tim at centricular dot net> 2008-01-10 Tim-Philipp Müller <tim at centricular dot net>
* ext/mad/gstmad.c: (GST_TYPE_MAD_MODE), * ext/mad/gstmad.c: (GST_TYPE_MAD_MODE),

42
gst/mpegaudioparse/gstmpegaudioparse.c
View file

@ -96,6 +96,8 @@ static gboolean mp3parse_bytepos_to_time (GstMPEGAudioParse * mp3parse,
gint64 bytepos, GstClockTime * ts); gint64 bytepos, GstClockTime * ts);
static gboolean static gboolean
mp3parse_total_bytes (GstMPEGAudioParse * mp3parse, gint64 * total); mp3parse_total_bytes (GstMPEGAudioParse * mp3parse, gint64 * total);
static gboolean
mp3parse_total_time (GstMPEGAudioParse * mp3parse, GstClockTime * total);
/*static guint gst_mp3parse_signals[LAST_SIGNAL] = { 0 }; */ /*static guint gst_mp3parse_signals[LAST_SIGNAL] = { 0 }; */
@ -704,6 +706,8 @@ gst_mp3parse_handle_first_frame (GstMPEGAudioParse * mp3parse)
if (read_id == xing_id || read_id == info_id) { if (read_id == xing_id || read_id == info_id) {
guint32 xing_flags; guint32 xing_flags;
guint bytes_needed = xing_offset + XING_HDR_MIN; guint bytes_needed = xing_offset + XING_HDR_MIN;
gint64 total_bytes;
GstClockTime total_time;
GST_DEBUG_OBJECT (mp3parse, "Found Xing header marker 0x%x", xing_id); GST_DEBUG_OBJECT (mp3parse, "Found Xing header marker 0x%x", xing_id);
@ -729,19 +733,15 @@ gst_mp3parse_handle_first_frame (GstMPEGAudioParse * mp3parse)
data += xing_offset + XING_HDR_MIN; data += xing_offset + XING_HDR_MIN;
if (xing_flags & XING_FRAMES_FLAG) { if (xing_flags & XING_FRAMES_FLAG) {
gint64 total_bytes;
mp3parse->xing_frames = GST_READ_UINT32_BE (data); mp3parse->xing_frames = GST_READ_UINT32_BE (data);
mp3parse->xing_total_time = gst_util_uint64_scale (GST_SECOND, if (mp3parse->xing_frames == 0) {
(guint64) (mp3parse->xing_frames) * (mp3parse->spf), mp3parse->rate); GST_WARNING_OBJECT (mp3parse,
"Invalid number of frames in Xing header");
/* We know the total time. If we also know the upstream size, compute the mp3parse->xing_flags &= ~XING_FRAMES_FLAG;
* total bitrate, rounded up to the nearest kbit/sec */ } else {
if (mp3parse_total_bytes (mp3parse, &total_bytes)) { mp3parse->xing_total_time = gst_util_uint64_scale (GST_SECOND,
mp3parse->xing_bitrate = gst_util_uint64_scale (total_bytes, (guint64) (mp3parse->xing_frames) * (mp3parse->spf),
8 * GST_SECOND, mp3parse->xing_total_time); mp3parse->rate);
mp3parse->xing_bitrate += 500;
mp3parse->xing_bitrate -= mp3parse->xing_bitrate % 1000;
} }
data += 4; data += 4;
@ -752,9 +752,25 @@ gst_mp3parse_handle_first_frame (GstMPEGAudioParse * mp3parse)
if (xing_flags & XING_BYTES_FLAG) { if (xing_flags & XING_BYTES_FLAG) {
mp3parse->xing_bytes = GST_READ_UINT32_BE (data); mp3parse->xing_bytes = GST_READ_UINT32_BE (data);
if (mp3parse->xing_bytes == 0) {
GST_WARNING_OBJECT (mp3parse, "Invalid number of bytes in Xing header");
mp3parse->xing_flags &= ~XING_BYTES_FLAG;
}
data += 4; data += 4;
} else } else {
mp3parse->xing_bytes = 0; mp3parse->xing_bytes = 0;
}
/* If we know the upstream size and duration, compute the
* total bitrate, rounded up to the nearest kbit/sec */
if (mp3parse_total_time (mp3parse, &total_time) &&
mp3parse_total_bytes (mp3parse, &total_bytes)) {
mp3parse->xing_bitrate = gst_util_uint64_scale (total_bytes,
8 * GST_SECOND, total_time);
mp3parse->xing_bitrate += 500;
mp3parse->xing_bitrate -= mp3parse->xing_bitrate % 1000;
}
if (xing_flags & XING_TOC_FLAG) { if (xing_flags & XING_TOC_FLAG) {
int i, percent = 0; int i, percent = 0;