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

mp3parse: Allow more bits to change in headers during resynch

Browse source 
Be more lenient about what we accept as changing bits in a header - basically,
only require that the mp3 sync marker is present, for the mpeg version,
layer and samplerate.

Fixes: #581464
This commit is contained in:
Jan Schmidt 2009-05-06 15:27:01 +01:00
parent 88db06cb65
commit 85a88a0a64
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
gst/mpegaudioparse/gstmpegaudioparse.c
View file

@ -1273,13 +1273,15 @@ gst_mp3parse_chain (GstPad * pad, GstBuffer * buf)
/* mask the bits which are allowed to differ between frames */ /* mask the bits which are allowed to differ between frames */
#define HDRMASK ~((0xF << 12) /* bitrate */ | \ #define HDRMASK ~((0xF << 12) /* bitrate */ | \
(0x1 << 9) /* padding */ | \ (0x1 << 9) /* padding */ | \
(0x3 << 4)) /* mode extension */ (0xf << 4) /* mode|mode extension */ | \
(0xf)) /* copyright|emphasis */
/* require 2 matching headers in a row */ /* require 2 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, header2=%08X, bpf=%d)", "(header=%08X (%08X), header2=%08X (%08X), bpf=%d)",
(unsigned int) header, (unsigned int) header2, bpf); (guint) header, (guint) header & HDRMASK, (guint) header2,
(guint) header2 & HDRMASK, bpf);
/* 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;