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

dcaparse: fix sync word for 14-bit little endian coding

Browse source 
Fix copy'n'paste bug that made us look for the raw little endian
sync word twice instead of looking for the 14-bit LE sync word
as well. Fixes parsing of such streams (see #636234 for sample file).
This commit is contained in:
Tim-Philipp Müller 2011-01-13 17:10:13 +00:00
parent a8c854374b
commit bb8f0d3b4c
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
gst/audioparsers/gstdcaparse.c
View file

@ -246,7 +246,7 @@ gst_dca_parse_find_sync (GstDcaParse * dcaparse, GstByteReader * reader,
/* FIXME: verify syncs via _parse_header() here already */ /* FIXME: verify syncs via _parse_header() here already */
/* Raw big endian */ /* Raw little endian */
off = gst_byte_reader_masked_scan_uint32 (reader, 0xffffffff, 0xfe7f0180, off = gst_byte_reader_masked_scan_uint32 (reader, 0xffffffff, 0xfe7f0180,
0, GST_BUFFER_SIZE (buf)); 0, GST_BUFFER_SIZE (buf));
if (off >= 0 && off < best_offset) { if (off >= 0 && off < best_offset) {
@ -254,7 +254,7 @@ gst_dca_parse_find_sync (GstDcaParse * dcaparse, GstByteReader * reader,
best_sync = 0xfe7f0180; best_sync = 0xfe7f0180;
} }
/* Raw little endian */ /* Raw big endian */
off = gst_byte_reader_masked_scan_uint32 (reader, 0xffffffff, 0x7ffe8001, off = gst_byte_reader_masked_scan_uint32 (reader, 0xffffffff, 0x7ffe8001,
0, GST_BUFFER_SIZE (buf)); 0, GST_BUFFER_SIZE (buf));
if (off >= 0 && off < best_offset) { if (off >= 0 && off < best_offset) {
@ -265,15 +265,15 @@ gst_dca_parse_find_sync (GstDcaParse * dcaparse, GstByteReader * reader,
/* FIXME: check next 2 bytes as well for 14-bit formats (but then don't /* FIXME: check next 2 bytes as well for 14-bit formats (but then don't
* forget to adjust the *skipsize= in _check_valid_frame() */ * forget to adjust the *skipsize= in _check_valid_frame() */
/* 14-bit big endian */ /* 14-bit little endian */
off = gst_byte_reader_masked_scan_uint32 (reader, 0xffffffff, 0xfe7f0180, off = gst_byte_reader_masked_scan_uint32 (reader, 0xffffffff, 0xff1f00e8,
0, GST_BUFFER_SIZE (buf)); 0, GST_BUFFER_SIZE (buf));
if (off >= 0 && off < best_offset) { if (off >= 0 && off < best_offset) {
best_offset = off; best_offset = off;
best_sync = 0xfe7f0180; best_sync = 0xff1f00e8;
} }
/* 14-bit little endian */ /* 14-bit big endian */
off = gst_byte_reader_masked_scan_uint32 (reader, 0xffffffff, 0x1fffe800, off = gst_byte_reader_masked_scan_uint32 (reader, 0xffffffff, 0x1fffe800,
0, GST_BUFFER_SIZE (buf)); 0, GST_BUFFER_SIZE (buf));
if (off >= 0 && off < best_offset) { if (off >= 0 && off < best_offset) {
@ -317,6 +317,7 @@ gst_dca_parse_check_valid_frame (GstBaseParse * parse, GstBuffer * buf,
/* didn't find anything that looks like a sync word, skip */ /* didn't find anything that looks like a sync word, skip */
if (off < 0) { if (off < 0) {
*skipsize = GST_BUFFER_SIZE (buf) - 3; *skipsize = GST_BUFFER_SIZE (buf) - 3;
GST_DEBUG_OBJECT (dcaparse, "no sync, skipping %d bytes", *skipsize);
return FALSE; return FALSE;
} }