Skip to content

V
vlc
Commit ef54efe5 authored by Renaud Dartus's avatar Renaud Dartus
Browse files
Options

* Add dither fix 

* Some cosmetic changes
parent d35a29fa
Hide whitespace changes
Inline Side-by-side
Showing with 233 additions and 402 deletions
src/ac3_decoder/ac3_bit_stream.h
View file @ ef54efe5
/***************************************************************************** /*****************************************************************************
* ac3_bit_stream.h: getbits functions for the ac3 decoder * ac3_bit_stream.h: getbits functions for the ac3 decoder
***************************************************************************** *****************************************************************************
* Copyright (C) 2000 VideoLAN * Copyright (C) 2000, 2001 VideoLAN
*
* Authors: Renaud Dartus <reno@videolan.org>
* *
* Authors:
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
...@@ -20,31 +21,25 @@ ...@@ -20,31 +21,25 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*****************************************************************************/ *****************************************************************************/
static __inline__ u8 GetByte (ac3_byte_stream_t * p_byte_stream) static __inline__ u32 bitstream_get (ac3_bit_stream_t * p_bit_stream,
{ u32 num_bits)
/* Are there some bytes left in the current buffer ? */
if (p_byte_stream->p_byte >= p_byte_stream->p_end)
{
/* no, switch to next buffer */
ac3_byte_stream_next (p_byte_stream);
}
return *(p_byte_stream->p_byte++);
}
static __inline__ void NeedBits (ac3_bit_stream_t * p_bit_stream, int i_bits)
{ {
while (p_bit_stream->i_available < i_bits) u32 result=0;
while (p_bit_stream->i_available < num_bits)
{ {
p_bit_stream->buffer |= if (p_bit_stream->byte_stream.p_byte >= p_bit_stream->byte_stream.p_end)
((u32)GetByte (&p_bit_stream->byte_stream)) << (24 - p_bit_stream->i_available); {
/* no, switch to next buffer */
ac3_byte_stream_next (&p_bit_stream->byte_stream);
}
p_bit_stream->buffer |=((u32) *(p_bit_stream->byte_stream.p_byte++))
<< (24 - p_bit_stream->i_available);
p_bit_stream->i_available += 8; p_bit_stream->i_available += 8;
} }
} result = p_bit_stream->buffer >> (32 - num_bits);
p_bit_stream->buffer <<= num_bits;
static __inline__ void DumpBits (ac3_bit_stream_t * p_bit_stream, int i_bits) p_bit_stream->i_available -= num_bits;
{ p_bit_stream->total_bits_read += num_bits;
p_bit_stream->buffer <<= i_bits;
p_bit_stream->i_available -= i_bits; return result;
p_bit_stream->total_bits_read += i_bits;
} }
src/ac3_decoder/ac3_mantissa.c
View file @ ef54efe5
/***************************************************************************** /*****************************************************************************
* ac3_mantissa.c: ac3 mantissa computation * ac3_mantissa.c: ac3 mantissa computation
***************************************************************************** *****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN * Copyright (C) 1999, 2000, 2001 VideoLAN
* *
* Authors: * Authors: Michel Kaempf <maxx@via.ecp.fr>
* Renaud Dartus <reno@videolan.org>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
...@@ -19,6 +20,7 @@ ...@@ -19,6 +20,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*****************************************************************************/ *****************************************************************************/
#include "defs.h" #include "defs.h"
#include <stdio.h> /* "intf_msg.h" */ #include <stdio.h> /* "intf_msg.h" */
...@@ -156,7 +158,7 @@ static float q_3[8] = ...@@ -156,7 +158,7 @@ static float q_3[8] =
{ {
(-6 << 15)/7.0, (-4 << 15)/7.0, (-2 << 15)/7.0, (-6 << 15)/7.0, (-4 << 15)/7.0, (-2 << 15)/7.0,
0 , (2 << 15)/7.0, (4 << 15)/7.0, 0 , (2 << 15)/7.0, (4 << 15)/7.0,
(6 << 15)/7.0, 0 (6 << 15)/7.0, 0
}; };
static float q_5[16] = static float q_5[16] =
...@@ -213,6 +215,54 @@ static float exp_lut[ 25 ] = ...@@ -213,6 +215,54 @@ static float exp_lut[ 25 ] =
3.63797880709171295166015625e-12, 3.63797880709171295166015625e-12,
}; };
const u16 dither_lut[256] =
{
0x0000, 0xa011, 0xe033, 0x4022, 0x6077, 0xc066, 0x8044, 0x2055,
0xc0ee, 0x60ff, 0x20dd, 0x80cc, 0xa099, 0x0088, 0x40aa, 0xe0bb,
0x21cd, 0x81dc, 0xc1fe, 0x61ef, 0x41ba, 0xe1ab, 0xa189, 0x0198,
0xe123, 0x4132, 0x0110, 0xa101, 0x8154, 0x2145, 0x6167, 0xc176,
0x439a, 0xe38b, 0xa3a9, 0x03b8, 0x23ed, 0x83fc, 0xc3de, 0x63cf,
0x8374, 0x2365, 0x6347, 0xc356, 0xe303, 0x4312, 0x0330, 0xa321,
0x6257, 0xc246, 0x8264, 0x2275, 0x0220, 0xa231, 0xe213, 0x4202,
0xa2b9, 0x02a8, 0x428a, 0xe29b, 0xc2ce, 0x62df, 0x22fd, 0x82ec,
0x8734, 0x2725, 0x6707, 0xc716, 0xe743, 0x4752, 0x0770, 0xa761,
0x47da, 0xe7cb, 0xa7e9, 0x07f8, 0x27ad, 0x87bc, 0xc79e, 0x678f,
0xa6f9, 0x06e8, 0x46ca, 0xe6db, 0xc68e, 0x669f, 0x26bd, 0x86ac,
0x6617, 0xc606, 0x8624, 0x2635, 0x0660, 0xa671, 0xe653, 0x4642,
0xc4ae, 0x64bf, 0x249d, 0x848c, 0xa4d9, 0x04c8, 0x44ea, 0xe4fb,
0x0440, 0xa451, 0xe473, 0x4462, 0x6437, 0xc426, 0x8404, 0x2415,
0xe563, 0x4572, 0x0550, 0xa541, 0x8514, 0x2505, 0x6527, 0xc536,
0x258d, 0x859c, 0xc5be, 0x65af, 0x45fa, 0xe5eb, 0xa5c9, 0x05d8,
0xae79, 0x0e68, 0x4e4a, 0xee5b, 0xce0e, 0x6e1f, 0x2e3d, 0x8e2c,
0x6e97, 0xce86, 0x8ea4, 0x2eb5, 0x0ee0, 0xaef1, 0xeed3, 0x4ec2,
0x8fb4, 0x2fa5, 0x6f87, 0xcf96, 0xefc3, 0x4fd2, 0x0ff0, 0xafe1,
0x4f5a, 0xef4b, 0xaf69, 0x0f78, 0x2f2d, 0x8f3c, 0xcf1e, 0x6f0f,
0xede3, 0x4df2, 0x0dd0, 0xadc1, 0x8d94, 0x2d85, 0x6da7, 0xcdb6,
0x2d0d, 0x8d1c, 0xcd3e, 0x6d2f, 0x4d7a, 0xed6b, 0xad49, 0x0d58,
0xcc2e, 0x6c3f, 0x2c1d, 0x8c0c, 0xac59, 0x0c48, 0x4c6a, 0xec7b,
0x0cc0, 0xacd1, 0xecf3, 0x4ce2, 0x6cb7, 0xcca6, 0x8c84, 0x2c95,
0x294d, 0x895c, 0xc97e, 0x696f, 0x493a, 0xe92b, 0xa909, 0x0918,
0xe9a3, 0x49b2, 0x0990, 0xa981, 0x89d4, 0x29c5, 0x69e7, 0xc9f6,
0x0880, 0xa891, 0xe8b3, 0x48a2, 0x68f7, 0xc8e6, 0x88c4, 0x28d5,
0xc86e, 0x687f, 0x285d, 0x884c, 0xa819, 0x0808, 0x482a, 0xe83b,
0x6ad7, 0xcac6, 0x8ae4, 0x2af5, 0x0aa0, 0xaab1, 0xea93, 0x4a82,
0xaa39, 0x0a28, 0x4a0a, 0xea1b, 0xca4e, 0x6a5f, 0x2a7d, 0x8a6c,
0x4b1a, 0xeb0b, 0xab29, 0x0b38, 0x2b6d, 0x8b7c, 0xcb5e, 0x6b4f,
0x8bf4, 0x2be5, 0x6bc7, 0xcbd6, 0xeb83, 0x4b92, 0x0bb0, 0xaba1
};
u16 lfsr_state = 1;
static __inline__ u16 dither_gen (void)
{
s16 state;
state = dither_lut[lfsr_state >> 8] ^ (lfsr_state << 8);
lfsr_state = (u16) state;
return ( (state * (s32) (0.707106 * 256.0)) >> 8 );
}
/* Fetch an unpacked, left justified, and properly biased/dithered mantissa value */ /* Fetch an unpacked, left justified, and properly biased/dithered mantissa value */
static __inline__ float float_get (ac3dec_t * p_ac3dec, u16 bap, u16 exp) static __inline__ float float_get (ac3dec_t * p_ac3dec, u16 bap, u16 exp)
{ {
...@@ -222,7 +272,11 @@ static __inline__ float float_get (ac3dec_t * p_ac3dec, u16 bap, u16 exp) ...@@ -222,7 +272,11 @@ static __inline__ float float_get (ac3dec_t * p_ac3dec, u16 bap, u16 exp)
switch (bap) switch (bap)
{ {
case 0: case 0:
return (0); /* FIXME dither */ if (p_ac3dec->audblk.dithflag[exp])
{
return ( dither_gen() * exp_lut[exp] );
}
return (0);
case 1: case 1:
if (q_1_pointer >= 0) if (q_1_pointer >= 0)
...@@ -230,10 +284,7 @@ static __inline__ float float_get (ac3dec_t * p_ac3dec, u16 bap, u16 exp) ...@@ -230,10 +284,7 @@ static __inline__ float float_get (ac3dec_t * p_ac3dec, u16 bap, u16 exp)
return (q_1[q_1_pointer--] * exp_lut[exp]); return (q_1[q_1_pointer--] * exp_lut[exp]);
} }
NeedBits (&(p_ac3dec->bit_stream), 5); if ((group_code = bitstream_get(&(p_ac3dec->bit_stream),5)) >= 27)
group_code = p_ac3dec->bit_stream.buffer >> (32 - 5);
DumpBits (&(p_ac3dec->bit_stream), 5);
if (group_code >= 27)
{ {
intf_ErrMsg ( "ac3dec error: invalid mantissa" ); intf_ErrMsg ( "ac3dec error: invalid mantissa" );
} }
...@@ -250,11 +301,8 @@ static __inline__ float float_get (ac3dec_t * p_ac3dec, u16 bap, u16 exp) ...@@ -250,11 +301,8 @@ static __inline__ float float_get (ac3dec_t * p_ac3dec, u16 bap, u16 exp)
{ {
return (q_2[q_2_pointer--] * exp_lut[exp]); return (q_2[q_2_pointer--] * exp_lut[exp]);
} }
NeedBits (&(p_ac3dec->bit_stream), 7);
group_code = p_ac3dec->bit_stream.buffer >> (32 - 7); if ((group_code = bitstream_get(&(p_ac3dec->bit_stream),7)) >= 125)
DumpBits (&(p_ac3dec->bit_stream), 7);
if (group_code >= 125)
{ {
intf_ErrMsg ( "ac3dec error: invalid mantissa" ); intf_ErrMsg ( "ac3dec error: invalid mantissa" );
} }
...@@ -267,11 +315,7 @@ static __inline__ float float_get (ac3dec_t * p_ac3dec, u16 bap, u16 exp) ...@@ -267,11 +315,7 @@ static __inline__ float float_get (ac3dec_t * p_ac3dec, u16 bap, u16 exp)
return (q_2_0[ group_code ] * exp_lut[exp]); return (q_2_0[ group_code ] * exp_lut[exp]);
case 3: case 3:
NeedBits (&(p_ac3dec->bit_stream), 3); if ((group_code = bitstream_get(&(p_ac3dec->bit_stream),3)) >= 7)
group_code = p_ac3dec->bit_stream.buffer >> (32 - 3);
DumpBits (&(p_ac3dec->bit_stream), 3);
if (group_code >= 7)
{ {
intf_ErrMsg ( "ac3dec error: invalid mantissa" ); intf_ErrMsg ( "ac3dec error: invalid mantissa" );
} }
...@@ -283,11 +327,8 @@ static __inline__ float float_get (ac3dec_t * p_ac3dec, u16 bap, u16 exp) ...@@ -283,11 +327,8 @@ static __inline__ float float_get (ac3dec_t * p_ac3dec, u16 bap, u16 exp)
{ {
return (q_4[q_4_pointer--] * exp_lut[exp]); return (q_4[q_4_pointer--] * exp_lut[exp]);
} }
NeedBits (&(p_ac3dec->bit_stream), 7);
group_code = p_ac3dec->bit_stream.buffer >> (32 - 7);
DumpBits (&(p_ac3dec->bit_stream), 7);
if (group_code >= 121) if ((group_code = bitstream_get(&(p_ac3dec->bit_stream),7)) >= 121)
{ {
intf_ErrMsg ( "ac3dec error: invalid mantissa" ); intf_ErrMsg ( "ac3dec error: invalid mantissa" );
} }
...@@ -299,11 +340,7 @@ static __inline__ float float_get (ac3dec_t * p_ac3dec, u16 bap, u16 exp) ...@@ -299,11 +340,7 @@ static __inline__ float float_get (ac3dec_t * p_ac3dec, u16 bap, u16 exp)
return (q_4_0[ group_code ] * exp_lut[exp]); return (q_4_0[ group_code ] * exp_lut[exp]);
case 5: case 5:
NeedBits (&(p_ac3dec->bit_stream), 4); if ((group_code = bitstream_get(&(p_ac3dec->bit_stream),4)) >= 15)
group_code = p_ac3dec->bit_stream.buffer >> (32 - 4);
DumpBits (&(p_ac3dec->bit_stream), 4);
if (group_code >= 15)
{ {
intf_ErrMsg ( "ac3dec error: invalid mantissa" ); intf_ErrMsg ( "ac3dec error: invalid mantissa" );
} }
...@@ -311,42 +348,57 @@ static __inline__ float float_get (ac3dec_t * p_ac3dec, u16 bap, u16 exp) ...@@ -311,42 +348,57 @@ static __inline__ float float_get (ac3dec_t * p_ac3dec, u16 bap, u16 exp)
return (q_5[group_code] * exp_lut[exp]); return (q_5[group_code] * exp_lut[exp]);
default: default:
NeedBits (&(p_ac3dec->bit_stream), qnttztab[bap]); group_code = bitstream_get(&(p_ac3dec->bit_stream),qnttztab[bap]);
group_code = (((s32)(p_ac3dec->bit_stream.buffer)) >> (32 - qnttztab[bap])) << (16 - qnttztab[bap]); group_code <<= 16 - qnttztab[bap];
DumpBits (&(p_ac3dec->bit_stream), qnttztab[bap]);
return (((s32)group_code) * exp_lut[exp]); return ((s16)(group_code) * exp_lut[exp]);
} }
} }
static __inline__ void uncouple_channel (ac3dec_t * p_ac3dec, u32 ch) static __inline__ void uncouple_channel (ac3dec_t * p_ac3dec, u32 ch)
{ {
u32 bnd = 0; u32 bnd = 0;
u32 sub_bnd = 0;
u32 i,j; u32 i,j;
float cpl_coord = 0; float cpl_coord = 1.0;
u32 cpl_exp_tmp; u32 cpl_exp_tmp;
u32 cpl_mant_tmp; u32 cpl_mant_tmp;
for (i = p_ac3dec->audblk.cplstrtmant; i < p_ac3dec->audblk.cplendmant;) for (i = p_ac3dec->audblk.cplstrtmant; i < p_ac3dec->audblk.cplendmant;)
{ {
if (!p_ac3dec->audblk.cplbndstrc[bnd]) if (!p_ac3dec->audblk.cplbndstrc[sub_bnd++])
{ {
cpl_exp_tmp = p_ac3dec->audblk.cplcoexp[ch][bnd] + 3 * p_ac3dec->audblk.mstrcplco[ch]; cpl_exp_tmp = p_ac3dec->audblk.cplcoexp[ch][bnd] + 3 * p_ac3dec->audblk.mstrcplco[ch];
if (p_ac3dec->audblk.cplcoexp[ch][bnd] == 15) if (p_ac3dec->audblk.cplcoexp[ch][bnd] == 15)
{ {
cpl_mant_tmp = (p_ac3dec->audblk.cplcomant[ch][bnd]) << 12; cpl_mant_tmp = (p_ac3dec->audblk.cplcomant[ch][bnd]) << 11;
} }
else else
{ {
cpl_mant_tmp = ((0x10) | p_ac3dec->audblk.cplcomant[ch][bnd]) << 11; cpl_mant_tmp = ((0x10) | p_ac3dec->audblk.cplcomant[ch][bnd]) << 10;
} }
cpl_coord = ((s16)cpl_mant_tmp) * exp_lut[cpl_exp_tmp]; cpl_coord = ((s16)cpl_mant_tmp) * exp_lut[cpl_exp_tmp] * 8.0f;
/* Invert the phase for the right channel if necessary */
if (p_ac3dec->bsi.acmod == 0x02 && p_ac3dec->audblk.phsflginu &&
ch == 1 && p_ac3dec->audblk.phsflg[bnd])
{
cpl_coord *= -1;
}
bnd++;
} }
bnd++;
for (j=0;j < 12; j++) for (j=0;j < 12; j++)
{ {
p_ac3dec->coeffs.fbw[ch][i] = cpl_coord * p_ac3dec->audblk.cplfbw[i]; /* Get new dither values for each channel if necessary,
* so the channels are uncorrelated */
if (p_ac3dec->audblk.dithflag[ch] && !p_ac3dec->audblk.cpl_bap[i])
{
p_ac3dec->coeffs.fbw[ch][i] = cpl_coord * dither_gen() *
exp_lut[p_ac3dec->audblk.cpl_exp[i]];
} else {
p_ac3dec->coeffs.fbw[ch][i] = cpl_coord * p_ac3dec->audblk.cplfbw[i];
}
i++; i++;
} }
} }
......
src/ac3_decoder/ac3_parse.c
View file @ ef54efe5
/***************************************************************************** /*****************************************************************************
* ac3_parse.c: ac3 parsing procedures * ac3_parse.c: ac3 parsing procedures
***************************************************************************** *****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN * Copyright (C) 1999, 2000, 2001 VideoLAN
* *
* Authors: * Authors: Michel Kaempf <maxx@via.ecp.fr>
* Renaud Dartus <reno@videolan.org>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
...@@ -19,9 +20,12 @@ ...@@ -19,9 +20,12 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*****************************************************************************/ *****************************************************************************/
#include "defs.h" #include "defs.h"
#include "int_types.h" #include "common.h"
#include "intf_msg.h"
#include "ac3_decoder.h" #include "ac3_decoder.h"
#include "ac3_internal.h" #include "ac3_internal.h"
#include "ac3_bit_stream.h" #include "ac3_bit_stream.h"
...@@ -78,31 +82,30 @@ static struct frmsize_s frmsizecod_tbl[] = ...@@ -78,31 +82,30 @@ static struct frmsize_s frmsizecod_tbl[] =
static int fscod_tbl[] = {48000, 44100, 32000}; static int fscod_tbl[] = {48000, 44100, 32000};
/* Some internal functions */
void parse_bsi_stats (ac3dec_t * p_ac3dec);
void parse_audblk_stats (ac3dec_t * p_ac3dec);
/* Parse a syncinfo structure */ /* Parse a syncinfo structure */
int ac3_sync_frame (ac3dec_t * p_ac3dec, ac3_sync_info_t * p_sync_info) int ac3_sync_frame (ac3dec_t * p_ac3dec, ac3_sync_info_t * p_sync_info)
{ {
int buf; int buf;
p_ac3dec->bit_stream.total_bits_read = 0; p_ac3dec->bit_stream.total_bits_read = 0;
p_ac3dec->bit_stream.i_available = 0; p_ac3dec->bit_stream.i_available = 0;
/* sync word - should be 0x0b77 */ /* sync word - should be 0x0b77 */
NeedBits (&(p_ac3dec->bit_stream), 16); buf = bitstream_get(&(p_ac3dec->bit_stream),16);
buf = p_ac3dec->bit_stream.buffer >> (32 - 16);
DumpBits (&(p_ac3dec->bit_stream), 16);
if (buf != 0x0b77) if (buf != 0x0b77)
{ {
return 1; return 1;
} }
/* Get crc1 - we don't actually use this data though */ /* Get crc1 - we don't actually use this data though */
NeedBits (&(p_ac3dec->bit_stream), 16); bitstream_get(&(p_ac3dec->bit_stream),16);
DumpBits (&(p_ac3dec->bit_stream), 16);
/* Get the sampling rate */ /* Get the sampling rate */
NeedBits (&(p_ac3dec->bit_stream), 2); p_ac3dec->syncinfo.fscod = bitstream_get(&(p_ac3dec->bit_stream),2);
p_ac3dec->syncinfo.fscod = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 2));
DumpBits (&(p_ac3dec->bit_stream), 2);
if (p_ac3dec->syncinfo.fscod >= 3) if (p_ac3dec->syncinfo.fscod >= 3)
{ {
...@@ -110,10 +113,7 @@ int ac3_sync_frame (ac3dec_t * p_ac3dec, ac3_sync_info_t * p_sync_info) ...@@ -110,10 +113,7 @@ int ac3_sync_frame (ac3dec_t * p_ac3dec, ac3_sync_info_t * p_sync_info)
} }
/* Get the frame size code */ /* Get the frame size code */
NeedBits (&(p_ac3dec->bit_stream), 6); p_ac3dec->syncinfo.frmsizecod = bitstream_get(&(p_ac3dec->bit_stream),6);
p_ac3dec->syncinfo.frmsizecod =
(u16)(p_ac3dec->bit_stream.buffer >> (32 - 6));
DumpBits (&(p_ac3dec->bit_stream), 6);
if (p_ac3dec->syncinfo.frmsizecod >= 38) if (p_ac3dec->syncinfo.frmsizecod >= 38)
{ {
...@@ -135,27 +135,19 @@ int ac3_sync_frame (ac3dec_t * p_ac3dec, ac3_sync_info_t * p_sync_info) ...@@ -135,27 +135,19 @@ int ac3_sync_frame (ac3dec_t * p_ac3dec, ac3_sync_info_t * p_sync_info)
*/ */
int parse_bsi (ac3dec_t * p_ac3dec) int parse_bsi (ac3dec_t * p_ac3dec)
{ {
u32 i;
/* Check the AC-3 version number */ /* Check the AC-3 version number */
NeedBits (&(p_ac3dec->bit_stream), 5); p_ac3dec->bsi.bsid = bitstream_get(&(p_ac3dec->bit_stream),5);
p_ac3dec->bsi.bsid = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 5));
DumpBits (&(p_ac3dec->bit_stream), 5);
if (p_ac3dec->bsi.bsid > 8) if (p_ac3dec->bsi.bsid > 8)
{ {
return 1; return 1;
} }
/* Get the audio service provided by the steram */ /* Get the audio service provided by the stream */
NeedBits (&(p_ac3dec->bit_stream), 3); p_ac3dec->bsi.bsmod = bitstream_get(&(p_ac3dec->bit_stream),3);
p_ac3dec->bsi.bsmod = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 3));
DumpBits (&(p_ac3dec->bit_stream), 3);
/* Get the audio coding mode (ie how many channels)*/ /* Get the audio coding mode (ie how many channels)*/
NeedBits (&(p_ac3dec->bit_stream), 3); p_ac3dec->bsi.acmod = bitstream_get(&(p_ac3dec->bit_stream),3);
p_ac3dec->bsi.acmod = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 3));
DumpBits (&(p_ac3dec->bit_stream), 3);
/* Predecode the number of full bandwidth channels as we use this /* Predecode the number of full bandwidth channels as we use this
* number a lot */ * number a lot */
p_ac3dec->bsi.nfchans = nfchans[p_ac3dec->bsi.acmod]; p_ac3dec->bsi.nfchans = nfchans[p_ac3dec->bsi.acmod];
...@@ -163,180 +155,112 @@ int parse_bsi (ac3dec_t * p_ac3dec) ...@@ -163,180 +155,112 @@ int parse_bsi (ac3dec_t * p_ac3dec)
/* If it is in use, get the centre channel mix level */ /* If it is in use, get the centre channel mix level */
if ((p_ac3dec->bsi.acmod & 0x1) && (p_ac3dec->bsi.acmod != 0x1)) if ((p_ac3dec->bsi.acmod & 0x1) && (p_ac3dec->bsi.acmod != 0x1))
{ {
NeedBits (&(p_ac3dec->bit_stream), 2); p_ac3dec->bsi.cmixlev = bitstream_get(&(p_ac3dec->bit_stream),2);
p_ac3dec->bsi.cmixlev = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 2));
DumpBits (&(p_ac3dec->bit_stream), 2);
} }
/* If it is in use, get the surround channel mix level */ /* If it is in use, get the surround channel mix level */
if (p_ac3dec->bsi.acmod & 0x4) if (p_ac3dec->bsi.acmod & 0x4)
{ {
NeedBits (&(p_ac3dec->bit_stream), 2); p_ac3dec->bsi.surmixlev = bitstream_get(&(p_ac3dec->bit_stream),2);
p_ac3dec->bsi.surmixlev = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 2));
DumpBits (&(p_ac3dec->bit_stream), 2);
} }
/* Get the dolby surround mode if in 2/0 mode */ /* Get the dolby surround mode if in 2/0 mode */
if (p_ac3dec->bsi.acmod == 0x2) if (p_ac3dec->bsi.acmod == 0x2)
{ {
NeedBits (&(p_ac3dec->bit_stream), 2); p_ac3dec->bsi.dsurmod = bitstream_get(&(p_ac3dec->bit_stream),2);
p_ac3dec->bsi.dsurmod = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 2));
DumpBits (&(p_ac3dec->bit_stream), 2);
} }
/* Is the low frequency effects channel on? */ /* Is the low frequency effects channel on? */
NeedBits (&(p_ac3dec->bit_stream), 1); p_ac3dec->bsi.lfeon = bitstream_get(&(p_ac3dec->bit_stream),1);
p_ac3dec->bsi.lfeon = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 1));
DumpBits (&(p_ac3dec->bit_stream), 1);
/* Get the dialogue normalization level */ /* Get the dialogue normalization level */
NeedBits (&(p_ac3dec->bit_stream), 5); p_ac3dec->bsi.dialnorm = bitstream_get(&(p_ac3dec->bit_stream),5);
p_ac3dec->bsi.dialnorm = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 5));
DumpBits (&(p_ac3dec->bit_stream), 5);
/* Does compression gain exist? */ /* Does compression gain exist? */
NeedBits (&(p_ac3dec->bit_stream), 1); if ((p_ac3dec->bsi.compre = bitstream_get(&(p_ac3dec->bit_stream),1)))
p_ac3dec->bsi.compre = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 1));
DumpBits (&(p_ac3dec->bit_stream), 1);
if (p_ac3dec->bsi.compre)
{ {
/* Get compression gain */ /* Get compression gain */
NeedBits (&(p_ac3dec->bit_stream), 8); p_ac3dec->bsi.compr = bitstream_get(&(p_ac3dec->bit_stream),8);
p_ac3dec->bsi.compr = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 8));
DumpBits (&(p_ac3dec->bit_stream), 8);
} }
/* Does language code exist? */ /* Does language code exist? */
NeedBits (&(p_ac3dec->bit_stream), 1); if ((p_ac3dec->bsi.langcode = bitstream_get(&(p_ac3dec->bit_stream),1)))
p_ac3dec->bsi.langcode = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 1));
DumpBits (&(p_ac3dec->bit_stream), 1);
if (p_ac3dec->bsi.langcode)
{ {
/* Get langauge code */ /* Get langauge code */
NeedBits (&(p_ac3dec->bit_stream), 8); p_ac3dec->bsi.langcod = bitstream_get(&(p_ac3dec->bit_stream),8);
p_ac3dec->bsi.langcod = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 8));
DumpBits (&(p_ac3dec->bit_stream), 8);
} }
/* Does audio production info exist? */ /* Does audio production info exist? */
NeedBits (&(p_ac3dec->bit_stream), 1); if ((p_ac3dec->bsi.audprodie = bitstream_get(&(p_ac3dec->bit_stream),1)))
p_ac3dec->bsi.audprodie = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 1));
DumpBits (&(p_ac3dec->bit_stream), 1);
if (p_ac3dec->bsi.audprodie)
{ {
/* Get mix level */ /* Get mix level */
NeedBits (&(p_ac3dec->bit_stream), 5); p_ac3dec->bsi.mixlevel = bitstream_get(&(p_ac3dec->bit_stream),5);
p_ac3dec->bsi.mixlevel = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 5));
DumpBits (&(p_ac3dec->bit_stream), 5);
/* Get room type */ /* Get room type */
NeedBits (&(p_ac3dec->bit_stream), 2); p_ac3dec->bsi.roomtyp = bitstream_get(&(p_ac3dec->bit_stream),2);
p_ac3dec->bsi.roomtyp = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 2));
DumpBits (&(p_ac3dec->bit_stream), 2);
} }
/* If we're in dual mono mode then get some extra info */ /* If we're in dual mono mode then get some extra info */
if (p_ac3dec->bsi.acmod ==0) if (p_ac3dec->bsi.acmod == 0)
{ {
/* Get the dialogue normalization level two */ /* Get the dialogue normalization level two */
NeedBits (&(p_ac3dec->bit_stream), 5); p_ac3dec->bsi.dialnorm2 = bitstream_get(&(p_ac3dec->bit_stream),5);
p_ac3dec->bsi.dialnorm2 = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 5));
DumpBits (&(p_ac3dec->bit_stream), 5);
/* Does compression gain two exist? */ /* Does compression gain two exist? */
NeedBits (&(p_ac3dec->bit_stream), 1); if ((p_ac3dec->bsi.compr2e = bitstream_get(&(p_ac3dec->bit_stream),1)))
p_ac3dec->bsi.compr2e = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 1));
DumpBits (&(p_ac3dec->bit_stream), 1);
if (p_ac3dec->bsi.compr2e)
{ {
/* Get compression gain two */ /* Get compression gain two */
NeedBits (&(p_ac3dec->bit_stream), 8); p_ac3dec->bsi.compr2 = bitstream_get(&(p_ac3dec->bit_stream),8);
p_ac3dec->bsi.compr2 = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 8));
DumpBits (&(p_ac3dec->bit_stream), 8);
} }
/* Does language code two exist? */ /* Does language code two exist? */
NeedBits (&(p_ac3dec->bit_stream), 1); if ((p_ac3dec->bsi.langcod2e = bitstream_get(&(p_ac3dec->bit_stream),1)))
p_ac3dec->bsi.langcod2e = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 1));
DumpBits (&(p_ac3dec->bit_stream), 1);
if (p_ac3dec->bsi.langcod2e)
{ {
/* Get langauge code two */ /* Get langauge code two */
NeedBits (&(p_ac3dec->bit_stream), 8); p_ac3dec->bsi.langcod2 = bitstream_get(&(p_ac3dec->bit_stream),8);
p_ac3dec->bsi.langcod2 = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 8));
DumpBits (&(p_ac3dec->bit_stream), 8);
} }
/* Does audio production info two exist? */ /* Does audio production info two exist? */
NeedBits (&(p_ac3dec->bit_stream), 1); if ((p_ac3dec->bsi.audprodi2e = bitstream_get(&(p_ac3dec->bit_stream),1)))
p_ac3dec->bsi.audprodi2e = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 1));
DumpBits (&(p_ac3dec->bit_stream), 1);
if (p_ac3dec->bsi.audprodi2e)
{ {
/* Get mix level two */ /* Get mix level two */
NeedBits (&(p_ac3dec->bit_stream), 5); p_ac3dec->bsi.mixlevel2 = bitstream_get(&(p_ac3dec->bit_stream),5);
p_ac3dec->bsi.mixlevel2 = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 5));
DumpBits (&(p_ac3dec->bit_stream), 5);
/* Get room type two */ /* Get room type two */
NeedBits (&(p_ac3dec->bit_stream), 2); p_ac3dec->bsi.roomtyp2 = bitstream_get(&(p_ac3dec->bit_stream),2);
p_ac3dec->bsi.roomtyp2 = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 2));
DumpBits (&(p_ac3dec->bit_stream), 2);
} }
} }
/* Get the copyright bit */ /* Get the copyright bit */
NeedBits (&(p_ac3dec->bit_stream), 1); p_ac3dec->bsi.copyrightb = bitstream_get(&(p_ac3dec->bit_stream),1);
p_ac3dec->bsi.copyrightb = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 1));
DumpBits (&(p_ac3dec->bit_stream), 1);
/* Get the original bit */ /* Get the original bit */
NeedBits (&(p_ac3dec->bit_stream), 1); p_ac3dec->bsi.origbs = bitstream_get(&(p_ac3dec->bit_stream),1);
p_ac3dec->bsi.origbs = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 1));
DumpBits (&(p_ac3dec->bit_stream), 1);
/* Does timecode one exist? */ /* Does timecode one exist? */
NeedBits (&(p_ac3dec->bit_stream), 1); if ((p_ac3dec->bsi.timecod1e = bitstream_get(&(p_ac3dec->bit_stream),1)))
p_ac3dec->bsi.timecod1e = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 1));
DumpBits (&(p_ac3dec->bit_stream), 1);
if (p_ac3dec->bsi.timecod1e)
{ {
NeedBits (&(p_ac3dec->bit_stream), 14); p_ac3dec->bsi.timecod1 = bitstream_get(&(p_ac3dec->bit_stream),14);
p_ac3dec->bsi.timecod1 = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 14));
DumpBits (&(p_ac3dec->bit_stream), 14);
} }
/* Does timecode two exist? */ /* Does timecode two exist? */
NeedBits (&(p_ac3dec->bit_stream), 1); if ((p_ac3dec->bsi.timecod2e = bitstream_get(&(p_ac3dec->bit_stream),1)))
p_ac3dec->bsi.timecod2e = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 1));
DumpBits (&(p_ac3dec->bit_stream), 1);
if (p_ac3dec->bsi.timecod2e)
{ {
NeedBits (&(p_ac3dec->bit_stream), 14); p_ac3dec->bsi.timecod2 = bitstream_get(&(p_ac3dec->bit_stream),14);
p_ac3dec->bsi.timecod2 = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 14));
DumpBits (&(p_ac3dec->bit_stream), 14);
} }
/* Does addition info exist? */ /* Does addition info exist? */
NeedBits (&(p_ac3dec->bit_stream), 1); if ((p_ac3dec->bsi.addbsie = bitstream_get(&(p_ac3dec->bit_stream),1)))
p_ac3dec->bsi.addbsie = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 1));
DumpBits (&(p_ac3dec->bit_stream), 1);
if (p_ac3dec->bsi.addbsie)
{ {
u32 i;
/* Get how much info is there */ /* Get how much info is there */
NeedBits (&(p_ac3dec->bit_stream), 6); p_ac3dec->bsi.addbsil = bitstream_get(&(p_ac3dec->bit_stream),6);
p_ac3dec->bsi.addbsil = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 6));
DumpBits (&(p_ac3dec->bit_stream), 6);
/* Get the additional info */ /* Get the additional info */
for (i=0;i<(p_ac3dec->bsi.addbsil + 1);i++) for (i=0;i<(p_ac3dec->bsi.addbsil + 1);i++)
{ {
NeedBits (&(p_ac3dec->bit_stream), 8); p_ac3dec->bsi.addbsi[i] = bitstream_get(&(p_ac3dec->bit_stream),8);
p_ac3dec->bsi.addbsi[i] = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 8));
DumpBits (&(p_ac3dec->bit_stream), 8);
} }
} }
...@@ -351,51 +275,35 @@ int parse_audblk (ac3dec_t * p_ac3dec, int blknum) ...@@ -351,51 +275,35 @@ int parse_audblk (ac3dec_t * p_ac3dec, int blknum)
for (i=0; i < p_ac3dec->bsi.nfchans; i++) for (i=0; i < p_ac3dec->bsi.nfchans; i++)
{ {
/* Is this channel an interleaved 256 + 256 block ? */ /* Is this channel an interleaved 256 + 256 block ? */
NeedBits (&(p_ac3dec->bit_stream), 1); p_ac3dec->audblk.blksw[i] = bitstream_get(&(p_ac3dec->bit_stream),1);
p_ac3dec->audblk.blksw[i] = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 1));
DumpBits (&(p_ac3dec->bit_stream), 1);
} }
for (i=0; i < p_ac3dec->bsi.nfchans; i++) for (i=0; i < p_ac3dec->bsi.nfchans; i++)
{ {
/* Should we dither this channel? */ /* Should we dither this channel? */
NeedBits (&(p_ac3dec->bit_stream), 1); p_ac3dec->audblk.dithflag[i] = bitstream_get(&(p_ac3dec->bit_stream),1);
p_ac3dec->audblk.dithflag[i] = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 1));
DumpBits (&(p_ac3dec->bit_stream), 1);
} }
/* Does dynamic range control exist? */ /* Does dynamic range control exist? */
NeedBits (&(p_ac3dec->bit_stream), 1); if ((p_ac3dec->audblk.dynrnge = bitstream_get(&(p_ac3dec->bit_stream),1)))
p_ac3dec->audblk.dynrnge = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 1));
DumpBits (&(p_ac3dec->bit_stream), 1);
if (p_ac3dec->audblk.dynrnge)
{ {
/* Get dynamic range info */ /* Get dynamic range info */
NeedBits (&(p_ac3dec->bit_stream), 8); p_ac3dec->audblk.dynrng = bitstream_get(&(p_ac3dec->bit_stream),8);
p_ac3dec->audblk.dynrng = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 8));
DumpBits (&(p_ac3dec->bit_stream), 8);
} }
/* If we're in dual mono mode then get the second channel DR info */ /* If we're in dual mono mode then get the second channel DR info */
if (p_ac3dec->bsi.acmod == 0) if (p_ac3dec->bsi.acmod == 0)
{ {
/* Does dynamic range control two exist? */ /* Does dynamic range control two exist? */
NeedBits (&(p_ac3dec->bit_stream), 1); if ((p_ac3dec->audblk.dynrng2e = bitstream_get(&(p_ac3dec->bit_stream),1)))
p_ac3dec->audblk.dynrng2e = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 1));
DumpBits (&(p_ac3dec->bit_stream), 1);
if (p_ac3dec->audblk.dynrng2e)
{ {
/* Get dynamic range info */ /* Get dynamic range info */
NeedBits (&(p_ac3dec->bit_stream), 8); p_ac3dec->audblk.dynrng2 = bitstream_get(&(p_ac3dec->bit_stream),8);
p_ac3dec->audblk.dynrng2 = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 8));
DumpBits (&(p_ac3dec->bit_stream), 8);
} }
} }
/* Does coupling strategy exist? */ /* Does coupling strategy exist? */
NeedBits (&(p_ac3dec->bit_stream), 1); p_ac3dec->audblk.cplstre = bitstream_get(&(p_ac3dec->bit_stream),1);
p_ac3dec->audblk.cplstre = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 1));
DumpBits (&(p_ac3dec->bit_stream), 1);
if ((!blknum) && (!p_ac3dec->audblk.cplstre)) if ((!blknum) && (!p_ac3dec->audblk.cplstre))
{ {
...@@ -405,19 +313,14 @@ int parse_audblk (ac3dec_t * p_ac3dec, int blknum) ...@@ -405,19 +313,14 @@ int parse_audblk (ac3dec_t * p_ac3dec, int blknum)
if (p_ac3dec->audblk.cplstre) if (p_ac3dec->audblk.cplstre)
{ {
/* Is coupling turned on? */ /* Is coupling turned on? */
NeedBits (&(p_ac3dec->bit_stream), 1); if ((p_ac3dec->audblk.cplinu = bitstream_get(&(p_ac3dec->bit_stream),1)))
p_ac3dec->audblk.cplinu = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 1));
DumpBits (&(p_ac3dec->bit_stream), 1);
if (p_ac3dec->audblk.cplinu)
{ {
int nb_coupled_channels; int nb_coupled_channels;
nb_coupled_channels = 0; 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); p_ac3dec->audblk.chincpl[i] = bitstream_get(&(p_ac3dec->bit_stream),1);
p_ac3dec->audblk.chincpl[i] = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 1));
DumpBits (&(p_ac3dec->bit_stream), 1);
if (p_ac3dec->audblk.chincpl[i]) if (p_ac3dec->audblk.chincpl[i])
{ {
nb_coupled_channels++; nb_coupled_channels++;
...@@ -430,16 +333,10 @@ int parse_audblk (ac3dec_t * p_ac3dec, int blknum) ...@@ -430,16 +333,10 @@ int parse_audblk (ac3dec_t * p_ac3dec, int blknum)
if (p_ac3dec->bsi.acmod == 0x2) if (p_ac3dec->bsi.acmod == 0x2)
{ {
NeedBits (&(p_ac3dec->bit_stream), 1); p_ac3dec->audblk.phsflginu = bitstream_get(&(p_ac3dec->bit_stream),1);
p_ac3dec->audblk.phsflginu = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 1));
DumpBits (&(p_ac3dec->bit_stream), 1);
} }
NeedBits (&(p_ac3dec->bit_stream), 4); p_ac3dec->audblk.cplbegf = bitstream_get(&(p_ac3dec->bit_stream),4);
p_ac3dec->audblk.cplbegf = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 4)); p_ac3dec->audblk.cplendf = bitstream_get(&(p_ac3dec->bit_stream),4);
DumpBits (&(p_ac3dec->bit_stream), 4);
NeedBits (&(p_ac3dec->bit_stream), 4);
p_ac3dec->audblk.cplendf = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 4));
DumpBits (&(p_ac3dec->bit_stream), 4);
if (p_ac3dec->audblk.cplbegf > p_ac3dec->audblk.cplendf + 2) if (p_ac3dec->audblk.cplbegf > p_ac3dec->audblk.cplendf + 2)
{ {
...@@ -458,9 +355,7 @@ int parse_audblk (ac3dec_t * p_ac3dec, int blknum) ...@@ -458,9 +355,7 @@ int parse_audblk (ac3dec_t * p_ac3dec, int blknum)
for (i=1; i< p_ac3dec->audblk.ncplsubnd; i++) for (i=1; i< p_ac3dec->audblk.ncplsubnd; i++)
{ {
NeedBits (&(p_ac3dec->bit_stream), 1); p_ac3dec->audblk.cplbndstrc[i] = bitstream_get(&(p_ac3dec->bit_stream),1);
p_ac3dec->audblk.cplbndstrc[i] = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 1));
DumpBits (&(p_ac3dec->bit_stream), 1);
p_ac3dec->audblk.ncplbnd -= p_ac3dec->audblk.cplbndstrc[i]; p_ac3dec->audblk.ncplbnd -= p_ac3dec->audblk.cplbndstrc[i];
} }
} }
...@@ -477,9 +372,7 @@ int parse_audblk (ac3dec_t * p_ac3dec, int blknum) ...@@ -477,9 +372,7 @@ int parse_audblk (ac3dec_t * p_ac3dec, int blknum)
} }
/* Is there new coupling co-ordinate info? */ /* Is there new coupling co-ordinate info? */
NeedBits (&(p_ac3dec->bit_stream), 1); p_ac3dec->audblk.cplcoe[i] = bitstream_get(&(p_ac3dec->bit_stream),1);
p_ac3dec->audblk.cplcoe[i] = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 1));
DumpBits (&(p_ac3dec->bit_stream), 1);
if ((!blknum) && (!p_ac3dec->audblk.cplcoe[i])) if ((!blknum) && (!p_ac3dec->audblk.cplcoe[i]))
{ {
...@@ -488,17 +381,11 @@ int parse_audblk (ac3dec_t * p_ac3dec, int blknum) ...@@ -488,17 +381,11 @@ int parse_audblk (ac3dec_t * p_ac3dec, int blknum)
if (p_ac3dec->audblk.cplcoe[i]) if (p_ac3dec->audblk.cplcoe[i])
{ {
NeedBits (&(p_ac3dec->bit_stream), 2); p_ac3dec->audblk.mstrcplco[i] = bitstream_get(&(p_ac3dec->bit_stream),2);
p_ac3dec->audblk.mstrcplco[i] = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 2));
DumpBits (&(p_ac3dec->bit_stream), 2);
for (j=0;j < p_ac3dec->audblk.ncplbnd; j++) for (j=0;j < p_ac3dec->audblk.ncplbnd; j++)
{ {
NeedBits (&(p_ac3dec->bit_stream), 4); p_ac3dec->audblk.cplcoexp[i][j] = bitstream_get(&(p_ac3dec->bit_stream),4);
p_ac3dec->audblk.cplcoexp[i][j] = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 4)); p_ac3dec->audblk.cplcomant[i][j] = bitstream_get(&(p_ac3dec->bit_stream),4);
DumpBits (&(p_ac3dec->bit_stream), 4);
NeedBits (&(p_ac3dec->bit_stream), 4);
p_ac3dec->audblk.cplcomant[i][j] = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 4));
DumpBits (&(p_ac3dec->bit_stream), 4);
} }
} }
} }
...@@ -509,9 +396,7 @@ int parse_audblk (ac3dec_t * p_ac3dec, int blknum) ...@@ -509,9 +396,7 @@ int parse_audblk (ac3dec_t * p_ac3dec, int blknum)
{ {
for (j=0; j < p_ac3dec->audblk.ncplbnd; j++) for (j=0; j < p_ac3dec->audblk.ncplbnd; j++)
{ {
NeedBits (&(p_ac3dec->bit_stream), 1); p_ac3dec->audblk.phsflg[j] = bitstream_get(&(p_ac3dec->bit_stream),1);
p_ac3dec->audblk.phsflg[j] = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 1));
DumpBits (&(p_ac3dec->bit_stream), 1);
} }
} }
...@@ -520,9 +405,7 @@ int parse_audblk (ac3dec_t * p_ac3dec, int blknum) ...@@ -520,9 +405,7 @@ int parse_audblk (ac3dec_t * p_ac3dec, int blknum)
/* If we're in dual mono mode, there may be a rematrix strategy */ /* If we're in dual mono mode, there may be a rematrix strategy */
if (p_ac3dec->bsi.acmod == 0x2) if (p_ac3dec->bsi.acmod == 0x2)
{ {
NeedBits (&(p_ac3dec->bit_stream), 1); p_ac3dec->audblk.rematstr = bitstream_get(&(p_ac3dec->bit_stream),1);
p_ac3dec->audblk.rematstr = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 1));
DumpBits (&(p_ac3dec->bit_stream), 1);
if ((!blknum) && (!p_ac3dec->audblk.rematstr)) if ((!blknum) && (!p_ac3dec->audblk.rematstr))
{ {
...@@ -535,36 +418,28 @@ int parse_audblk (ac3dec_t * p_ac3dec, int blknum) ...@@ -535,36 +418,28 @@ int parse_audblk (ac3dec_t * p_ac3dec, int blknum)
{ {
for (i = 0; i < 4; i++) for (i = 0; i < 4; i++)
{ {
NeedBits (&(p_ac3dec->bit_stream), 1); p_ac3dec->audblk.rematflg[i] = bitstream_get(&(p_ac3dec->bit_stream),1);
p_ac3dec->audblk.rematflg[i] = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 1));
DumpBits (&(p_ac3dec->bit_stream), 1);
} }
} }
if ((p_ac3dec->audblk.cplbegf > 2) && p_ac3dec->audblk.cplinu) if ((p_ac3dec->audblk.cplbegf > 2) && p_ac3dec->audblk.cplinu)
{ {
for (i = 0; i < 4; i++) for (i = 0; i < 4; i++)
{ {
NeedBits (&(p_ac3dec->bit_stream), 1); p_ac3dec->audblk.rematflg[i] = bitstream_get(&(p_ac3dec->bit_stream),1);
p_ac3dec->audblk.rematflg[i] = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 1));
DumpBits (&(p_ac3dec->bit_stream), 1);
} }
} }
if ((p_ac3dec->audblk.cplbegf <= 2) && p_ac3dec->audblk.cplinu) if ((p_ac3dec->audblk.cplbegf <= 2) && p_ac3dec->audblk.cplinu)
{ {
for (i = 0; i < 3; i++) for (i = 0; i < 3; i++)
{ {
NeedBits (&(p_ac3dec->bit_stream), 1); p_ac3dec->audblk.rematflg[i] = bitstream_get(&(p_ac3dec->bit_stream),1);
p_ac3dec->audblk.rematflg[i] = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 1));
DumpBits (&(p_ac3dec->bit_stream), 1);
} }
} }
if ((p_ac3dec->audblk.cplbegf == 0) && p_ac3dec->audblk.cplinu) if ((p_ac3dec->audblk.cplbegf == 0) && p_ac3dec->audblk.cplinu)
{ {
for (i = 0; i < 2; i++) for (i = 0; i < 2; i++)
{ {
NeedBits (&(p_ac3dec->bit_stream), 1); p_ac3dec->audblk.rematflg[i] = bitstream_get(&(p_ac3dec->bit_stream),1);
p_ac3dec->audblk.rematflg[i] = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 1));
DumpBits (&(p_ac3dec->bit_stream), 1);
} }
} }
} }
...@@ -573,9 +448,7 @@ int parse_audblk (ac3dec_t * p_ac3dec, int blknum) ...@@ -573,9 +448,7 @@ int parse_audblk (ac3dec_t * p_ac3dec, int blknum)
if (p_ac3dec->audblk.cplinu) if (p_ac3dec->audblk.cplinu)
{ {
/* Get the coupling channel exponent strategy */ /* Get the coupling channel exponent strategy */
NeedBits (&(p_ac3dec->bit_stream), 2); p_ac3dec->audblk.cplexpstr = bitstream_get(&(p_ac3dec->bit_stream),2);
p_ac3dec->audblk.cplexpstr = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 2));
DumpBits (&(p_ac3dec->bit_stream), 2);
if ((!blknum) && (p_ac3dec->audblk.cplexpstr == EXP_REUSE)) if ((!blknum) && (p_ac3dec->audblk.cplexpstr == EXP_REUSE))
{ {
...@@ -596,9 +469,7 @@ int parse_audblk (ac3dec_t * p_ac3dec, int blknum) ...@@ -596,9 +469,7 @@ int parse_audblk (ac3dec_t * p_ac3dec, int blknum)
for (i = 0; i < p_ac3dec->bsi.nfchans; i++) for (i = 0; i < p_ac3dec->bsi.nfchans; i++)
{ {
NeedBits (&(p_ac3dec->bit_stream), 2); p_ac3dec->audblk.chexpstr[i] = bitstream_get(&(p_ac3dec->bit_stream),2);
p_ac3dec->audblk.chexpstr[i] = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 2));
DumpBits (&(p_ac3dec->bit_stream), 2);
if ((!blknum) && (p_ac3dec->audblk.chexpstr[i] == EXP_REUSE)) if ((!blknum) && (p_ac3dec->audblk.chexpstr[i] == EXP_REUSE))
{ {
...@@ -609,9 +480,7 @@ int parse_audblk (ac3dec_t * p_ac3dec, int blknum) ...@@ -609,9 +480,7 @@ int parse_audblk (ac3dec_t * p_ac3dec, int blknum)
/* Get the exponent strategy for lfe channel */ /* Get the exponent strategy for lfe channel */
if (p_ac3dec->bsi.lfeon) if (p_ac3dec->bsi.lfeon)
{ {
NeedBits (&(p_ac3dec->bit_stream), 1); p_ac3dec->audblk.lfeexpstr = bitstream_get(&(p_ac3dec->bit_stream),1);
p_ac3dec->audblk.lfeexpstr = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 1));
DumpBits (&(p_ac3dec->bit_stream), 1);
if ((!blknum) && (p_ac3dec->audblk.lfeexpstr == EXP_REUSE)) if ((!blknum) && (p_ac3dec->audblk.lfeexpstr == EXP_REUSE))
{ {
...@@ -632,9 +501,7 @@ int parse_audblk (ac3dec_t * p_ac3dec, int blknum) ...@@ -632,9 +501,7 @@ int parse_audblk (ac3dec_t * p_ac3dec, int blknum)
} }
else else
{ {
NeedBits (&(p_ac3dec->bit_stream), 6); p_ac3dec->audblk.chbwcod[i] = bitstream_get(&(p_ac3dec->bit_stream),6);
p_ac3dec->audblk.chbwcod[i] = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 6));
DumpBits (&(p_ac3dec->bit_stream), 6);
if (p_ac3dec->audblk.chbwcod[i] > 60) if (p_ac3dec->audblk.chbwcod[i] > 60)
{ {
...@@ -653,14 +520,10 @@ int parse_audblk (ac3dec_t * p_ac3dec, int blknum) ...@@ -653,14 +520,10 @@ int parse_audblk (ac3dec_t * p_ac3dec, int blknum)
/* Get the coupling exponents if they exist */ /* Get the coupling exponents if they exist */
if (p_ac3dec->audblk.cplinu && (p_ac3dec->audblk.cplexpstr != EXP_REUSE)) if (p_ac3dec->audblk.cplinu && (p_ac3dec->audblk.cplexpstr != EXP_REUSE))
{ {
NeedBits (&(p_ac3dec->bit_stream), 4); p_ac3dec->audblk.cplabsexp = bitstream_get(&(p_ac3dec->bit_stream),4);
p_ac3dec->audblk.cplabsexp = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 4));
DumpBits (&(p_ac3dec->bit_stream), 4);
for (i=0; i< p_ac3dec->audblk.ncplgrps;i++) for (i=0; i< p_ac3dec->audblk.ncplgrps;i++)
{ {
NeedBits (&(p_ac3dec->bit_stream), 7); p_ac3dec->audblk.cplexps[i] = bitstream_get(&(p_ac3dec->bit_stream),7);
p_ac3dec->audblk.cplexps[i] = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 7));
DumpBits (&(p_ac3dec->bit_stream), 7);
if (p_ac3dec->audblk.cplexps[i] >= 125) if (p_ac3dec->audblk.cplexps[i] >= 125)
{ {
...@@ -674,41 +537,29 @@ int parse_audblk (ac3dec_t * p_ac3dec, int blknum) ...@@ -674,41 +537,29 @@ int parse_audblk (ac3dec_t * p_ac3dec, int blknum)
{ {
if (p_ac3dec->audblk.chexpstr[i] != EXP_REUSE) if (p_ac3dec->audblk.chexpstr[i] != EXP_REUSE)
{ {
NeedBits (&(p_ac3dec->bit_stream), 4); p_ac3dec->audblk.exps[i][0] = bitstream_get(&(p_ac3dec->bit_stream),4);
p_ac3dec->audblk.exps[i][0] = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 4));
DumpBits (&(p_ac3dec->bit_stream), 4);
for (j=1; j<=p_ac3dec->audblk.nchgrps[i];j++) for (j=1; j<=p_ac3dec->audblk.nchgrps[i];j++)
{ {
NeedBits (&(p_ac3dec->bit_stream), 7); p_ac3dec->audblk.exps[i][j] = bitstream_get(&(p_ac3dec->bit_stream),7);
p_ac3dec->audblk.exps[i][j] = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 7));
DumpBits (&(p_ac3dec->bit_stream), 7);
if (p_ac3dec->audblk.exps[i][j] >= 125) if (p_ac3dec->audblk.exps[i][j] >= 125)
{ {
return 1; return 1;
} }
} }
NeedBits (&(p_ac3dec->bit_stream), 2); p_ac3dec->audblk.gainrng[i] = bitstream_get(&(p_ac3dec->bit_stream),2);
p_ac3dec->audblk.gainrng[i] = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 2));
DumpBits (&(p_ac3dec->bit_stream), 2);
} }
} }
/* Get the lfe channel exponents */ /* Get the lfe channel exponents */
if (p_ac3dec->bsi.lfeon && (p_ac3dec->audblk.lfeexpstr != EXP_REUSE)) if (p_ac3dec->bsi.lfeon && (p_ac3dec->audblk.lfeexpstr != EXP_REUSE))
{ {
NeedBits (&(p_ac3dec->bit_stream), 4); p_ac3dec->audblk.lfeexps[0] = bitstream_get(&(p_ac3dec->bit_stream),4);
p_ac3dec->audblk.lfeexps[0] = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 4)); p_ac3dec->audblk.lfeexps[1] = bitstream_get(&(p_ac3dec->bit_stream),7);
DumpBits (&(p_ac3dec->bit_stream), 4);
NeedBits (&(p_ac3dec->bit_stream), 7);
p_ac3dec->audblk.lfeexps[1] = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 7));
DumpBits (&(p_ac3dec->bit_stream), 7);
if (p_ac3dec->audblk.lfeexps[1] >= 125) if (p_ac3dec->audblk.lfeexps[1] >= 125)
{ {
return 1; return 1;
} }
NeedBits (&(p_ac3dec->bit_stream), 7); p_ac3dec->audblk.lfeexps[2] = bitstream_get(&(p_ac3dec->bit_stream),7);
p_ac3dec->audblk.lfeexps[2] = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 7));
DumpBits (&(p_ac3dec->bit_stream), 7);
if (p_ac3dec->audblk.lfeexps[2] >= 125) if (p_ac3dec->audblk.lfeexps[2] >= 125)
{ {
return 1; return 1;
...@@ -716,9 +567,7 @@ int parse_audblk (ac3dec_t * p_ac3dec, int blknum) ...@@ -716,9 +567,7 @@ int parse_audblk (ac3dec_t * p_ac3dec, int blknum)
} }
/* Get the parametric bit allocation parameters */ /* Get the parametric bit allocation parameters */
NeedBits (&(p_ac3dec->bit_stream), 1); p_ac3dec->audblk.baie = bitstream_get(&(p_ac3dec->bit_stream),1);
p_ac3dec->audblk.baie = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 1));
DumpBits (&(p_ac3dec->bit_stream), 1);
if ((!blknum) && (!p_ac3dec->audblk.baie)) if ((!blknum) && (!p_ac3dec->audblk.baie))
{ {
...@@ -727,27 +576,15 @@ int parse_audblk (ac3dec_t * p_ac3dec, int blknum) ...@@ -727,27 +576,15 @@ int parse_audblk (ac3dec_t * p_ac3dec, int blknum)
if (p_ac3dec->audblk.baie) if (p_ac3dec->audblk.baie)
{ {
NeedBits (&(p_ac3dec->bit_stream), 2); p_ac3dec->audblk.sdcycod = bitstream_get(&(p_ac3dec->bit_stream),2);
p_ac3dec->audblk.sdcycod = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 2)); p_ac3dec->audblk.fdcycod = bitstream_get(&(p_ac3dec->bit_stream),2);
DumpBits (&(p_ac3dec->bit_stream), 2); p_ac3dec->audblk.sgaincod = bitstream_get(&(p_ac3dec->bit_stream),2);
NeedBits (&(p_ac3dec->bit_stream), 2); p_ac3dec->audblk.dbpbcod = bitstream_get(&(p_ac3dec->bit_stream),2);
p_ac3dec->audblk.fdcycod = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 2)); p_ac3dec->audblk.floorcod = bitstream_get(&(p_ac3dec->bit_stream),3);
DumpBits (&(p_ac3dec->bit_stream), 2);
NeedBits (&(p_ac3dec->bit_stream), 2);
p_ac3dec->audblk.sgaincod = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 2));
DumpBits (&(p_ac3dec->bit_stream), 2);
NeedBits (&(p_ac3dec->bit_stream), 2);
p_ac3dec->audblk.dbpbcod = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 2));
DumpBits (&(p_ac3dec->bit_stream), 2);
NeedBits (&(p_ac3dec->bit_stream), 3);
p_ac3dec->audblk.floorcod = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 3));
DumpBits (&(p_ac3dec->bit_stream), 3);
} }
/* Get the SNR off set info if it exists */ /* Get the SNR off set info if it exists */
NeedBits (&(p_ac3dec->bit_stream), 1); p_ac3dec->audblk.snroffste = bitstream_get(&(p_ac3dec->bit_stream),1);
p_ac3dec->audblk.snroffste = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 1));
DumpBits (&(p_ac3dec->bit_stream), 1);
if ((!blknum) && (!p_ac3dec->audblk.snroffste)) if ((!blknum) && (!p_ac3dec->audblk.snroffste))
{ {
return 1; return 1;
...@@ -755,46 +592,30 @@ int parse_audblk (ac3dec_t * p_ac3dec, int blknum) ...@@ -755,46 +592,30 @@ int parse_audblk (ac3dec_t * p_ac3dec, int blknum)
if (p_ac3dec->audblk.snroffste) if (p_ac3dec->audblk.snroffste)
{ {
NeedBits (&(p_ac3dec->bit_stream), 6); p_ac3dec->audblk.csnroffst = bitstream_get(&(p_ac3dec->bit_stream),6);
p_ac3dec->audblk.csnroffst = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 6));
DumpBits (&(p_ac3dec->bit_stream), 6);
if (p_ac3dec->audblk.cplinu) if (p_ac3dec->audblk.cplinu)
{ {
NeedBits (&(p_ac3dec->bit_stream), 4); p_ac3dec->audblk.cplfsnroffst = bitstream_get(&(p_ac3dec->bit_stream),4);
p_ac3dec->audblk.cplfsnroffst = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 4)); p_ac3dec->audblk.cplfgaincod = bitstream_get(&(p_ac3dec->bit_stream),3);
DumpBits (&(p_ac3dec->bit_stream), 4);
NeedBits (&(p_ac3dec->bit_stream), 3);
p_ac3dec->audblk.cplfgaincod = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 3));
DumpBits (&(p_ac3dec->bit_stream), 3);
} }
for (i = 0;i < p_ac3dec->bsi.nfchans; i++) for (i = 0;i < p_ac3dec->bsi.nfchans; i++)
{ {
NeedBits (&(p_ac3dec->bit_stream), 4); p_ac3dec->audblk.fsnroffst[i] = bitstream_get(&(p_ac3dec->bit_stream),4);
p_ac3dec->audblk.fsnroffst[i] = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 4)); p_ac3dec->audblk.fgaincod[i] = bitstream_get(&(p_ac3dec->bit_stream),3);
DumpBits (&(p_ac3dec->bit_stream), 4);
NeedBits (&(p_ac3dec->bit_stream), 3);
p_ac3dec->audblk.fgaincod[i] = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 3));
DumpBits (&(p_ac3dec->bit_stream), 3);
} }
if (p_ac3dec->bsi.lfeon) if (p_ac3dec->bsi.lfeon)
{ {
NeedBits (&(p_ac3dec->bit_stream), 4); p_ac3dec->audblk.lfefsnroffst = bitstream_get(&(p_ac3dec->bit_stream),4);
p_ac3dec->audblk.lfefsnroffst = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 4)); p_ac3dec->audblk.lfefgaincod = bitstream_get(&(p_ac3dec->bit_stream),3);
DumpBits (&(p_ac3dec->bit_stream), 4);
NeedBits (&(p_ac3dec->bit_stream), 3);
p_ac3dec->audblk.lfefgaincod = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 3));
DumpBits (&(p_ac3dec->bit_stream), 3);
} }
} }
/* Get coupling leakage info if it exists */ /* Get coupling leakage info if it exists */
if (p_ac3dec->audblk.cplinu) if (p_ac3dec->audblk.cplinu)
{ {
NeedBits (&(p_ac3dec->bit_stream), 1); p_ac3dec->audblk.cplleake = bitstream_get(&(p_ac3dec->bit_stream),1);
p_ac3dec->audblk.cplleake = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 1));
DumpBits (&(p_ac3dec->bit_stream), 1);
if ((!blknum) && (!p_ac3dec->audblk.cplleake)) if ((!blknum) && (!p_ac3dec->audblk.cplleake))
{ {
return 1; return 1;
...@@ -802,27 +623,19 @@ int parse_audblk (ac3dec_t * p_ac3dec, int blknum) ...@@ -802,27 +623,19 @@ int parse_audblk (ac3dec_t * p_ac3dec, int blknum)
if (p_ac3dec->audblk.cplleake) if (p_ac3dec->audblk.cplleake)
{ {
NeedBits (&(p_ac3dec->bit_stream), 3); p_ac3dec->audblk.cplfleak = bitstream_get(&(p_ac3dec->bit_stream),3);
p_ac3dec->audblk.cplfleak = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 3)); p_ac3dec->audblk.cplsleak = bitstream_get(&(p_ac3dec->bit_stream),3);
DumpBits (&(p_ac3dec->bit_stream), 3);
NeedBits (&(p_ac3dec->bit_stream), 3);
p_ac3dec->audblk.cplsleak = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 3));
DumpBits (&(p_ac3dec->bit_stream), 3);
} }
} }
/* Get the delta bit alloaction info */ /* Get the delta bit alloaction info */
NeedBits (&(p_ac3dec->bit_stream), 1); p_ac3dec->audblk.deltbaie = bitstream_get(&(p_ac3dec->bit_stream),1);
p_ac3dec->audblk.deltbaie = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 1));
DumpBits (&(p_ac3dec->bit_stream), 1);
if (p_ac3dec->audblk.deltbaie) if (p_ac3dec->audblk.deltbaie)
{ {
if (p_ac3dec->audblk.cplinu) if (p_ac3dec->audblk.cplinu)
{ {
NeedBits (&(p_ac3dec->bit_stream), 2); p_ac3dec->audblk.cpldeltbae = bitstream_get(&(p_ac3dec->bit_stream),2);
p_ac3dec->audblk.cpldeltbae = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 2));
DumpBits (&(p_ac3dec->bit_stream), 2);
if (p_ac3dec->audblk.cpldeltbae == 3) if (p_ac3dec->audblk.cpldeltbae == 3)
{ {
return 1; return 1;
...@@ -831,9 +644,7 @@ int parse_audblk (ac3dec_t * p_ac3dec, int blknum) ...@@ -831,9 +644,7 @@ int parse_audblk (ac3dec_t * p_ac3dec, int blknum)
for (i = 0;i < p_ac3dec->bsi.nfchans; i++) for (i = 0;i < p_ac3dec->bsi.nfchans; i++)
{ {
NeedBits (&(p_ac3dec->bit_stream), 2); p_ac3dec->audblk.deltbae[i] = bitstream_get(&(p_ac3dec->bit_stream),2);
p_ac3dec->audblk.deltbae[i] = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 2));
DumpBits (&(p_ac3dec->bit_stream), 2);
if (p_ac3dec->audblk.deltbae[i] == 3) if (p_ac3dec->audblk.deltbae[i] == 3)
{ {
return 1; return 1;
...@@ -842,20 +653,12 @@ int parse_audblk (ac3dec_t * p_ac3dec, int blknum) ...@@ -842,20 +653,12 @@ int parse_audblk (ac3dec_t * p_ac3dec, int blknum)
if (p_ac3dec->audblk.cplinu && (p_ac3dec->audblk.cpldeltbae == DELTA_BIT_NEW)) if (p_ac3dec->audblk.cplinu && (p_ac3dec->audblk.cpldeltbae == DELTA_BIT_NEW))
{ {
NeedBits (&(p_ac3dec->bit_stream), 3); p_ac3dec->audblk.cpldeltnseg = bitstream_get(&(p_ac3dec->bit_stream),3);
p_ac3dec->audblk.cpldeltnseg = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 3));
DumpBits (&(p_ac3dec->bit_stream), 3);
for (i = 0;i < p_ac3dec->audblk.cpldeltnseg + 1; i++) for (i = 0;i < p_ac3dec->audblk.cpldeltnseg + 1; i++)
{ {
NeedBits (&(p_ac3dec->bit_stream), 5); p_ac3dec->audblk.cpldeltoffst[i] = bitstream_get(&(p_ac3dec->bit_stream),5);
p_ac3dec->audblk.cpldeltoffst[i] = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 5)); p_ac3dec->audblk.cpldeltlen[i] = bitstream_get(&(p_ac3dec->bit_stream),4);
DumpBits (&(p_ac3dec->bit_stream), 5); p_ac3dec->audblk.cpldeltba[i] = bitstream_get(&(p_ac3dec->bit_stream),3);
NeedBits (&(p_ac3dec->bit_stream), 4);
p_ac3dec->audblk.cpldeltlen[i] = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 4));
DumpBits (&(p_ac3dec->bit_stream), 4);
NeedBits (&(p_ac3dec->bit_stream), 3);
p_ac3dec->audblk.cpldeltba[i] = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 3));
DumpBits (&(p_ac3dec->bit_stream), 3);
} }
} }
...@@ -863,42 +666,29 @@ int parse_audblk (ac3dec_t * p_ac3dec, int blknum) ...@@ -863,42 +666,29 @@ int parse_audblk (ac3dec_t * p_ac3dec, int blknum)
{ {
if (p_ac3dec->audblk.deltbae[i] == DELTA_BIT_NEW) if (p_ac3dec->audblk.deltbae[i] == DELTA_BIT_NEW)
{ {
NeedBits (&(p_ac3dec->bit_stream), 3); p_ac3dec->audblk.deltnseg[i] = bitstream_get(&(p_ac3dec->bit_stream),3);
p_ac3dec->audblk.deltnseg[i] = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 3));
DumpBits (&(p_ac3dec->bit_stream), 3);
// if (p_ac3dec->audblk.deltnseg[i] >= 8) // if (p_ac3dec->audblk.deltnseg[i] >= 8)
// fprintf (stderr, "parse debug: p_ac3dec->audblk.deltnseg[%i] == %i\n", i, p_ac3dec->audblk.deltnseg[i]); // fprintf (stderr, "parse debug: p_ac3dec->audblk.deltnseg[%i] == %i\n", i, p_ac3dec->audblk.deltnseg[i]);
for (j = 0; j < p_ac3dec->audblk.deltnseg[i] + 1; j++) for (j = 0; j < p_ac3dec->audblk.deltnseg[i] + 1; j++)
{ {
NeedBits (&(p_ac3dec->bit_stream), 5); p_ac3dec->audblk.deltoffst[i][j] = bitstream_get(&(p_ac3dec->bit_stream),5);
p_ac3dec->audblk.deltoffst[i][j] = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 5)); p_ac3dec->audblk.deltlen[i][j] = bitstream_get(&(p_ac3dec->bit_stream),4);
DumpBits (&(p_ac3dec->bit_stream), 5); p_ac3dec->audblk.deltba[i][j] = bitstream_get(&(p_ac3dec->bit_stream),3);
NeedBits (&(p_ac3dec->bit_stream), 4);
p_ac3dec->audblk.deltlen[i][j] = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 4));
DumpBits (&(p_ac3dec->bit_stream), 4);
NeedBits (&(p_ac3dec->bit_stream), 3);
p_ac3dec->audblk.deltba[i][j] = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 3));
DumpBits (&(p_ac3dec->bit_stream), 3);
} }
} }
} }
} }
/* Check to see if there's any dummy info to get */ /* Check to see if there's any dummy info to get */
NeedBits (&(p_ac3dec->bit_stream), 1); p_ac3dec->audblk.skiple = bitstream_get(&(p_ac3dec->bit_stream),1);
p_ac3dec->audblk.skiple = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 1));
DumpBits (&(p_ac3dec->bit_stream), 1);
if (p_ac3dec->audblk.skiple) if (p_ac3dec->audblk.skiple)
{ {
NeedBits (&(p_ac3dec->bit_stream), 9); p_ac3dec->audblk.skipl = bitstream_get(&(p_ac3dec->bit_stream),9);
p_ac3dec->audblk.skipl = (u16)(p_ac3dec->bit_stream.buffer >> (32 - 9));
DumpBits (&(p_ac3dec->bit_stream), 9);
for (i = 0; i < p_ac3dec->audblk.skipl ; i++) for (i = 0; i < p_ac3dec->audblk.skipl ; i++)
{ {
NeedBits (&(p_ac3dec->bit_stream), 8); bitstream_get(&(p_ac3dec->bit_stream),8);
DumpBits (&(p_ac3dec->bit_stream), 8);
} }
} }
...@@ -911,24 +701,18 @@ void parse_auxdata (ac3dec_t * p_ac3dec) ...@@ -911,24 +701,18 @@ void parse_auxdata (ac3dec_t * p_ac3dec)
int skip_length; int skip_length;
skip_length = (p_ac3dec->syncinfo.frame_size * 16) - p_ac3dec->bit_stream.total_bits_read - 17 - 1; skip_length = (p_ac3dec->syncinfo.frame_size * 16) - p_ac3dec->bit_stream.total_bits_read - 17 - 1;
// fprintf (stderr, "parse debug: skip_length == %i\n", skip_length);
for (i = 0; i < skip_length; i++) for (i = 0; i < skip_length; i++)
{ {
NeedBits (&(p_ac3dec->bit_stream), 1); bitstream_get(&(p_ac3dec->bit_stream),1);
DumpBits (&(p_ac3dec->bit_stream), 1);
} }
/* get the auxdata exists bit */ /* get the auxdata exists bit */
NeedBits (&(p_ac3dec->bit_stream), 1); bitstream_get(&(p_ac3dec->bit_stream),1);
DumpBits (&(p_ac3dec->bit_stream), 1);
/* Skip the CRC reserved bit */ /* Skip the CRC reserved bit */
NeedBits (&(p_ac3dec->bit_stream), 1); bitstream_get(&(p_ac3dec->bit_stream),1);
DumpBits (&(p_ac3dec->bit_stream), 1);
/* Get the crc */ /* Get the crc */
NeedBits (&(p_ac3dec->bit_stream), 16); bitstream_get(&(p_ac3dec->bit_stream),16);
DumpBits (&(p_ac3dec->bit_stream), 16);
} }
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