FaSTTUBe/GST-Tensordecoder-ov_ep
37
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

ac3parse: properly parse e-ac3 frame header

Browse Source 
Also add a few debug statements.
This commit is contained in:
Mark Nauwelaerts 2010-10-14 16:48:21 +02:00 committed by Tim-Philipp Müller
parent 98c7f4b2f6
commit 5d52d3f6c2
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gst/audioparsers/gstac3parse.c
View File

@ -248,6 +248,8 @@ gst_ac3_parse_frame_header_ac3 (GstAc3Parse * ac3parse, GstBuffer * buf,
GstBitReader bits = GST_BIT_READER_INIT_FROM_BUFFER (buf); GstBitReader bits = GST_BIT_READER_INIT_FROM_BUFFER (buf);
guint8 fscod, frmsizcod, bsid, bsmod, acmod, lfe_on; guint8 fscod, frmsizcod, bsid, bsmod, acmod, lfe_on;
GST_LOG_OBJECT (ac3parse, "parsing ac3");
gst_bit_reader_skip_unchecked (&bits, 16 + 16); gst_bit_reader_skip_unchecked (&bits, 16 + 16);
fscod = gst_bit_reader_get_bits_uint8_unchecked (&bits, 2); fscod = gst_bit_reader_get_bits_uint8_unchecked (&bits, 2);
frmsizcod = gst_bit_reader_get_bits_uint8_unchecked (&bits, 6); frmsizcod = gst_bit_reader_get_bits_uint8_unchecked (&bits, 6);
@ -298,7 +300,9 @@ gst_ac3_parse_frame_header_eac3 (GstAc3Parse * ac3parse, GstBuffer * buf,
guint16 frmsiz, sample_rate, blocks; guint16 frmsiz, sample_rate, blocks;
guint8 strmtyp, fscod, fscod2, acmod, lfe_on, strmid, numblkscod; guint8 strmtyp, fscod, fscod2, acmod, lfe_on, strmid, numblkscod;
gst_bit_reader_skip_unchecked (&bits, 16 + 16); GST_LOG_OBJECT (ac3parse, "parsing e-ac3");
gst_bit_reader_skip_unchecked (&bits, 16);
strmtyp = gst_bit_reader_get_bits_uint8_unchecked (&bits, 2); /* strmtyp */ strmtyp = gst_bit_reader_get_bits_uint8_unchecked (&bits, 2); /* strmtyp */
if (G_UNLIKELY (strmtyp == 3)) { if (G_UNLIKELY (strmtyp == 3)) {
GST_DEBUG_OBJECT (ac3parse, "bad strmtyp %d", strmtyp); GST_DEBUG_OBJECT (ac3parse, "bad strmtyp %d", strmtyp);
@ -358,6 +362,8 @@ gst_ac3_parse_frame_header (GstAc3Parse * parse, GstBuffer * buf,
if (G_UNLIKELY (sync != 0x0b77)) if (G_UNLIKELY (sync != 0x0b77))
return FALSE; return FALSE;
GST_LOG_OBJECT (parse, "bsid = %d", bsid);
if (bsid <= 10) { if (bsid <= 10) {
return gst_ac3_parse_frame_header_ac3 (parse, buf, framesize, rate, chans, return gst_ac3_parse_frame_header_ac3 (parse, buf, framesize, rate, chans,
blocks, sid); blocks, sid);