mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-24 02:31:03 +00:00
Code Issues 1 Projects Releases Wiki Activity

mpegaudioparse: ensure 2 valid headers in a row when resyncing

Browse source
This commit is contained in:
Mark Nauwelaerts 2009-09-17 16:12:29 +02:00
parent 59f5b02444
commit 57d01c2526
1 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
gst/mpegaudioparse/gstmpegaudioparse.c
View file

@ -1333,12 +1333,20 @@ gst_mp3parse_chain (GstPad * pad, GstBuffer * buf)
(0xf << 4) /* mode|mode extension */ | \ (0xf << 4) /* mode|mode extension */ | \
(0xf)) /* copyright|emphasis */ (0xf)) /* copyright|emphasis */
/* require 2 matching headers in a row */ /* require 2 valid matching headers in a row */
if ((header2 & HDRMASK) != (header & HDRMASK)) { if ((header2 & HDRMASK) != (header & HDRMASK)) {
GST_DEBUG_OBJECT (mp3parse, "next header doesn't match " GST_DEBUG_OBJECT (mp3parse, "next header doesn't match "
"(header=%08X (%08X), header2=%08X (%08X), bpf=%d)", "(header=%08X (%08X), header2=%08X (%08X), bpf=%d)",
(guint) header, (guint) header & HDRMASK, (guint) header2, (guint) header, (guint) header & HDRMASK, (guint) header2,
(guint) header2 & HDRMASK, bpf); (guint) header2 & HDRMASK, bpf);
} else if ((((header2 >> 12) & 0xf) == 0) ||
(((header2 >> 12) & 0xf) == 0xf)) {
/* optimized validity check for almost equal headers;
* only bitrate needs checking */
GST_DEBUG_OBJECT (mp3parse, "next header invalid (bitrate)");
} else {
goto valid;
}
/* This frame is invalid. Start looking for a valid frame at the /* This frame is invalid. Start looking for a valid frame at the
* next position in the stream */ * next position in the stream */
mp3parse->resyncing = TRUE; mp3parse->resyncing = TRUE;
@ -1348,8 +1356,8 @@ gst_mp3parse_chain (GstPad * pad, GstBuffer * buf)
mp3parse->tracked_offset++; mp3parse->tracked_offset++;
continue; continue;
} }
}
valid:
/* if we don't have the whole frame... */ /* if we don't have the whole frame... */
if (available < bpf) { if (available < bpf) {
GST_DEBUG_OBJECT (mp3parse, "insufficient data available, need " GST_DEBUG_OBJECT (mp3parse, "insufficient data available, need "