Skip to content

V
vlc-gpu
Commit 296df89a authored by Michel Lespinasse's avatar Michel Lespinasse
Browse files
Options

modification du deco ac3 pour le rendre plus robuste. 

normalement le client ne devrait plus segfaulter... enfin, normalement :)
parent 7a0afd69
Show whitespace changes
Inline Side-by-side
Showing with 80 additions and 10 deletions
src/ac3_decoder/ac3_decoder.c
View file @ 296df89a
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
int ac3_init (ac3dec_t * p_ac3dec) int ac3_init (ac3dec_t * p_ac3dec)
{ {
//p_ac3dec->bit_stream.buffer = 0; //p_ac3dec->bit_stream.buffer = 0;
p_ac3dec->bit_stream.i_available = 0; //p_ac3dec->bit_stream.i_available = 0;
return 0; return 0;
} }
...@@ -14,10 +14,12 @@ int ac3_decode_frame (ac3dec_t * p_ac3dec, s16 * buffer) ...@@ -14,10 +14,12 @@ int ac3_decode_frame (ac3dec_t * p_ac3dec, s16 * buffer)
{ {
int i; int i;
parse_bsi (p_ac3dec); if (parse_bsi (p_ac3dec))
return 1;
for (i = 0; i < 6; i++) { for (i = 0; i < 6; i++) {
parse_audblk (p_ac3dec); if (parse_audblk (p_ac3dec, i))
return 1;
if (exponent_unpack (p_ac3dec)) if (exponent_unpack (p_ac3dec))
return 1; return 1;
bit_allocate (p_ac3dec); bit_allocate (p_ac3dec);
......
src/ac3_decoder/ac3_decoder_thread.c
View file @ 296df89a
...@@ -206,10 +206,11 @@ static void RunThread( ac3dec_thread_t * p_ac3dec ) ...@@ -206,10 +206,11 @@ static void RunThread( ac3dec_thread_t * p_ac3dec )
ac3_sync_info_t sync_info; ac3_sync_info_t sync_info;
if (!sync) { /* have to find a synchro point */ if (!sync) { /* have to find a synchro point */
int ptr; int ptr;
ac3_byte_stream_t * p_byte_stream; ac3_byte_stream_t * p_byte_stream;
printf ("sync\n");
p_byte_stream = ac3_byte_stream (&p_ac3dec->ac3_decoder); p_byte_stream = ac3_byte_stream (&p_ac3dec->ac3_decoder);
/* first read till next ac3 magic header */ /* first read till next ac3 magic header */
......
src/ac3_decoder/ac3_internal.h
View file @ 296df89a
...@@ -26,10 +26,8 @@ void imdct (ac3dec_t * p_ac3dec); ...@@ -26,10 +26,8 @@ void imdct (ac3dec_t * p_ac3dec);
void mantissa_unpack (ac3dec_t *); void mantissa_unpack (ac3dec_t *);
/* ac3_parse.c */ /* ac3_parse.c */
int ac3_test_sync (ac3dec_t *); int parse_bsi (ac3dec_t *);
void parse_syncinfo (ac3dec_t *); int parse_audblk (ac3dec_t *, int);
void parse_bsi (ac3dec_t *);
void parse_audblk (ac3dec_t *);
void parse_auxdata (ac3dec_t *); void parse_auxdata (ac3dec_t *);
/* ac3_rematrix.c */ /* ac3_rematrix.c */
......
src/ac3_decoder/ac3_parse.c
View file @ 296df89a
...@@ -77,11 +77,17 @@ int ac3_sync_frame (ac3dec_t * p_ac3dec, ac3_sync_info_t * p_sync_info) ...@@ -77,11 +77,17 @@ int ac3_sync_frame (ac3dec_t * p_ac3dec, ac3_sync_info_t * p_sync_info)
p_ac3dec->syncinfo.fscod = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 2)); p_ac3dec->syncinfo.fscod = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 2));
DumpBits (&(p_ac3dec->bit_stream), 2); DumpBits (&(p_ac3dec->bit_stream), 2);
if (p_ac3dec->syncinfo.fscod >= 3)
return 1;
/* Get the frame size code */ /* Get the frame size code */
NeedBits (&(p_ac3dec->bit_stream), 6); NeedBits (&(p_ac3dec->bit_stream), 6);
p_ac3dec->syncinfo.frmsizecod = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 6)); p_ac3dec->syncinfo.frmsizecod = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 6));
DumpBits (&(p_ac3dec->bit_stream), 6); DumpBits (&(p_ac3dec->bit_stream), 6);
if (p_ac3dec->syncinfo.frmsizecod >= 38)
return 1;
p_sync_info->bit_rate = frmsizecod_tbl[p_ac3dec->syncinfo.frmsizecod].bit_rate; p_sync_info->bit_rate = frmsizecod_tbl[p_ac3dec->syncinfo.frmsizecod].bit_rate;
p_ac3dec->syncinfo.frame_size = frmsizecod_tbl[p_ac3dec->syncinfo.frmsizecod].frm_size[p_ac3dec->syncinfo.fscod]; p_ac3dec->syncinfo.frame_size = frmsizecod_tbl[p_ac3dec->syncinfo.frmsizecod].frm_size[p_ac3dec->syncinfo.fscod];
...@@ -95,7 +101,7 @@ int ac3_sync_frame (ac3dec_t * p_ac3dec, ac3_sync_info_t * p_sync_info) ...@@ -95,7 +101,7 @@ int ac3_sync_frame (ac3dec_t * p_ac3dec, ac3_sync_info_t * p_sync_info)
/* /*
* This routine fills a bsi struct from the AC3 stream * This routine fills a bsi struct from the AC3 stream
*/ */
void parse_bsi (ac3dec_t * p_ac3dec) int parse_bsi (ac3dec_t * p_ac3dec)
{ {
u32 i; u32 i;
...@@ -104,6 +110,9 @@ void parse_bsi (ac3dec_t * p_ac3dec) ...@@ -104,6 +110,9 @@ void parse_bsi (ac3dec_t * p_ac3dec)
p_ac3dec->bsi.bsid = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 5)); p_ac3dec->bsi.bsid = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 5));
DumpBits (&(p_ac3dec->bit_stream), 5); DumpBits (&(p_ac3dec->bit_stream), 5);
if (p_ac3dec->bsi.bsid > 8)
return 1;
/* Get the audio service provided by the steram */ /* Get the audio service provided by the steram */
NeedBits (&(p_ac3dec->bit_stream), 3); NeedBits (&(p_ac3dec->bit_stream), 3);
p_ac3dec->bsi.bsmod = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 3)); p_ac3dec->bsi.bsmod = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 3));
...@@ -282,10 +291,12 @@ void parse_bsi (ac3dec_t * p_ac3dec) ...@@ -282,10 +291,12 @@ void parse_bsi (ac3dec_t * p_ac3dec)
DumpBits (&(p_ac3dec->bit_stream), 8); DumpBits (&(p_ac3dec->bit_stream), 8);
} }
} }
return 0;
} }
/* More pain inducing parsing */ /* More pain inducing parsing */
void parse_audblk (ac3dec_t * p_ac3dec) int parse_audblk (ac3dec_t * p_ac3dec, int blknum)
{ {
int i, j; int i, j;
...@@ -332,17 +343,29 @@ void parse_audblk (ac3dec_t * p_ac3dec) ...@@ -332,17 +343,29 @@ void parse_audblk (ac3dec_t * p_ac3dec)
NeedBits (&(p_ac3dec->bit_stream), 1); NeedBits (&(p_ac3dec->bit_stream), 1);
p_ac3dec->audblk.cplstre = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 1)); p_ac3dec->audblk.cplstre = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 1));
DumpBits (&(p_ac3dec->bit_stream), 1); DumpBits (&(p_ac3dec->bit_stream), 1);
if ((!blknum) && (!p_ac3dec->audblk.cplstre))
return 1;
if (p_ac3dec->audblk.cplstre) { if (p_ac3dec->audblk.cplstre) {
/* Is coupling turned on? */ /* Is coupling turned on? */
NeedBits (&(p_ac3dec->bit_stream), 1); NeedBits (&(p_ac3dec->bit_stream), 1);
p_ac3dec->audblk.cplinu = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 1)); p_ac3dec->audblk.cplinu = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 1));
DumpBits (&(p_ac3dec->bit_stream), 1); DumpBits (&(p_ac3dec->bit_stream), 1);
if (p_ac3dec->audblk.cplinu) { if (p_ac3dec->audblk.cplinu) {
int nb_coupled_channels;
nb_coupled_channels = 0;
for (i=0; i < p_ac3dec->bsi.nfchans; i++) { for (i=0; i < p_ac3dec->bsi.nfchans; i++) {
NeedBits (&(p_ac3dec->bit_stream), 1); NeedBits (&(p_ac3dec->bit_stream), 1);
p_ac3dec->audblk.chincpl[i] = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 1)); p_ac3dec->audblk.chincpl[i] = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 1));
DumpBits (&(p_ac3dec->bit_stream), 1); DumpBits (&(p_ac3dec->bit_stream), 1);
if (p_ac3dec->audblk.chincpl[i])
nb_coupled_channels++;
} }
if (nb_coupled_channels < 2)
return 1;
if (p_ac3dec->bsi.acmod == 0x2) { if (p_ac3dec->bsi.acmod == 0x2) {
NeedBits (&(p_ac3dec->bit_stream), 1); NeedBits (&(p_ac3dec->bit_stream), 1);
p_ac3dec->audblk.phsflginu = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 1)); p_ac3dec->audblk.phsflginu = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 1));
...@@ -354,6 +377,10 @@ void parse_audblk (ac3dec_t * p_ac3dec) ...@@ -354,6 +377,10 @@ void parse_audblk (ac3dec_t * p_ac3dec)
NeedBits (&(p_ac3dec->bit_stream), 4); NeedBits (&(p_ac3dec->bit_stream), 4);
p_ac3dec->audblk.cplendf = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 4)); p_ac3dec->audblk.cplendf = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 4));
DumpBits (&(p_ac3dec->bit_stream), 4); DumpBits (&(p_ac3dec->bit_stream), 4);
if (p_ac3dec->audblk.cplbegf > p_ac3dec->audblk.cplendf + 2)
return 1;
p_ac3dec->audblk.ncplsubnd = (p_ac3dec->audblk.cplendf + 2) - p_ac3dec->audblk.cplbegf + 1; p_ac3dec->audblk.ncplsubnd = (p_ac3dec->audblk.cplendf + 2) - p_ac3dec->audblk.cplbegf + 1;
/* Calculate the start and end bins of the coupling channel */ /* Calculate the start and end bins of the coupling channel */
...@@ -384,6 +411,9 @@ void parse_audblk (ac3dec_t * p_ac3dec) ...@@ -384,6 +411,9 @@ void parse_audblk (ac3dec_t * p_ac3dec)
p_ac3dec->audblk.cplcoe[i] = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 1)); p_ac3dec->audblk.cplcoe[i] = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 1));
DumpBits (&(p_ac3dec->bit_stream), 1); DumpBits (&(p_ac3dec->bit_stream), 1);
if ((!blknum) && (!p_ac3dec->audblk.cplcoe[i]))
return 1;
if (p_ac3dec->audblk.cplcoe[i]) { if (p_ac3dec->audblk.cplcoe[i]) {
NeedBits (&(p_ac3dec->bit_stream), 2); NeedBits (&(p_ac3dec->bit_stream), 2);
p_ac3dec->audblk.mstrcplco[i] = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 2)); p_ac3dec->audblk.mstrcplco[i] = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 2));
...@@ -416,6 +446,10 @@ void parse_audblk (ac3dec_t * p_ac3dec) ...@@ -416,6 +446,10 @@ void parse_audblk (ac3dec_t * p_ac3dec)
NeedBits (&(p_ac3dec->bit_stream), 1); NeedBits (&(p_ac3dec->bit_stream), 1);
p_ac3dec->audblk.rematstr = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 1)); p_ac3dec->audblk.rematstr = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 1));
DumpBits (&(p_ac3dec->bit_stream), 1); DumpBits (&(p_ac3dec->bit_stream), 1);
if ((!blknum) && (!p_ac3dec->audblk.rematstr))
return 1;
if (p_ac3dec->audblk.rematstr) { if (p_ac3dec->audblk.rematstr) {
if (p_ac3dec->audblk.cplinu == 0) { if (p_ac3dec->audblk.cplinu == 0) {
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
...@@ -454,6 +488,9 @@ void parse_audblk (ac3dec_t * p_ac3dec) ...@@ -454,6 +488,9 @@ void parse_audblk (ac3dec_t * p_ac3dec)
p_ac3dec->audblk.cplexpstr = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 2)); p_ac3dec->audblk.cplexpstr = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 2));
DumpBits (&(p_ac3dec->bit_stream), 2); DumpBits (&(p_ac3dec->bit_stream), 2);
if ((!blknum) && (p_ac3dec->audblk.cplexpstr == EXP_REUSE))
return 1;
if (p_ac3dec->audblk.cplexpstr==0) if (p_ac3dec->audblk.cplexpstr==0)
p_ac3dec->audblk.ncplgrps = 0; p_ac3dec->audblk.ncplgrps = 0;
else else
...@@ -466,6 +503,9 @@ void parse_audblk (ac3dec_t * p_ac3dec) ...@@ -466,6 +503,9 @@ void parse_audblk (ac3dec_t * p_ac3dec)
NeedBits (&(p_ac3dec->bit_stream), 2); NeedBits (&(p_ac3dec->bit_stream), 2);
p_ac3dec->audblk.chexpstr[i] = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 2)); p_ac3dec->audblk.chexpstr[i] = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 2));
DumpBits (&(p_ac3dec->bit_stream), 2); DumpBits (&(p_ac3dec->bit_stream), 2);
if ((!blknum) && (p_ac3dec->audblk.chexpstr[i] == EXP_REUSE))
return 1;
} }
/* Get the exponent strategy for lfe channel */ /* Get the exponent strategy for lfe channel */
...@@ -473,6 +513,9 @@ void parse_audblk (ac3dec_t * p_ac3dec) ...@@ -473,6 +513,9 @@ void parse_audblk (ac3dec_t * p_ac3dec)
NeedBits (&(p_ac3dec->bit_stream), 1); NeedBits (&(p_ac3dec->bit_stream), 1);
p_ac3dec->audblk.lfeexpstr = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 1)); p_ac3dec->audblk.lfeexpstr = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 1));
DumpBits (&(p_ac3dec->bit_stream), 1); DumpBits (&(p_ac3dec->bit_stream), 1);
if ((!blknum) && (p_ac3dec->audblk.lfeexpstr == EXP_REUSE))
return 1;
} }
/* Determine the bandwidths of all the fbw channels */ /* Determine the bandwidths of all the fbw channels */
...@@ -486,6 +529,10 @@ void parse_audblk (ac3dec_t * p_ac3dec) ...@@ -486,6 +529,10 @@ void parse_audblk (ac3dec_t * p_ac3dec)
NeedBits (&(p_ac3dec->bit_stream), 6); NeedBits (&(p_ac3dec->bit_stream), 6);
p_ac3dec->audblk.chbwcod[i] = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 6)); p_ac3dec->audblk.chbwcod[i] = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 6));
DumpBits (&(p_ac3dec->bit_stream), 6); DumpBits (&(p_ac3dec->bit_stream), 6);
if (p_ac3dec->audblk.chbwcod[i] > 60)
return 1;
p_ac3dec->audblk.endmant[i] = ((p_ac3dec->audblk.chbwcod[i] + 12) * 3) + 37; p_ac3dec->audblk.endmant[i] = ((p_ac3dec->audblk.chbwcod[i] + 12) * 3) + 37;
} }
...@@ -504,6 +551,9 @@ void parse_audblk (ac3dec_t * p_ac3dec) ...@@ -504,6 +551,9 @@ void parse_audblk (ac3dec_t * p_ac3dec)
NeedBits (&(p_ac3dec->bit_stream), 7); NeedBits (&(p_ac3dec->bit_stream), 7);
p_ac3dec->audblk.cplexps[i] = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 7)); p_ac3dec->audblk.cplexps[i] = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 7));
DumpBits (&(p_ac3dec->bit_stream), 7); DumpBits (&(p_ac3dec->bit_stream), 7);
if (p_ac3dec->audblk.cplexps[i] >= 125)
return 1;
} }
} }
...@@ -517,6 +567,8 @@ void parse_audblk (ac3dec_t * p_ac3dec) ...@@ -517,6 +567,8 @@ void parse_audblk (ac3dec_t * p_ac3dec)
NeedBits (&(p_ac3dec->bit_stream), 7); NeedBits (&(p_ac3dec->bit_stream), 7);
p_ac3dec->audblk.exps[i][j] = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 7)); p_ac3dec->audblk.exps[i][j] = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 7));
DumpBits (&(p_ac3dec->bit_stream), 7); DumpBits (&(p_ac3dec->bit_stream), 7);
if (p_ac3dec->audblk.exps[i][j] >= 125)
return 1;
} }
NeedBits (&(p_ac3dec->bit_stream), 2); NeedBits (&(p_ac3dec->bit_stream), 2);
p_ac3dec->audblk.gainrng[i] = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 2)); p_ac3dec->audblk.gainrng[i] = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 2));
...@@ -532,9 +584,13 @@ void parse_audblk (ac3dec_t * p_ac3dec) ...@@ -532,9 +584,13 @@ void parse_audblk (ac3dec_t * p_ac3dec)
NeedBits (&(p_ac3dec->bit_stream), 7); NeedBits (&(p_ac3dec->bit_stream), 7);
p_ac3dec->audblk.lfeexps[1] = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 7)); p_ac3dec->audblk.lfeexps[1] = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 7));
DumpBits (&(p_ac3dec->bit_stream), 7); DumpBits (&(p_ac3dec->bit_stream), 7);
if (p_ac3dec->audblk.lfeexps[1] >= 125)
return 1;
NeedBits (&(p_ac3dec->bit_stream), 7); NeedBits (&(p_ac3dec->bit_stream), 7);
p_ac3dec->audblk.lfeexps[2] = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 7)); p_ac3dec->audblk.lfeexps[2] = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 7));
DumpBits (&(p_ac3dec->bit_stream), 7); DumpBits (&(p_ac3dec->bit_stream), 7);
if (p_ac3dec->audblk.lfeexps[2] >= 125)
return 1;
} }
/* Get the parametric bit allocation parameters */ /* Get the parametric bit allocation parameters */
...@@ -542,6 +598,9 @@ void parse_audblk (ac3dec_t * p_ac3dec) ...@@ -542,6 +598,9 @@ void parse_audblk (ac3dec_t * p_ac3dec)
p_ac3dec->audblk.baie = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 1)); p_ac3dec->audblk.baie = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 1));
DumpBits (&(p_ac3dec->bit_stream), 1); DumpBits (&(p_ac3dec->bit_stream), 1);
if ((!blknum) && (!p_ac3dec->audblk.baie))
return 1;
if (p_ac3dec->audblk.baie) { if (p_ac3dec->audblk.baie) {
NeedBits (&(p_ac3dec->bit_stream), 2); NeedBits (&(p_ac3dec->bit_stream), 2);
p_ac3dec->audblk.sdcycod = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 2)); p_ac3dec->audblk.sdcycod = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 2));
...@@ -564,6 +623,8 @@ void parse_audblk (ac3dec_t * p_ac3dec) ...@@ -564,6 +623,8 @@ void parse_audblk (ac3dec_t * p_ac3dec)
NeedBits (&(p_ac3dec->bit_stream), 1); NeedBits (&(p_ac3dec->bit_stream), 1);
p_ac3dec->audblk.snroffste = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 1)); p_ac3dec->audblk.snroffste = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 1));
DumpBits (&(p_ac3dec->bit_stream), 1); DumpBits (&(p_ac3dec->bit_stream), 1);
if ((!blknum) && (!p_ac3dec->audblk.snroffste))
return 1;
if (p_ac3dec->audblk.snroffste) { if (p_ac3dec->audblk.snroffste) {
NeedBits (&(p_ac3dec->bit_stream), 6); NeedBits (&(p_ac3dec->bit_stream), 6);
...@@ -602,6 +663,8 @@ void parse_audblk (ac3dec_t * p_ac3dec) ...@@ -602,6 +663,8 @@ void parse_audblk (ac3dec_t * p_ac3dec)
NeedBits (&(p_ac3dec->bit_stream), 1); NeedBits (&(p_ac3dec->bit_stream), 1);
p_ac3dec->audblk.cplleake = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 1)); p_ac3dec->audblk.cplleake = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 1));
DumpBits (&(p_ac3dec->bit_stream), 1); DumpBits (&(p_ac3dec->bit_stream), 1);
if ((!blknum) && (!p_ac3dec->audblk.cplleake))
return 1;
if (p_ac3dec->audblk.cplleake) { if (p_ac3dec->audblk.cplleake) {
NeedBits (&(p_ac3dec->bit_stream), 3); NeedBits (&(p_ac3dec->bit_stream), 3);
...@@ -623,12 +686,16 @@ void parse_audblk (ac3dec_t * p_ac3dec) ...@@ -623,12 +686,16 @@ void parse_audblk (ac3dec_t * p_ac3dec)
NeedBits (&(p_ac3dec->bit_stream), 2); NeedBits (&(p_ac3dec->bit_stream), 2);
p_ac3dec->audblk.cpldeltbae = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 2)); p_ac3dec->audblk.cpldeltbae = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 2));
DumpBits (&(p_ac3dec->bit_stream), 2); DumpBits (&(p_ac3dec->bit_stream), 2);
if (p_ac3dec->audblk.cpldeltbae == 3)
return 1;
} }
for (i = 0;i < p_ac3dec->bsi.nfchans; i++) { for (i = 0;i < p_ac3dec->bsi.nfchans; i++) {
NeedBits (&(p_ac3dec->bit_stream), 2); NeedBits (&(p_ac3dec->bit_stream), 2);
p_ac3dec->audblk.deltbae[i] = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 2)); p_ac3dec->audblk.deltbae[i] = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 2));
DumpBits (&(p_ac3dec->bit_stream), 2); DumpBits (&(p_ac3dec->bit_stream), 2);
if (p_ac3dec->audblk.deltbae[i] == 3)
return 1;
} }
if (p_ac3dec->audblk.cplinu && (p_ac3dec->audblk.cpldeltbae == DELTA_BIT_NEW)) { if (p_ac3dec->audblk.cplinu && (p_ac3dec->audblk.cpldeltbae == DELTA_BIT_NEW)) {
...@@ -685,6 +752,8 @@ void parse_audblk (ac3dec_t * p_ac3dec) ...@@ -685,6 +752,8 @@ void parse_audblk (ac3dec_t * p_ac3dec)
DumpBits (&(p_ac3dec->bit_stream), 8); DumpBits (&(p_ac3dec->bit_stream), 8);
} }
} }
return 0;
} }
void parse_auxdata (ac3dec_t * p_ac3dec) void parse_auxdata (ac3dec_t * p_ac3dec)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment