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

gst/typefind/gsttypefindfunctions.c: Fix wavpack typefinding to work in more cases (don't peek for chunks of multiple...

Browse source 
Original commit message from CVS:
* gst/typefind/gsttypefindfunctions.c: (wavpack_type_find):
Fix wavpack typefinding to work in more cases (don't peek
for chunks of multiple hundred kBs at once, but process
things step-by-step in smaller units). Fixes #339786.
This commit is contained in:
Tim-Philipp Müller 2006-04-28 12:15:33 +00:00
parent ffc01d2492
commit b0091828ba
2 changed files with 52 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2006-04-28 Tim-Philipp Müller <tim at centricular dot net>
* gst/typefind/gsttypefindfunctions.c: (wavpack_type_find):
Fix wavpack typefinding to work in more cases (don't peek
for chunks of multiple hundred kBs at once, but process
things step-by-step in smaller units). Fixes #339786.
2006-04-28 Thomas Vander Stichele <thomas at apestaart dot org> 2006-04-28 Thomas Vander Stichele <thomas at apestaart dot org>
* configure.ac: * configure.ac:

54
gst/typefind/gsttypefindfunctions.c
View file

@ -816,38 +816,32 @@ GST_STATIC_CAPS ("audio/x-wavpack-correction, framed = (boolean) false");
static void static void
wavpack_type_find (GstTypeFind * tf, gpointer unused) wavpack_type_find (GstTypeFind * tf, gpointer unused)
{ {
guint8 *data = gst_type_find_peek (tf, 0, 32); guint64 offset;
guint32 blocksize;
guint8 *data;
data = gst_type_find_peek (tf, 0, 32);
if (!data) if (!data)
return; return;
if (data[0] == 'w' && data[1] == 'v' && data[2] == 'p' && data[3] == 'k') { if (data[0] != 'w' || data[1] != 'v' || data[2] != 'p' || data[3] != 'k')
guint32 blocksize, sublen; return;
gint32 left;
GST_LOG ("got wavpack header"); /* Note: wavpack blocks can be fairly large (easily 60-110k), possibly
* larger than the max. limits imposed by certain typefinding elements
/* wavpack blocks can be fairly large, possibly larger than the max. * like id3demux or apedemux, so typefinding is most likely only going to
* limits imposed by certain typefinding elements like id3demux or * work in pull-mode */
* apedemux. So if the first wavpack block is larger than any particular
* limit, we try to get a smaller chunk and hope we get lucky parsing
* only bits of it (case at hand: first wavpack block: 42kB, with a
* max. limit imposed by apedemux/id3demux: 40kB) */
blocksize = GST_READ_UINT32_LE (data + 4); blocksize = GST_READ_UINT32_LE (data + 4);
do { GST_LOG ("wavpack header, blocksize=0x%04x", blocksize);
/* peek from offset 0, otherwise it won't work with apedemux */ offset = 32;
data = gst_type_find_peek (tf, 0, 32 + blocksize); while (offset < 32 + blocksize) {
if (data != NULL) guint32 sublen;
/* get chunk header */
GST_LOG ("peeking at chunk at offset 0x%04x", (guint) offset);
data = gst_type_find_peek (tf, offset, 4);
if (data == NULL)
break; break;
if (32 + blocksize < 512) /* random threshold */
break;
blocksize = (blocksize * 3) / 4;
} while (data == NULL);
if (!data)
return;
data += 32;
left = (gint32) blocksize;
while (left > 2) {
sublen = ((guint32) data[1]) << 1; sublen = ((guint32) data[1]) << 1;
if (data[0] & 0x80) { if (data[0] & 0x80) {
sublen |= (((guint32) data[2]) << 9) | (((guint32) data[3]) << 17); sublen |= (((guint32) data[2]) << 9) | (((guint32) data[3]) << 17);
@ -855,8 +849,10 @@ wavpack_type_find (GstTypeFind * tf, gpointer unused)
} else { } else {
sublen += 1 + 1; /* id + length */ sublen += 1 + 1; /* id + length */
} }
if (sublen > blocksize) if (sublen > blocksize - offset + 32) {
return; GST_LOG ("chunk length too big (%u > %u)", sublen, blocksize - offset);
break;
}
if ((data[0] & 0x20) == 0) { if ((data[0] & 0x20) == 0) {
switch (data[0] & 0x0f) { switch (data[0] & 0x0f) {
case 0xa: /* ID_WV_BITSTREAM */ case 0xa: /* ID_WV_BITSTREAM */
@ -871,9 +867,7 @@ wavpack_type_find (GstTypeFind * tf, gpointer unused)
break; break;
} }
} }
left -= sublen; offset += sublen;
data += sublen;
}
} }
} }