December 2007 - FFmpeg-soc - lists.ffmpeg.org

[soc]: r1713 - in eac3: ac3dec.c ac3dec.h eac3dec.c
by jbr 30 Dec '07

30 Dec '07

Author: jbr Date: Sun Dec 30 20:42:35 2007 New Revision: 1713 Log: change ff_ac3_do_rematrixing() back to taking an AC3DecodeContext as an argument Modified: eac3/ac3dec.c eac3/ac3dec.h eac3/eac3dec.c Modified: eac3/ac3dec.c ============================================================================== --- eac3/ac3dec.c (original) +++ eac3/ac3dec.c Sun Dec 30 20:42:35 2007 @@ -540,21 +540,22 @@ static int get_transform_coeffs(AC3Decod * Stereo rematrixing. * reference: Section 7.5.4 Rematrixing : Decoding Technique */ -void ff_ac3_do_rematrixing(float (*transform_coeffs)[256], int end, - int num_rematrixing_bands, int *rematrixing_flags) +void ff_ac3_do_rematrixing(AC3DecodeContext *ctx) { int bnd, i; - int bndend; + int end, bndend; float tmp0, tmp1; - for(bnd=0; bnd<num_rematrixing_bands; bnd++) { - if(rematrixing_flags[bnd]) { + end = FFMIN(ctx->end_freq[1], ctx->end_freq[2]); + + for(bnd=0; bnd<ctx->num_rematrixing_bands; bnd++) { + if(ctx->rematrixing_flags[bnd]) { bndend = FFMIN(end, ff_ac3_rematrix_band_tab[bnd+1]); for(i=ff_ac3_rematrix_band_tab[bnd]; i<bndend; i++) { - tmp0 = transform_coeffs[1][i]; - tmp1 = transform_coeffs[2][i]; - transform_coeffs[1][i] = tmp0 + tmp1; - transform_coeffs[2][i] = tmp0 - tmp1; + tmp0 = ctx->transform_coeffs[1][i]; + tmp1 = ctx->transform_coeffs[2][i]; + ctx->transform_coeffs[1][i] = tmp0 + tmp1; + ctx->transform_coeffs[2][i] = tmp0 - tmp1; } } } @@ -938,9 +939,7 @@ static int ac3_parse_audio_block(AC3Deco /* recover coefficients if rematrixing is in use */ if(ctx->channel_mode == AC3_CHMODE_STEREO) { - ff_ac3_do_rematrixing(ctx->transform_coeffs, - FFMIN(ctx->end_freq[1], ctx->end_freq[2]), - ctx->num_rematrixing_bands, ctx->rematrixing_flags); + ff_ac3_do_rematrixing(ctx); } /* apply scaling to coefficients (headroom, dynrng) */ Modified: eac3/ac3dec.h ============================================================================== --- eac3/ac3dec.h (original) +++ eac3/ac3dec.h Sun Dec 30 20:42:35 2007 @@ -250,7 +250,7 @@ void ff_ac3_uncouple_channels(AC3DecodeC void ff_ac3_remove_dithering(AC3DecodeContext *s); -void ff_ac3_do_rematrixing(float (*transform_coeffs)[256], int end, int nrematbnd, int *rematflg); +void ff_ac3_do_rematrixing(AC3DecodeContext *s); void ff_ac3_do_imdct_256(float *tmp_output, float *transform_coeffs, MDCTContext *imdct_256, float *tmp_imdct); Modified: eac3/eac3dec.c ============================================================================== --- eac3/eac3dec.c (original) +++ eac3/eac3dec.c Sun Dec 30 20:42:35 2007 @@ -1237,9 +1237,7 @@ static int eac3_decode_frame(AVCodecCont /* recover coefficients if rematrixing is in use */ if (c->channel_mode == AC3_CHMODE_STEREO) - ff_ac3_do_rematrixing(c->transform_coeffs, - FFMIN(c->end_freq[1], c->end_freq[2]), - c->num_rematrixing_bands, c->rematrixing_flags); + ff_ac3_do_rematrixing(c); /* apply scaling to coefficients (dialnorm, dynrng) */ for (ch = 1; ch <= c->fbw_channels + c->lfe_on; ch++) {

1 0

[soc]: r1712 - eac3/eac3dec.c
by jbr 30 Dec '07

30 Dec '07

Author: jbr Date: Sun Dec 30 20:34:16 2007 New Revision: 1712 Log: remove redundant line Modified: eac3/eac3dec.c Modified: eac3/eac3dec.c ============================================================================== --- eac3/eac3dec.c (original) +++ eac3/eac3dec.c Sun Dec 30 20:34:16 2007 @@ -1022,7 +1022,6 @@ static int parse_audblk(AC3DecodeContext return -1; } if (s->exp_strategy[blk][ch] != EXP_REUSE) { - grpsize = 3 << (s->exp_strategy[blk][ch] - 1); s->start_freq[ch] = 0; if ((!s->channel_in_cpl[ch]) && (!s->chinspx[ch])) { chbwcod = get_bits(gbc, 6);

1 0

[soc]: r1711 - in eac3: ac3dec.c ac3dec.h eac3dec.c
by jbr 30 Dec '07

30 Dec '07

Author: jbr Date: Sun Dec 30 19:59:09 2007 New Revision: 1711 Log: change ff_ac3_uncouple_channels() back to taking an AC3DecodeContext as an argument Modified: eac3/ac3dec.c eac3/ac3dec.h eac3/eac3dec.c Modified: eac3/ac3dec.c ============================================================================== --- eac3/ac3dec.c (original) +++ eac3/ac3dec.c Sun Dec 30 19:59:09 2007 @@ -365,28 +365,23 @@ void ff_ac3_decode_exponents(GetBitConte * range using the coupling coefficients and coupling coordinates. * reference: Section 7.4.3 Coupling Coordinate Format */ -void ff_ac3_uncouple_channels(int fbw_channels, int cpl_start_freq, - int num_cpl_bands, int channel_in_cpl[AC3_MAX_CHANNELS], - int cpl_band_struct[18], - float transform_coeffs[AC3_MAX_CHANNELS][256], - float cpl_coords[AC3_MAX_CHANNELS][18]) +void ff_ac3_uncouple_channels(AC3DecodeContext *ctx) { int i, j, ch, bnd, subbnd; subbnd = -1; - i = cpl_start_freq; - for(bnd=0; bnd<num_cpl_bands; bnd++) { + i = ctx->start_freq[CPL_CH]; + for(bnd=0; bnd<ctx->num_cpl_bands; bnd++) { do { subbnd++; for(j=0; j<12; j++) { - for(ch=1; ch<=fbw_channels; ch++) { - if(channel_in_cpl[ch]) - transform_coeffs[ch][i] = transform_coeffs[CPL_CH][i] * - cpl_coords[ch][bnd] * 8.0f; + for(ch=1; ch<=ctx->fbw_channels; ch++) { + if(ctx->channel_in_cpl[ch]) + ctx->transform_coeffs[ch][i] = ctx->transform_coeffs[CPL_CH][i] * ctx->cpl_coords[ch][bnd] * 8.0f; } i++; } - } while(cpl_band_struct[subbnd]); + } while(ctx->cpl_band_struct[subbnd]); } } @@ -522,10 +517,7 @@ static int get_transform_coeffs(AC3Decod av_log(ctx->avctx, AV_LOG_ERROR, "error in decoupling channels\n"); return -1; } - ff_ac3_uncouple_channels(ctx->fbw_channels, - ctx->start_freq[CPL_CH], ctx->num_cpl_bands, - ctx->channel_in_cpl, ctx->cpl_band_struct, - ctx->transform_coeffs, ctx->cpl_coords); + ff_ac3_uncouple_channels(ctx); got_cplchan = 1; } end = ctx->end_freq[CPL_CH]; Modified: eac3/ac3dec.h ============================================================================== --- eac3/ac3dec.h (original) +++ eac3/ac3dec.h Sun Dec 30 19:59:09 2007 @@ -246,11 +246,7 @@ typedef struct { int ff_ac3_get_transform_coeffs_ch(AC3DecodeContext *s, int ch, mant_groups *m); -void ff_ac3_uncouple_channels(int fbw_channels, int cpl_start_freq, - int num_cpl_bands, int channel_in_cpl[AC3_MAX_CHANNELS], - int cpl_band_struct[18], - float transform_coeffs[AC3_MAX_CHANNELS][256], - float cpl_coords[AC3_MAX_CHANNELS][18]); +void ff_ac3_uncouple_channels(AC3DecodeContext *s); void ff_ac3_remove_dithering(AC3DecodeContext *s); Modified: eac3/eac3dec.c ============================================================================== --- eac3/eac3dec.c (original) +++ eac3/eac3dec.c Sun Dec 30 19:59:09 2007 @@ -1153,9 +1153,7 @@ static int parse_audblk(AC3DecodeContext } if (s->cpl_in_use[blk]) { - ff_ac3_uncouple_channels(s->fbw_channels, s->start_freq[CPL_CH], - s->num_cpl_bands, s->channel_in_cpl, s->cpl_band_struct, - s->transform_coeffs, s->cpl_coords); + ff_ac3_uncouple_channels(s); } if(!s->dither_all)

1 0

[soc]: r1710 - in eac3: ac3dec.c ac3dec.h eac3dec.c
by jbr 30 Dec '07

30 Dec '07

Author: jbr Date: Sun Dec 30 19:01:23 2007 New Revision: 1710 Log: change ff_ac3_get_transform_coeffs_ch() back to taking an AC3DecodeContext as an input parameter Modified: eac3/ac3dec.c eac3/ac3dec.h eac3/eac3dec.c Modified: eac3/ac3dec.c ============================================================================== --- eac3/ac3dec.c (original) +++ eac3/ac3dec.c Sun Dec 30 19:01:23 2007 @@ -394,17 +394,25 @@ void ff_ac3_uncouple_channels(int fbw_ch * Get the transform coefficients for a particular channel * reference: Section 7.3 Quantization and Decoding of Mantissas */ -int ff_ac3_get_transform_coeffs_ch(mant_groups *m, GetBitContext *gbc, uint8_t *exps, - uint8_t *bap, float *coeffs, int start, - int end, AVRandomState *dith_state) +int ff_ac3_get_transform_coeffs_ch(AC3DecodeContext *ctx, int ch_index, mant_groups *m) { - int i, gcode, tbap; + GetBitContext *gbc = &ctx->gbc; + int i, gcode, tbap, start, end; + uint8_t *exps; + uint8_t *bap; + float *coeffs; + + exps = ctx->dexps[ch_index]; + bap = ctx->bap[ch_index]; + coeffs = ctx->transform_coeffs[ch_index]; + start = ctx->start_freq[ch_index]; + end = ctx->end_freq[ch_index]; for (i = start; i < end; i++) { tbap = bap[i]; switch (tbap) { case 0: - coeffs[i] = ((av_random(dith_state) & 0xFFFF) / 65535.0f) - 0.5f; + coeffs[i] = ((av_random(&ctx->dith_state) & 0xFFFF) / 65535.0f) - 0.5f; break; case 1: @@ -504,20 +512,13 @@ static int get_transform_coeffs(AC3Decod for (ch = 1; ch <= ctx->channels; ch++) { /* transform coefficients for full-bandwidth channel */ - //if (get_transform_coeffs_ch(ctx, ch, &m)) - if(ff_ac3_get_transform_coeffs_ch(&m, &ctx->gbc, ctx->dexps[ch], - ctx->bap[ch], ctx->transform_coeffs[ch], ctx->start_freq[ch], - ctx->end_freq[ch], &ctx->dith_state)) + if(ff_ac3_get_transform_coeffs_ch(ctx, ch, &m)) return -1; /* tranform coefficients for coupling channel come right after the coefficients for the first coupled channel*/ if (ctx->channel_in_cpl[ch]) { if (!got_cplchan) { - if (ff_ac3_get_transform_coeffs_ch(&m, &ctx->gbc, - ctx->dexps[CPL_CH], ctx->bap[CPL_CH], - ctx->transform_coeffs[CPL_CH], - ctx->start_freq[CPL_CH], ctx->end_freq[CPL_CH], - &ctx->dith_state)) { + if (ff_ac3_get_transform_coeffs_ch(ctx, CPL_CH, &m)) { av_log(ctx->avctx, AV_LOG_ERROR, "error in decoupling channels\n"); return -1; } Modified: eac3/ac3dec.h ============================================================================== --- eac3/ac3dec.h (original) +++ eac3/ac3dec.h Sun Dec 30 19:01:23 2007 @@ -244,8 +244,7 @@ typedef struct { int b4ptr; } mant_groups; -int ff_ac3_get_transform_coeffs_ch(mant_groups *m, GetBitContext *gb, uint8_t *exps, - uint8_t *bap, float *coeffs, int start, int end, AVRandomState *dith_state); +int ff_ac3_get_transform_coeffs_ch(AC3DecodeContext *s, int ch, mant_groups *m); void ff_ac3_uncouple_channels(int fbw_channels, int cpl_start_freq, int num_cpl_bands, int channel_in_cpl[AC3_MAX_CHANNELS], Modified: eac3/eac3dec.c ============================================================================== --- eac3/eac3dec.c (original) +++ eac3/eac3dec.c Sun Dec 30 19:01:23 2007 @@ -277,9 +277,7 @@ static void idct_transform_coeffs_ch(AC3 static void get_eac3_transform_coeffs_ch(AC3DecodeContext *s, int blk, int ch, mant_groups *m){ if (!s->channel_uses_aht[ch]) { - ff_ac3_get_transform_coeffs_ch(m, &s->gbc, s->dexps[ch], s->bap[ch], - s->transform_coeffs[ch], s->start_freq[ch], s->end_freq[ch], - &s->dith_state); + ff_ac3_get_transform_coeffs_ch(s, ch, m); } else if (s->channel_uses_aht[ch] == 1) { get_transform_coeffs_aht_ch(s, ch); s->channel_uses_aht[ch] = -1; /* AHT info for this frame has been read - do not read again */

1 0

[soc]: r1709 - eac3/ac3dec.c
by jbr 30 Dec '07

30 Dec '07

Author: jbr Date: Sun Dec 30 17:44:42 2007 New Revision: 1709 Log: simplify choice of hebap or bap Modified: eac3/ac3dec.c Modified: eac3/ac3dec.c ============================================================================== --- eac3/ac3dec.c (original) +++ eac3/ac3dec.c Sun Dec 30 17:44:42 2007 @@ -467,29 +467,23 @@ void ff_ac3_remove_dithering(AC3DecodeCo int end=0; float *coeffs; uint8_t *bap; - uint8_t *hebap; - int aht; for(ch=1; ch<=s->fbw_channels; ch++) { if(!s->dither_flag[ch]) { coeffs = s->transform_coeffs[ch]; - bap = s->bap[ch]; - hebap = s->hebap[ch]; - aht = s->channel_uses_aht[ch]; + bap = s->channel_uses_aht[ch] ? s->hebap[ch] : s->bap[ch]; if(s->channel_in_cpl[ch]) end = s->start_freq[CPL_CH]; else end = s->end_freq[ch]; for(i=0; i<end; i++) { - if(aht ? !hebap[i] : !bap[i]) + if(!bap[i]) coeffs[i] = 0.0f; } if(s->channel_in_cpl[ch]) { - bap = s->bap[CPL_CH]; - hebap = s->hebap[CPL_CH]; - aht = s->channel_uses_aht[CPL_CH]; + bap = s->channel_uses_aht[CPL_CH] ? s->hebap[CPL_CH] : s->bap[CPL_CH]; for(; i<s->end_freq[CPL_CH]; i++) { - if(aht ? !hebap[i] : !bap[i]) + if(!bap[i]) coeffs[i] = 0.0f; } }

1 0

[soc]: r1708 - in eac3: ac3dec.c ac3dec.h eac3dec.c
by jbr 30 Dec '07

30 Dec '07

Author: jbr Date: Sun Dec 30 17:42:30 2007 New Revision: 1708 Log: share function to remove dithering between ac3 and eac3 decoders Modified: eac3/ac3dec.c eac3/ac3dec.h eac3/eac3dec.c Modified: eac3/ac3dec.c ============================================================================== --- eac3/ac3dec.c (original) +++ eac3/ac3dec.c Sun Dec 30 17:42:30 2007 @@ -205,6 +205,8 @@ void ff_ac3_tables_init(void) static int ac3_decode_init(AVCodecContext *avctx) { AC3DecodeContext *ctx = avctx->priv_data; + + memset(ctx, 0, sizeof(*ctx)); ctx->avctx = avctx; ac3_common_init(); @@ -460,28 +462,34 @@ int ff_ac3_get_transform_coeffs_ch(mant_ * Remove random dithering from coefficients with zero-bit mantissas * reference: Section 7.3.4 Dither for Zero Bit Mantissas (bap=0) */ -static void remove_dithering(AC3DecodeContext *ctx) { +void ff_ac3_remove_dithering(AC3DecodeContext *s) { int ch, i; int end=0; float *coeffs; uint8_t *bap; + uint8_t *hebap; + int aht; - for(ch=1; ch<=ctx->fbw_channels; ch++) { - if(!ctx->dither_flag[ch]) { - coeffs = ctx->transform_coeffs[ch]; - bap = ctx->bap[ch]; - if(ctx->channel_in_cpl[ch]) - end = ctx->start_freq[CPL_CH]; + for(ch=1; ch<=s->fbw_channels; ch++) { + if(!s->dither_flag[ch]) { + coeffs = s->transform_coeffs[ch]; + bap = s->bap[ch]; + hebap = s->hebap[ch]; + aht = s->channel_uses_aht[ch]; + if(s->channel_in_cpl[ch]) + end = s->start_freq[CPL_CH]; else - end = ctx->end_freq[ch]; + end = s->end_freq[ch]; for(i=0; i<end; i++) { - if(bap[i] == 0) + if(aht ? !hebap[i] : !bap[i]) coeffs[i] = 0.0f; } - if(ctx->channel_in_cpl[ch]) { - bap = ctx->bap[CPL_CH]; - for(; i<ctx->end_freq[CPL_CH]; i++) { - if(bap[i] == 0) + if(s->channel_in_cpl[ch]) { + bap = s->bap[CPL_CH]; + hebap = s->hebap[CPL_CH]; + aht = s->channel_uses_aht[CPL_CH]; + for(; i<s->end_freq[CPL_CH]; i++) { + if(aht ? !hebap[i] : !bap[i]) coeffs[i] = 0.0f; } } @@ -536,7 +544,7 @@ static int get_transform_coeffs(AC3Decod /* if any channel doesn't use dithering, zero appropriate coefficients */ if(!ctx->dither_all) - remove_dithering(ctx); + ff_ac3_remove_dithering(ctx); return 0; } Modified: eac3/ac3dec.h ============================================================================== --- eac3/ac3dec.h (original) +++ eac3/ac3dec.h Sun Dec 30 17:42:30 2007 @@ -253,6 +253,8 @@ void ff_ac3_uncouple_channels(int fbw_ch float transform_coeffs[AC3_MAX_CHANNELS][256], float cpl_coords[AC3_MAX_CHANNELS][18]); +void ff_ac3_remove_dithering(AC3DecodeContext *s); + void ff_ac3_do_rematrixing(float (*transform_coeffs)[256], int end, int nrematbnd, int *rematflg); void ff_ac3_do_imdct_256(float *tmp_output, float *transform_coeffs, Modified: eac3/eac3dec.c ============================================================================== --- eac3/eac3dec.c (original) +++ eac3/eac3dec.c Sun Dec 30 17:42:30 2007 @@ -293,42 +293,6 @@ static void get_eac3_transform_coeffs_ch s->end_freq[ch] * sizeof(*s->transform_coeffs[ch])); } -static void remove_dithering(AC3DecodeContext *s) { - /* TODO: merge with same function in ac3dec.c */ - int ch, i; - int end=0; - float *coeffs; - uint8_t *bap; - uint8_t *hebap; - int aht; - - for(ch=1; ch<=s->fbw_channels; ch++) { - if(!s->dither_flag[ch]) { - coeffs = s->transform_coeffs[ch]; - bap = s->bap[ch]; - hebap = s->hebap[ch]; - aht = s->channel_uses_aht[ch]; - if(s->channel_in_cpl[ch]) - end = s->start_freq[CPL_CH]; - else - end = s->end_freq[ch]; - for(i=0; i<end; i++) { - if(aht ? !hebap[i] : !bap[i]) - coeffs[i] = 0.0f; - } - if(s->channel_in_cpl[ch]) { - bap = s->bap[CPL_CH]; - hebap = s->hebap[CPL_CH]; - aht = s->channel_uses_aht[CPL_CH]; - for(; i<s->end_freq[CPL_CH]; i++) { - if(aht ? !hebap[i] : !bap[i]) - coeffs[i] = 0.0f; - } - } - } - } -} - static int parse_bsi(AC3DecodeContext *s){ int i, blk; GetBitContext *gbc = &s->gbc; @@ -1197,7 +1161,7 @@ static int parse_audblk(AC3DecodeContext } if(!s->dither_all) - remove_dithering(s); + ff_ac3_remove_dithering(s); #if 0 //apply spectral extension

1 0

[soc]: r1699 - eac3/eac3dec.c
by jbr 30 Dec '07

30 Dec '07

Author: jbr Date: Sun Dec 30 03:18:11 2007 New Revision: 1699 Log: correctly use bap or hebap depending on whether aht is used or not Modified: eac3/eac3dec.c Modified: eac3/eac3dec.c ============================================================================== --- eac3/eac3dec.c (original) +++ eac3/eac3dec.c Sun Dec 30 03:18:11 2007 @@ -282,23 +282,29 @@ static void remove_dithering(EAC3Context int end=0; float *coeffs; uint8_t *bap; + uint8_t *hebap; + int aht; for(ch=1; ch<=s->fbw_channels; ch++) { if(!s->dither_flag[ch]) { coeffs = s->transform_coeffs[ch]; bap = s->bap[ch]; + hebap = s->hebap[ch]; + aht = s->channel_uses_aht[ch]; if(s->channel_in_cpl[ch]) end = s->start_freq[CPL_CH]; else end = s->end_freq[ch]; for(i=0; i<end; i++) { - if(bap[i] == 0) + if((aht && !bap[i]) && (!aht && !hebap[i])) coeffs[i] = 0.0f; } if(s->channel_in_cpl[ch]) { bap = s->bap[CPL_CH]; + hebap = s->hebap[CPL_CH]; + aht = s->channel_uses_aht[CPL_CH]; for(; i<s->end_freq[CPL_CH]; i++) { - if(bap[i] == 0) + if((aht && !bap[i]) && (!aht && !hebap[i])) coeffs[i] = 0.0f; } }

3 3

[soc]: r1707 - eac3/eac3dec.c
by jbr 30 Dec '07

30 Dec '07

Author: jbr Date: Sun Dec 30 17:14:31 2007 New Revision: 1707 Log: fix zero-mantissa dithering. properly choose between hebap and bap. Modified: eac3/eac3dec.c Modified: eac3/eac3dec.c ============================================================================== --- eac3/eac3dec.c (original) +++ eac3/eac3dec.c Sun Dec 30 17:14:31 2007 @@ -313,7 +313,7 @@ static void remove_dithering(AC3DecodeCo else end = s->end_freq[ch]; for(i=0; i<end; i++) { - if((aht && !bap[i]) && (!aht && !hebap[i])) + if(aht ? !hebap[i] : !bap[i]) coeffs[i] = 0.0f; } if(s->channel_in_cpl[ch]) { @@ -321,7 +321,7 @@ static void remove_dithering(AC3DecodeCo hebap = s->hebap[CPL_CH]; aht = s->channel_uses_aht[CPL_CH]; for(; i<s->end_freq[CPL_CH]; i++) { - if((aht && !bap[i]) && (!aht && !hebap[i])) + if(aht ? !hebap[i] : !bap[i]) coeffs[i] = 0.0f; } }

1 0

[soc]: r1706 - in eac3: ac3.h ac3dec.c ac3dec.h eac3.h eac3dec.c
by jbr 30 Dec '07

30 Dec '07

Author: jbr Date: Sun Dec 30 07:45:59 2007 New Revision: 1706 Log: use same context for ac3 and eac3 decoders Removed: eac3/eac3.h Modified: eac3/ac3.h eac3/ac3dec.c eac3/ac3dec.h eac3/eac3dec.c Modified: eac3/ac3.h ============================================================================== --- eac3/ac3.h (original) +++ eac3/ac3.h Sun Dec 30 07:45:59 2007 @@ -43,8 +43,6 @@ #define EXP_D25 2 #define EXP_D45 3 -#define AC3_OUTPUT_LFEON 8 - /** Delta bit allocation strategy */ typedef enum { DBA_REUSE = 0, Modified: eac3/ac3dec.c ============================================================================== --- eac3/ac3dec.c (original) +++ eac3/ac3dec.c Sun Dec 30 07:45:59 2007 @@ -106,79 +106,6 @@ const uint8_t ff_ac3_default_coeffs[8][5 { { 2, 7 }, { 5, 5 }, { 7, 2 }, { 6, 7 }, { 7, 6 }, }, }; -/* override ac3.h to include coupling channel */ -#undef AC3_MAX_CHANNELS -#define AC3_MAX_CHANNELS 7 - -typedef struct { - int channel_mode; ///< channel mode (acmod) - int block_switch[AC3_MAX_CHANNELS]; ///< block switch flags - int dither_flag[AC3_MAX_CHANNELS]; ///< dither flags - int dither_all; ///< true if all channels are dithered - int cpl_in_use; ///< coupling in use - int channel_in_cpl[AC3_MAX_CHANNELS]; ///< channel in coupling - int phase_flags_in_use; ///< phase flags in use - int cpl_band_struct[18]; ///< coupling band structure - int rematrixing_strategy; ///< rematrixing strategy - int num_rematrixing_bands; ///< number of rematrixing bands - int rematrixing_flags[4]; ///< rematrixing flags - int exp_strategy[AC3_MAX_CHANNELS]; ///< exponent strategies - int snr_offset[AC3_MAX_CHANNELS]; ///< signal-to-noise ratio offsets - int fast_gain[AC3_MAX_CHANNELS]; ///< fast gain values (signal-to-mask ratio) - int dba_mode[AC3_MAX_CHANNELS]; ///< delta bit allocation mode - int dba_nsegs[AC3_MAX_CHANNELS]; ///< number of delta segments - uint8_t dba_offsets[AC3_MAX_CHANNELS][8]; ///< delta segment offsets - uint8_t dba_lengths[AC3_MAX_CHANNELS][8]; ///< delta segment lengths - uint8_t dba_values[AC3_MAX_CHANNELS][8]; ///< delta values for each segment - - int sample_rate; ///< sample frequency, in Hz - int bit_rate; ///< stream bit rate, in bits-per-second - int frame_size; ///< current frame size, in bytes - - int channels; ///< number of total channels - int fbw_channels; ///< number of full-bandwidth channels - int lfe_on; ///< lfe channel in use - int lfe_ch; ///< index of LFE channel - int output_mode; ///< output channel configuration - int out_channels; ///< number of output channels - - float downmix_coeffs[AC3_MAX_CHANNELS][2]; ///< stereo downmix coefficients - float dynamic_range[2]; ///< dynamic range - float cpl_coords[AC3_MAX_CHANNELS][18]; ///< coupling coordinates - int num_cpl_bands; ///< number of coupling bands - int num_cpl_subbands; ///< number of coupling sub bands - int start_freq[AC3_MAX_CHANNELS]; ///< start frequency bin - int end_freq[AC3_MAX_CHANNELS]; ///< end frequency bin - AC3BitAllocParameters bit_alloc_params; ///< bit allocation parameters - - int8_t dexps[AC3_MAX_CHANNELS][256]; ///< decoded exponents - uint8_t bap[AC3_MAX_CHANNELS][256]; ///< bit allocation pointers - int16_t psd[AC3_MAX_CHANNELS][256]; ///< scaled exponents - int16_t band_psd[AC3_MAX_CHANNELS][50]; ///< interpolated exponents - int16_t mask[AC3_MAX_CHANNELS][50]; ///< masking curve values - - DECLARE_ALIGNED_16(float, transform_coeffs[AC3_MAX_CHANNELS][256]); ///< transform coefficients - - /* For IMDCT. */ - MDCTContext imdct_512; ///< for 512 sample IMDCT - MDCTContext imdct_256; ///< for 256 sample IMDCT - DSPContext dsp; ///< for optimization - float add_bias; ///< offset for float_to_int16 conversion - float mul_bias; ///< scaling for float_to_int16 conversion - - DECLARE_ALIGNED_16(float, output[AC3_MAX_CHANNELS-1][256]); ///< output after imdct transform and windowing - DECLARE_ALIGNED_16(short, int_output[AC3_MAX_CHANNELS-1][256]); ///< final 16-bit integer output - DECLARE_ALIGNED_16(float, delay[AC3_MAX_CHANNELS-1][256]); ///< delay - added to the next block - DECLARE_ALIGNED_16(float, tmp_imdct[256]); ///< temporary storage for imdct transform - DECLARE_ALIGNED_16(float, tmp_output[512]); ///< temporary storage for output before windowing - DECLARE_ALIGNED_16(float, window[256]); ///< window coefficients - - /* Miscellaneous. */ - GetBitContext gbc; ///< bitstream reader - AVRandomState dith_state; ///< for dither generation - AVCodecContext *avctx; ///< parent context -} AC3DecodeContext; - /** * Generate a Kaiser-Bessel Derived Window. */ @@ -779,10 +706,12 @@ static int ac3_parse_audio_block(AC3Deco } while(i--); /* coupling strategy */ + if(blk) + ctx->cpl_in_use[blk] = ctx->cpl_in_use[blk-1]; if (get_bits1(gbc)) { memset(bit_alloc_stages, 3, AC3_MAX_CHANNELS); - ctx->cpl_in_use = get_bits1(gbc); - if (ctx->cpl_in_use) { + ctx->cpl_in_use[blk] = get_bits1(gbc); + if (ctx->cpl_in_use[blk]) { /* coupling in use */ int cpl_begin_freq, cpl_end_freq; @@ -818,7 +747,7 @@ static int ac3_parse_audio_block(AC3Deco } /* coupling coordinates */ - if (ctx->cpl_in_use) { + if (ctx->cpl_in_use[blk]) { int cpl_coords_exist = 0; for (ch = 1; ch <= fbw_channels; ch++) { @@ -850,10 +779,9 @@ static int ac3_parse_audio_block(AC3Deco /* stereo rematrixing strategy and band structure */ if (channel_mode == AC3_CHMODE_STEREO) { - ctx->rematrixing_strategy = get_bits1(gbc); - if (ctx->rematrixing_strategy) { + if (get_bits1(gbc)) { ctx->num_rematrixing_bands = 4; - if(ctx->cpl_in_use && ctx->start_freq[CPL_CH] <= 61) + if(ctx->cpl_in_use[blk] && ctx->start_freq[CPL_CH] <= 61) ctx->num_rematrixing_bands -= 1 + (ctx->start_freq[CPL_CH] == 37); for(bnd=0; bnd<ctx->num_rematrixing_bands; bnd++) ctx->rematrixing_flags[bnd] = get_bits1(gbc); @@ -861,21 +789,21 @@ static int ac3_parse_audio_block(AC3Deco } /* exponent strategies for each channel */ - ctx->exp_strategy[CPL_CH] = EXP_REUSE; - ctx->exp_strategy[ctx->lfe_ch] = EXP_REUSE; - for (ch = !ctx->cpl_in_use; ch <= ctx->channels; ch++) { + ctx->exp_strategy[blk][CPL_CH] = EXP_REUSE; + ctx->exp_strategy[blk][ctx->lfe_ch] = EXP_REUSE; + for (ch = !ctx->cpl_in_use[blk]; ch <= ctx->channels; ch++) { if(ch == ctx->lfe_ch) - ctx->exp_strategy[ch] = get_bits(gbc, 1); + ctx->exp_strategy[blk][ch] = get_bits(gbc, 1); else - ctx->exp_strategy[ch] = get_bits(gbc, 2); - if(ctx->exp_strategy[ch] != EXP_REUSE) + ctx->exp_strategy[blk][ch] = get_bits(gbc, 2); + if(ctx->exp_strategy[blk][ch] != EXP_REUSE) bit_alloc_stages[ch] = 3; } /* channel bandwidth */ for (ch = 1; ch <= fbw_channels; ch++) { ctx->start_freq[ch] = 0; - if (ctx->exp_strategy[ch] != EXP_REUSE) { + if (ctx->exp_strategy[blk][ch] != EXP_REUSE) { int prev = ctx->end_freq[ch]; if (ctx->channel_in_cpl[ch]) ctx->end_freq[ch] = ctx->start_freq[CPL_CH]; @@ -895,10 +823,10 @@ static int ac3_parse_audio_block(AC3Deco ctx->end_freq[ctx->lfe_ch] = 7; /* decode exponents for each channel */ - for (ch = !ctx->cpl_in_use; ch <= ctx->channels; ch++) { - if (ctx->exp_strategy[ch] != EXP_REUSE) { + for (ch = !ctx->cpl_in_use[blk]; ch <= ctx->channels; ch++) { + if (ctx->exp_strategy[blk][ch] != EXP_REUSE) { int group_size, num_groups; - group_size = 3 << (ctx->exp_strategy[ch] - 1); + group_size = 3 << (ctx->exp_strategy[blk][ch] - 1); if(ch == CPL_CH) num_groups = (ctx->end_freq[ch] - ctx->start_freq[ch]) / group_size; else if(ch == ctx->lfe_ch) @@ -906,7 +834,7 @@ static int ac3_parse_audio_block(AC3Deco else num_groups = (ctx->end_freq[ch] + group_size - 4) / group_size; ctx->dexps[ch][0] = get_bits(gbc, 4) << !ch; - ff_ac3_decode_exponents(gbc, ctx->exp_strategy[ch], num_groups, ctx->dexps[ch][0], + ff_ac3_decode_exponents(gbc, ctx->exp_strategy[blk][ch], num_groups, ctx->dexps[ch][0], &ctx->dexps[ch][ctx->start_freq[ch]+!!ch]); if(ch != CPL_CH && ch != ctx->lfe_ch) skip_bits(gbc, 2); /* skip gainrng */ @@ -920,7 +848,7 @@ static int ac3_parse_audio_block(AC3Deco ctx->bit_alloc_params.slow_gain = ff_ac3_slow_gain_tab[get_bits(gbc, 2)]; ctx->bit_alloc_params.db_per_bit = ff_ac3_db_per_bit_tab[get_bits(gbc, 2)]; ctx->bit_alloc_params.floor = ff_ac3_floor_tab[get_bits(gbc, 3)]; - for(ch=!ctx->cpl_in_use; ch<=ctx->channels; ch++) { + for(ch=!ctx->cpl_in_use[blk]; ch<=ctx->channels; ch++) { bit_alloc_stages[ch] = FFMAX(bit_alloc_stages[ch], 2); } } @@ -929,7 +857,7 @@ static int ac3_parse_audio_block(AC3Deco if (get_bits1(gbc)) { int csnr; csnr = (get_bits(gbc, 6) - 15) << 4; - for (ch = !ctx->cpl_in_use; ch <= ctx->channels; ch++) { /* snr offset and fast gain */ + for (ch = !ctx->cpl_in_use[blk]; ch <= ctx->channels; ch++) { /* snr offset and fast gain */ ctx->snr_offset[ch] = (csnr + get_bits(gbc, 4)) << 2; ctx->fast_gain[ch] = ff_ac3_fast_gain_tab[get_bits(gbc, 3)]; } @@ -937,7 +865,7 @@ static int ac3_parse_audio_block(AC3Deco } /* coupling leak information */ - if (ctx->cpl_in_use && get_bits1(gbc)) { + if (ctx->cpl_in_use[blk] && get_bits1(gbc)) { ctx->bit_alloc_params.cpl_fast_leak = get_bits(gbc, 3); ctx->bit_alloc_params.cpl_slow_leak = get_bits(gbc, 3); bit_alloc_stages[CPL_CH] = FFMAX(bit_alloc_stages[CPL_CH], 2); @@ -946,7 +874,7 @@ static int ac3_parse_audio_block(AC3Deco /* delta bit allocation information */ if (get_bits1(gbc)) { /* delta bit allocation exists (strategy) */ - for (ch = !ctx->cpl_in_use; ch <= fbw_channels; ch++) { + for (ch = !ctx->cpl_in_use[blk]; ch <= fbw_channels; ch++) { ctx->dba_mode[ch] = get_bits(gbc, 2); if (ctx->dba_mode[ch] == DBA_RESERVED) { av_log(ctx->avctx, AV_LOG_ERROR, "delta bit allocation strategy reserved\n"); @@ -955,7 +883,7 @@ static int ac3_parse_audio_block(AC3Deco bit_alloc_stages[ch] = FFMAX(bit_alloc_stages[ch], 2); } /* channel delta offset, len and bit allocation */ - for (ch = !ctx->cpl_in_use; ch <= fbw_channels; ch++) { + for (ch = !ctx->cpl_in_use[blk]; ch <= fbw_channels; ch++) { if (ctx->dba_mode[ch] == DBA_NEW) { ctx->dba_nsegs[ch] = get_bits(gbc, 3); for (seg = 0; seg <= ctx->dba_nsegs[ch]; seg++) { @@ -972,7 +900,7 @@ static int ac3_parse_audio_block(AC3Deco } /* Bit allocation */ - for(ch=!ctx->cpl_in_use; ch<=ctx->channels; ch++) { + for(ch=!ctx->cpl_in_use[blk]; ch<=ctx->channels; ch++) { if(bit_alloc_stages[ch] > 2) { /* Exponent mapping into PSD and PSD integration */ ff_ac3_bit_alloc_calc_psd(ctx->dexps[ch], Modified: eac3/ac3dec.h ============================================================================== --- eac3/ac3dec.h (original) +++ eac3/ac3dec.h Sun Dec 30 07:45:59 2007 @@ -29,10 +29,22 @@ #include "ac3tab.h" #include "bitstream.h" +#include "dsputil.h" #include "random.h" +/* override ac3.h to include coupling channel */ +#undef AC3_MAX_CHANNELS +#define AC3_MAX_CHANNELS 7 + #define CPL_CH 0 +#define AC3_OUTPUT_LFEON 8 + +#define AC3_MAX_COEFS 256 +#define AC3_BLOCK_SIZE 256 +#define MAX_BLOCKS 6 +#define MAX_SPX_CODES 18 + void ff_ac3_window_init(float *window); void ff_ac3_tables_init(void); @@ -54,6 +66,165 @@ extern const float ff_ac3_mix_levels[9]; /** default stereo downmixing coefficients */ extern const uint8_t ff_ac3_default_coeffs[8][5][2]; +typedef struct AC3DecodeContext { + AVCodecContext *avctx; ///< Parent context + GetBitContext gbc; ///< Bitstream reader + +///@defgroup bsi Bit Stream Information +///@{ + int syncword; ///< AC3 frame sync word + int stream_type; ///< Stream type (strmtyp) + int substreamid; ///< Substream identification + int frame_size; ///< Frame size, in bytes + int bit_rate; ///< Bitrate, in bits-per-second + int sr_code; ///< Sample rate code (fscod) + int sr_code2; ///< Sample rate code 2 (fscod2) + int sample_rate; ///< Sample rate, in Hz + int num_blocks; ///< Number of audio blocks + int channel_mode; ///< Channel mode (acmod) + int lfe_on; ///< Low frequency effect channel on (lfeon) + int bitstream_id; ///< Bit stream identification (bsid) +///@} + +///@defgroup audfrm Frame Syntax Parameters + int snr_offset_strategy; ///< SNR offset strategy (snroffststr) + int block_switch_syntax; ///< Block switch syntax enabled (blkswe) + int dither_flag_syntax; ///< Dither flag syntax enabled (dithflage) + int bit_allocation_syntax; ///< Bit allocation model syntax enabled (bamode) + int fast_gain_syntax; ///< Fast gain codes enabled (frmfgaincode) + int dba_syntax; ///< Delta bit allocation syntax enabled (dbaflde) + int skip_syntax; ///< Skip Filed syntax enabled (skipflde) +///@} + +///@defgroup cpl Standard Coupling + int cpl_in_use[MAX_BLOCKS]; ///< Coupling in use (cplinu) + int cpl_strategy_exists[MAX_BLOCKS]; ///< Coupling strategy exists (cplstre) + int channel_in_cpl[AC3_MAX_CHANNELS]; ///< Channel in coupling (chincpl) + int phase_flags_in_use; ///< Phase flag in use (phsflginu) + int phase_flags[18]; ///< Phase flag + int num_cpl_subbands; ///< Number of coupling sub bands (ncplsubnd) + int num_cpl_bands; ///< Number of coupling bands (ncplbnd) + int cpl_band_struct[18]; ///< Coupling band structure (cplbndstrc) + int firstchincpl; ///< First channel in coupling + int first_cpl_coords[AC3_MAX_CHANNELS]; ///< First coupling coordinates states (firstcplcos) + float cpl_coords[AC3_MAX_CHANNELS][18]; ///< coupling coordinates (cplco) +///@} + +///@defgroup aht Adaptive Hybrid Transform + int channel_uses_aht[AC3_MAX_CHANNELS]; ///< Channel AHT in use (chahtinu) + int gaq_gain[256]; ///< Gain adaptive quantization gain + float pre_mantissa[6][AC3_MAX_CHANNELS][256]; ///< Pre-IDCT mantissas +///@} + +///@defgroup spx Spectral Extension + int channel_uses_spx[AC3_MAX_CHANNELS]; ///< Channel in spectral extension attenuation process (chinspxatten) + int spx_atten_code[AC3_MAX_CHANNELS]; ///< spectral extension attenuation code (spxattencod) + int spxinu; ///< spectral extension in use + int chinspx[AC3_MAX_CHANNELS]; ///< Channel in spectral extension + int spxstrtf; ///< Spectral extension start copy frequency code + int spxbegf; ///< Spectral extension begin frequency code + int spxendf; ///< Spectral extension end frequency code + int nspxbnds; ///< Number of structured spectral extension bands + int spxbndsztab[MAX_SPX_CODES]; ///< Sizes of spectral extension bands + int spxbndstrc[MAX_SPX_CODES]; ///< Spectral extension band structure + int spxcoe[AC3_MAX_CHANNELS]; ///< Spectral extension coordinates exists + int spxblnd[AC3_MAX_CHANNELS]; ///< Spectral extension blend + int firstspxcos[AC3_MAX_CHANNELS]; ///< First spectral extension coordinates states + float spxco[AC3_MAX_CHANNELS][18]; ///< Spectral extension coordinates +///@} + +///@defgroup ecpl Enhanced Coupling + int ecpl_in_use; ///< Enhanced coupling in use + int ecplbegf; ///< Enhanced coupling begin frequency code + int ecplendf; ///< Enhanced coupling end frequency code + int ecpl_start_subbnd; ///< Enhanced coupling begin frequency + int ecpl_end_subbnd; ///< Enhanced coupling end frequency + int necplbnd; ///< Number of structured enhanced coupling bands + int ecplbndstrc[23]; ///< Enhanced coupling band structure + int ecplangleintrp; ///< Enhanced coupling angle interpolation flag + int ecplparam1e[AC3_MAX_CHANNELS]; ///< Enhanced coupling parameters 1 exists + int ecplparam2e[AC3_MAX_CHANNELS]; ///< Enhanced coupling parameters 2 exists + int ecplamp[AC3_MAX_CHANNELS][23]; ///< Enhanced coupling amplitude scaling + int ecplangle[AC3_MAX_CHANNELS][23]; ///< Enhanced coupling angle + int ecplchaos[AC3_MAX_CHANNELS][23]; ///< Enhanced coupling chaos + int ecpltrans[AC3_MAX_CHANNELS]; ///< Enhanced coupling transient present +///@} + +///@defgroup channel Channel + int fbw_channels; ///< Number of fbw channels + int channels; ///< Total of all channels + int lfe_ch; ///< Index of LFE channel + float downmix_coeffs[AC3_MAX_CHANNELS][2]; ///< stereo downmix coefficients + int output_mode; ///< output channel configuration + int out_channels; ///< number of output channels +///@} + +///@defgroup dynrng Dynamic Range + float dynamic_range[2]; ///< Dynamic range gain (dynrng) +///@} + +///@defgroup bandwidth Bandwidth + int start_freq[AC3_MAX_CHANNELS]; ///< Start frequency bin (strtmant) + int end_freq[AC3_MAX_CHANNELS]; ///< End frequency bin (endmant) +///@} + +///@defgroup rematrixing Rematrixing + int num_rematrixing_bands; ///< Number of rematrixing bands (nrematbnds) + int rematrixing_flags[4]; ///< Rematrixing flags (rematflg) +///@} + +///@defgroup exponents Exponents + int nchgrps[AC3_MAX_CHANNELS]; ///< Number of fbw channel exponent groups + uint8_t dexps[AC3_MAX_CHANNELS][AC3_MAX_COEFS]; ///< Differential exponents + int exp_strategy[MAX_BLOCKS][AC3_MAX_CHANNELS]; ///< Channel exponent strategy (chexpstr) +///@} + +///@defgroup bitalloc Bit Allocation + AC3BitAllocParameters bit_alloc_params; ///< Bit allocation parameters + int first_cpl_leak; ///< First coupling leak state (firstcplleak) + int snr_offset[AC3_MAX_CHANNELS]; ///< SNR offset (snroffst) + int fast_gain[AC3_MAX_CHANNELS]; ///< Channel fast gain (fgain) + uint8_t bap[AC3_MAX_CHANNELS][AC3_MAX_COEFS]; ///< bit allocation pointers + uint8_t hebap[AC3_MAX_CHANNELS][AC3_MAX_COEFS]; ///< high-efficiency bit allocation pointers for AHT + int16_t psd[AC3_MAX_CHANNELS][AC3_MAX_COEFS]; ///< scaled exponents + int16_t band_psd[AC3_MAX_CHANNELS][50]; ///< interpolated exponents (bndpsd) + int16_t mask[AC3_MAX_CHANNELS][50]; ///< masking values + uint8_t dba_mode[AC3_MAX_CHANNELS]; ///< Delta bit allocation mode (deltbae) + uint8_t dba_nsegs[AC3_MAX_CHANNELS]; ///< Number of delta segments (deltnseg) + uint8_t dba_offsets[AC3_MAX_CHANNELS][9]; ///< Delta segment offsets (deltoffst) + uint8_t dba_lengths[AC3_MAX_CHANNELS][9]; ///< Delta segment lengths (deltlen) + uint8_t dba_values[AC3_MAX_CHANNELS][9]; ///< Delta values for each segment (deltba) +///@} + +///@defgroup dithering Zero-Mantissa Dithering + int dither_all; ///< Indicates whether all channels use dithering + int dither_flag[AC3_MAX_CHANNELS]; ///< Dither flag (dithflag) + AVRandomState dith_state; ///< for dither generation +///@} + +///@defgroup imdct IMDCT + int block_switch[AC3_MAX_CHANNELS]; ///< Block switch flag (blksw) + MDCTContext imdct_512; ///< for 512 sample imdct transform + MDCTContext imdct_256; ///< for 256 sample imdct transform +///@} + +///@defgroup opt Optimization + DSPContext dsp; ///< for optimization + float add_bias; ///< offset for float_to_int16 conversion + float mul_bias; ///< scaling for float_to_int16 conversion +///@} + +///@defgroup arrays Aligned Arrays + DECLARE_ALIGNED_16(float, transform_coeffs[AC3_MAX_CHANNELS][AC3_MAX_COEFS]); ///< Frequency Coefficients + DECLARE_ALIGNED_16(float, delay[AC3_MAX_CHANNELS][AC3_BLOCK_SIZE]); ///< delay - added to the next block + DECLARE_ALIGNED_16(float, window[AC3_BLOCK_SIZE]); ///< window coefficients + DECLARE_ALIGNED_16(float, tmp_output[AC3_BLOCK_SIZE * 24]); ///< temp storage for output before windowing + DECLARE_ALIGNED_16(float, tmp_imdct[AC3_BLOCK_SIZE * 24]); ///< temp storage for imdct transform + DECLARE_ALIGNED_16(float, output[AC3_MAX_CHANNELS][AC3_BLOCK_SIZE]); ///< output after imdct transform and windowing + DECLARE_ALIGNED_16(int16_t, int_output[AC3_MAX_CHANNELS][AC3_BLOCK_SIZE]); ///< final 16-bit integer output +///@} +} AC3DecodeContext; + /** * Decode the grouped exponents according to exponent strategy. * reference: Section 7.1.3 Exponent Decoding Modified: eac3/eac3dec.c ============================================================================== --- eac3/eac3dec.c (original) +++ eac3/eac3dec.c Sun Dec 30 07:45:59 2007 @@ -20,11 +20,28 @@ */ #include "avcodec.h" -#include "eac3.h" -#include "ac3dec.h" #include "ac3.h" +#include "ac3dec.h" #include "random.h" +/** Channel gain adaptive quantization mode */ +typedef enum { + EAC3_GAQ_NO =0, + EAC3_GAQ_12, + EAC3_GAQ_14, + EAC3_GAQ_124 +} EAC3GaqMode; + +/** Stream Type */ +typedef enum { + EAC3_STREAM_TYPE_INDEPENDENT = 0, + EAC3_STREAM_TYPE_DEPENDENT, + EAC3_STREAM_TYPE_AC3_CONVERT, + EAC3_STREAM_TYPE_RESERVED +} EAC3StreamType; + +#define EAC3_SR_CODE_REDUCED 3 + static float idct_cos_tab[6][5]; static int gaq_ungroup_tab[32][3]; @@ -40,7 +57,7 @@ static void log_missing_feature(AVCodecC } #if 0 -static void spectral_extension(EAC3Context *s){ +static void spectral_extension(AC3DecodeContext *s){ //Now turned off, because there are no samples for testing it. int copystartmant, copyendmant, copyindex, insertindex; int wrapflag[18]; @@ -152,7 +169,7 @@ static void spectral_extension(EAC3Conte } #endif -static void get_transform_coeffs_aht_ch(EAC3Context *s, int ch){ +static void get_transform_coeffs_aht_ch(AC3DecodeContext *s, int ch){ int bin, blk, gs; int hebap, end_bap, gaq_mode, bits, pre_mantissa, remap, log_gain; float mant; @@ -244,7 +261,7 @@ static void get_transform_coeffs_aht_ch( } } -static void idct_transform_coeffs_ch(EAC3Context *s, int ch, int blk){ +static void idct_transform_coeffs_ch(AC3DecodeContext *s, int ch, int blk){ // TODO fast IDCT int bin, i; float tmp; @@ -257,7 +274,7 @@ static void idct_transform_coeffs_ch(EAC } } -static void get_eac3_transform_coeffs_ch(EAC3Context *s, int blk, +static void get_eac3_transform_coeffs_ch(AC3DecodeContext *s, int blk, int ch, mant_groups *m){ if (!s->channel_uses_aht[ch]) { ff_ac3_get_transform_coeffs_ch(m, &s->gbc, s->dexps[ch], s->bap[ch], @@ -276,7 +293,7 @@ static void get_eac3_transform_coeffs_ch s->end_freq[ch] * sizeof(*s->transform_coeffs[ch])); } -static void remove_dithering(EAC3Context *s) { +static void remove_dithering(AC3DecodeContext *s) { /* TODO: merge with same function in ac3dec.c */ int ch, i; int end=0; @@ -312,7 +329,7 @@ static void remove_dithering(EAC3Context } } -static int parse_bsi(EAC3Context *s){ +static int parse_bsi(AC3DecodeContext *s){ int i, blk; GetBitContext *gbc = &s->gbc; @@ -507,7 +524,7 @@ static int parse_bsi(EAC3Context *s){ return 0; } /* end of bsi */ -static int parse_audfrm(EAC3Context *s){ +static int parse_audfrm(AC3DecodeContext *s){ int blk, ch; int ac3_exponent_strategy, parse_aht_info, parse_spx_atten_data; int parse_transient_proc_info; @@ -668,7 +685,7 @@ static int parse_audfrm(EAC3Context *s){ return 0; } /* end of audfrm */ -static int parse_audblk(EAC3Context *s, const int blk){ +static int parse_audblk(AC3DecodeContext *s, const int blk){ //int grp, sbnd, n, bin; int seg, bnd, ch, i, chbwcod, grpsize; int got_cplchan; @@ -1194,7 +1211,7 @@ static int parse_audblk(EAC3Context *s, /** * Performs Inverse MDCT transform */ -static void do_imdct(EAC3Context *ctx){ +static void do_imdct(AC3DecodeContext *ctx){ int ch; for (ch = 1; ch <= ctx->fbw_channels + ctx->lfe_on; ch++) { @@ -1220,7 +1237,7 @@ static void do_imdct(EAC3Context *ctx){ static int eac3_decode_frame(AVCodecContext *avctx, void *data, int *data_size, uint8_t *buf, int buf_size){ int16_t *out_samples = (int16_t *)data; - EAC3Context *c = (EAC3Context *)avctx->priv_data; + AC3DecodeContext *c = (AC3DecodeContext *)avctx->priv_data; int k, i, blk, ch; *data_size = 0; @@ -1327,7 +1344,7 @@ static void eac3_tables_init(void) { } static int eac3_decode_init(AVCodecContext *avctx){ - EAC3Context *ctx = avctx->priv_data; + AC3DecodeContext *ctx = avctx->priv_data; ctx->avctx = avctx; ac3_common_init(); @@ -1349,7 +1366,7 @@ static int eac3_decode_init(AVCodecConte } static int eac3_decode_end(AVCodecContext *avctx){ - EAC3Context *ctx = avctx->priv_data; + AC3DecodeContext *ctx = avctx->priv_data; ff_mdct_end(&ctx->imdct_512); ff_mdct_end(&ctx->imdct_256); @@ -1360,7 +1377,7 @@ AVCodec eac3_decoder = { .name = "E-AC3", .type = CODEC_TYPE_AUDIO, .id = CODEC_ID_EAC3, - .priv_data_size = sizeof (EAC3Context), + .priv_data_size = sizeof (AC3DecodeContext), .init = eac3_decode_init, .close = eac3_decode_end, .decode = eac3_decode_frame,

1 0

[soc]: r1705 - eac3/ac3dec.c
by jbr 30 Dec '07

30 Dec '07

Author: jbr Date: Sun Dec 30 07:19:57 2007 New Revision: 1705 Log: rename GetBitContext gb to gbc Modified: eac3/ac3dec.c Modified: eac3/ac3dec.c ============================================================================== --- eac3/ac3dec.c (original) +++ eac3/ac3dec.c Sun Dec 30 07:19:57 2007 @@ -174,7 +174,7 @@ typedef struct { DECLARE_ALIGNED_16(float, window[256]); ///< window coefficients /* Miscellaneous. */ - GetBitContext gb; ///< bitstream reader + GetBitContext gbc; ///< bitstream reader AVRandomState dith_state; ///< for dither generation AVCodecContext *avctx; ///< parent context } AC3DecodeContext; @@ -308,11 +308,11 @@ static int ac3_decode_init(AVCodecContex static int ac3_parse_header(AC3DecodeContext *ctx) { AC3HeaderInfo hdr; - GetBitContext *gb = &ctx->gb; + GetBitContext *gbc = &ctx->gbc; float center_mix_level, surround_mix_level; int err, i; - err = ff_ac3_parse_header(gb->buffer, &hdr); + err = ff_ac3_parse_header(gbc->buffer, &hdr); if(err) return err; @@ -337,46 +337,46 @@ static int ac3_parse_header(AC3DecodeCon ctx->output_mode |= AC3_OUTPUT_LFEON; /* skip over portion of header which has already been read */ - skip_bits(gb, 16); // skip the sync_word - skip_bits(gb, 16); // skip crc1 - skip_bits(gb, 8); // skip fscod and frmsizecod - skip_bits(gb, 11); // skip bsid, bsmod, and acmod + skip_bits(gbc, 16); // skip the sync_word + skip_bits(gbc, 16); // skip crc1 + skip_bits(gbc, 8); // skip fscod and frmsizecod + skip_bits(gbc, 11); // skip bsid, bsmod, and acmod if(ctx->channel_mode == AC3_CHMODE_STEREO) { - skip_bits(gb, 2); // skip dsurmod + skip_bits(gbc, 2); // skip dsurmod } else { if((ctx->channel_mode & 1) && ctx->channel_mode != AC3_CHMODE_MONO) - skip_bits(gb, 2); // skip cmixlev + skip_bits(gbc, 2); // skip cmixlev if(ctx->channel_mode & 4) - skip_bits(gb, 2); // skip surmixlev + skip_bits(gbc, 2); // skip surmixlev } - skip_bits1(gb); // skip lfeon + skip_bits1(gbc); // skip lfeon /* read the rest of the bsi. read twice for dual mono mode. */ i = !(ctx->channel_mode); do { - skip_bits(gb, 5); // skip dialog normalization - if (get_bits1(gb)) - skip_bits(gb, 8); //skip compression - if (get_bits1(gb)) - skip_bits(gb, 8); //skip language code - if (get_bits1(gb)) - skip_bits(gb, 7); //skip audio production information + skip_bits(gbc, 5); // skip dialog normalization + if (get_bits1(gbc)) + skip_bits(gbc, 8); //skip compression + if (get_bits1(gbc)) + skip_bits(gbc, 8); //skip language code + if (get_bits1(gbc)) + skip_bits(gbc, 7); //skip audio production information } while (i--); - skip_bits(gb, 2); //skip copyright bit and original bitstream bit + skip_bits(gbc, 2); //skip copyright bit and original bitstream bit /* skip the timecodes (or extra bitstream information for Alternate Syntax) TODO: read & use the xbsi1 downmix levels */ - if (get_bits1(gb)) - skip_bits(gb, 14); //skip timecode1 / xbsi1 - if (get_bits1(gb)) - skip_bits(gb, 14); //skip timecode2 / xbsi2 + if (get_bits1(gbc)) + skip_bits(gbc, 14); //skip timecode1 / xbsi1 + if (get_bits1(gbc)) + skip_bits(gbc, 14); //skip timecode2 / xbsi2 /* skip additional bitstream info */ - if (get_bits1(gb)) { - i = get_bits(gb, 6); + if (get_bits1(gbc)) { + i = get_bits(gbc, 6); do { - skip_bits(gb, 8); + skip_bits(gbc, 8); } while(i--); } @@ -405,7 +405,7 @@ static int ac3_parse_header(AC3DecodeCon * Decode the grouped exponents according to exponent strategy. * reference: Section 7.1.3 Exponent Decoding */ -void ff_ac3_decode_exponents(GetBitContext *gb, int exp_strategy, int ngrps, +void ff_ac3_decode_exponents(GetBitContext *gbc, int exp_strategy, int ngrps, uint8_t absexp, int8_t *dexps) { int i, j, grp, group_size; @@ -415,7 +415,7 @@ void ff_ac3_decode_exponents(GetBitConte /* unpack groups */ group_size = exp_strategy + (exp_strategy == EXP_D45); for(grp=0,i=0; grp<ngrps; grp++) { - expacc = get_bits(gb, 7); + expacc = get_bits(gbc, 7); dexp[i++] = exp_ungroup_tab[expacc][0]; dexp[i++] = exp_ungroup_tab[expacc][1]; dexp[i++] = exp_ungroup_tab[expacc][2]; @@ -465,7 +465,7 @@ void ff_ac3_uncouple_channels(int fbw_ch * Get the transform coefficients for a particular channel * reference: Section 7.3 Quantization and Decoding of Mantissas */ -int ff_ac3_get_transform_coeffs_ch(mant_groups *m, GetBitContext *gb, uint8_t *exps, +int ff_ac3_get_transform_coeffs_ch(mant_groups *m, GetBitContext *gbc, uint8_t *exps, uint8_t *bap, float *coeffs, int start, int end, AVRandomState *dith_state) { @@ -480,7 +480,7 @@ int ff_ac3_get_transform_coeffs_ch(mant_ case 1: if(m->b1ptr > 2) { - gcode = get_bits(gb, 5); + gcode = get_bits(gbc, 5); m->b1_mant[0] = b1_mantissas[gcode][0]; m->b1_mant[1] = b1_mantissas[gcode][1]; m->b1_mant[2] = b1_mantissas[gcode][2]; @@ -491,7 +491,7 @@ int ff_ac3_get_transform_coeffs_ch(mant_ case 2: if(m->b2ptr > 2) { - gcode = get_bits(gb, 7); + gcode = get_bits(gbc, 7); m->b2_mant[0] = b2_mantissas[gcode][0]; m->b2_mant[1] = b2_mantissas[gcode][1]; m->b2_mant[2] = b2_mantissas[gcode][2]; @@ -501,12 +501,12 @@ int ff_ac3_get_transform_coeffs_ch(mant_ break; case 3: - coeffs[i] = b3_mantissas[get_bits(gb, 3)]; + coeffs[i] = b3_mantissas[get_bits(gbc, 3)]; break; case 4: if(m->b4ptr > 1) { - gcode = get_bits(gb, 7); + gcode = get_bits(gbc, 7); m->b4_mant[0] = b4_mantissas[gcode][0]; m->b4_mant[1] = b4_mantissas[gcode][1]; m->b4ptr = 0; @@ -515,12 +515,12 @@ int ff_ac3_get_transform_coeffs_ch(mant_ break; case 5: - coeffs[i] = b5_mantissas[get_bits(gb, 4)]; + coeffs[i] = b5_mantissas[get_bits(gbc, 4)]; break; default: /* asymmetric dequantization */ - coeffs[i] = get_sbits(gb, quantization_tab[tbap]) * ff_ac3_scale_factors[quantization_tab[tbap]-1]; + coeffs[i] = get_sbits(gbc, quantization_tab[tbap]) * ff_ac3_scale_factors[quantization_tab[tbap]-1]; break; } coeffs[i] *= ff_ac3_scale_factors[exps[i]]; @@ -576,7 +576,7 @@ static int get_transform_coeffs(AC3Decod for (ch = 1; ch <= ctx->channels; ch++) { /* transform coefficients for full-bandwidth channel */ //if (get_transform_coeffs_ch(ctx, ch, &m)) - if(ff_ac3_get_transform_coeffs_ch(&m, &ctx->gb, ctx->dexps[ch], + if(ff_ac3_get_transform_coeffs_ch(&m, &ctx->gbc, ctx->dexps[ch], ctx->bap[ch], ctx->transform_coeffs[ch], ctx->start_freq[ch], ctx->end_freq[ch], &ctx->dith_state)) return -1; @@ -584,7 +584,7 @@ static int get_transform_coeffs(AC3Decod coefficients for the first coupled channel*/ if (ctx->channel_in_cpl[ch]) { if (!got_cplchan) { - if (ff_ac3_get_transform_coeffs_ch(&m, &ctx->gb, + if (ff_ac3_get_transform_coeffs_ch(&m, &ctx->gbc, ctx->dexps[CPL_CH], ctx->bap[CPL_CH], ctx->transform_coeffs[CPL_CH], ctx->start_freq[CPL_CH], ctx->end_freq[CPL_CH], @@ -750,19 +750,19 @@ static int ac3_parse_audio_block(AC3Deco int fbw_channels = ctx->fbw_channels; int channel_mode = ctx->channel_mode; int i, bnd, seg, ch; - GetBitContext *gb = &ctx->gb; + GetBitContext *gbc = &ctx->gbc; uint8_t bit_alloc_stages[AC3_MAX_CHANNELS]; memset(bit_alloc_stages, 0, AC3_MAX_CHANNELS); /* block switch flags */ for (ch = 1; ch <= fbw_channels; ch++) - ctx->block_switch[ch] = get_bits1(gb); + ctx->block_switch[ch] = get_bits1(gbc); /* dithering flags */ ctx->dither_all = 1; for (ch = 1; ch <= fbw_channels; ch++) { - ctx->dither_flag[ch] = get_bits1(gb); + ctx->dither_flag[ch] = get_bits1(gbc); if(!ctx->dither_flag[ch]) ctx->dither_all = 0; } @@ -770,8 +770,8 @@ static int ac3_parse_audio_block(AC3Deco /* dynamic range */ i = !(ctx->channel_mode); do { - if(get_bits1(gb)) { - ctx->dynamic_range[i] = ((ff_ac3_dynamic_range_tab[get_bits(gb, 8)]-1.0) * + if(get_bits1(gbc)) { + ctx->dynamic_range[i] = ((ff_ac3_dynamic_range_tab[get_bits(gbc, 8)]-1.0) * ctx->avctx->drc_scale)+1.0; } else if(blk == 0) { ctx->dynamic_range[i] = 1.0f; @@ -779,24 +779,24 @@ static int ac3_parse_audio_block(AC3Deco } while(i--); /* coupling strategy */ - if (get_bits1(gb)) { + if (get_bits1(gbc)) { memset(bit_alloc_stages, 3, AC3_MAX_CHANNELS); - ctx->cpl_in_use = get_bits1(gb); + ctx->cpl_in_use = get_bits1(gbc); if (ctx->cpl_in_use) { /* coupling in use */ int cpl_begin_freq, cpl_end_freq; /* determine which channels are coupled */ for (ch = 1; ch <= fbw_channels; ch++) - ctx->channel_in_cpl[ch] = get_bits1(gb); + ctx->channel_in_cpl[ch] = get_bits1(gbc); /* phase flags in use */ if (channel_mode == AC3_CHMODE_STEREO) - ctx->phase_flags_in_use = get_bits1(gb); + ctx->phase_flags_in_use = get_bits1(gbc); /* coupling frequency range and band structure */ - cpl_begin_freq = get_bits(gb, 4); - cpl_end_freq = get_bits(gb, 4); + cpl_begin_freq = get_bits(gbc, 4); + cpl_end_freq = get_bits(gbc, 4); if (3 + cpl_end_freq - cpl_begin_freq < 0) { av_log(ctx->avctx, AV_LOG_ERROR, "3+cplendf = %d < cplbegf = %d\n", 3+cpl_end_freq, cpl_begin_freq); return -1; @@ -805,7 +805,7 @@ static int ac3_parse_audio_block(AC3Deco ctx->start_freq[CPL_CH] = cpl_begin_freq * 12 + 37; ctx->end_freq[CPL_CH] = cpl_end_freq * 12 + 73; for (bnd = 0; bnd < ctx->num_cpl_subbands - 1; bnd++) { - if (get_bits1(gb)) { + if (get_bits1(gbc)) { ctx->cpl_band_struct[bnd] = 1; ctx->num_cpl_bands--; } @@ -823,13 +823,13 @@ static int ac3_parse_audio_block(AC3Deco for (ch = 1; ch <= fbw_channels; ch++) { if (ctx->channel_in_cpl[ch]) { - if (get_bits1(gb)) { + if (get_bits1(gbc)) { int master_cpl_coord, cpl_coord_exp, cpl_coord_mant; cpl_coords_exist = 1; - master_cpl_coord = 3 * get_bits(gb, 2); + master_cpl_coord = 3 * get_bits(gbc, 2); for (bnd = 0; bnd < ctx->num_cpl_bands; bnd++) { - cpl_coord_exp = get_bits(gb, 4); - cpl_coord_mant = get_bits(gb, 4); + cpl_coord_exp = get_bits(gbc, 4); + cpl_coord_mant = get_bits(gbc, 4); if (cpl_coord_exp == 15) ctx->cpl_coords[ch][bnd] = cpl_coord_mant / 16.0f; else @@ -842,7 +842,7 @@ static int ac3_parse_audio_block(AC3Deco /* phase flags */ if (channel_mode == AC3_CHMODE_STEREO && ctx->phase_flags_in_use && cpl_coords_exist) { for (bnd = 0; bnd < ctx->num_cpl_bands; bnd++) { - if (get_bits1(gb)) + if (get_bits1(gbc)) ctx->cpl_coords[2][bnd] = -ctx->cpl_coords[2][bnd]; } } @@ -850,13 +850,13 @@ static int ac3_parse_audio_block(AC3Deco /* stereo rematrixing strategy and band structure */ if (channel_mode == AC3_CHMODE_STEREO) { - ctx->rematrixing_strategy = get_bits1(gb); + ctx->rematrixing_strategy = get_bits1(gbc); if (ctx->rematrixing_strategy) { ctx->num_rematrixing_bands = 4; if(ctx->cpl_in_use && ctx->start_freq[CPL_CH] <= 61) ctx->num_rematrixing_bands -= 1 + (ctx->start_freq[CPL_CH] == 37); for(bnd=0; bnd<ctx->num_rematrixing_bands; bnd++) - ctx->rematrixing_flags[bnd] = get_bits1(gb); + ctx->rematrixing_flags[bnd] = get_bits1(gbc); } } @@ -865,9 +865,9 @@ static int ac3_parse_audio_block(AC3Deco ctx->exp_strategy[ctx->lfe_ch] = EXP_REUSE; for (ch = !ctx->cpl_in_use; ch <= ctx->channels; ch++) { if(ch == ctx->lfe_ch) - ctx->exp_strategy[ch] = get_bits(gb, 1); + ctx->exp_strategy[ch] = get_bits(gbc, 1); else - ctx->exp_strategy[ch] = get_bits(gb, 2); + ctx->exp_strategy[ch] = get_bits(gbc, 2); if(ctx->exp_strategy[ch] != EXP_REUSE) bit_alloc_stages[ch] = 3; } @@ -880,7 +880,7 @@ static int ac3_parse_audio_block(AC3Deco if (ctx->channel_in_cpl[ch]) ctx->end_freq[ch] = ctx->start_freq[CPL_CH]; else { - int bandwidth_code = get_bits(gb, 6); + int bandwidth_code = get_bits(gbc, 6); if (bandwidth_code > 60) { av_log(ctx->avctx, AV_LOG_ERROR, "bandwidth code = %d > 60", bandwidth_code); return -1; @@ -905,49 +905,49 @@ static int ac3_parse_audio_block(AC3Deco num_groups = 2; else num_groups = (ctx->end_freq[ch] + group_size - 4) / group_size; - ctx->dexps[ch][0] = get_bits(gb, 4) << !ch; - ff_ac3_decode_exponents(gb, ctx->exp_strategy[ch], num_groups, ctx->dexps[ch][0], + ctx->dexps[ch][0] = get_bits(gbc, 4) << !ch; + ff_ac3_decode_exponents(gbc, ctx->exp_strategy[ch], num_groups, ctx->dexps[ch][0], &ctx->dexps[ch][ctx->start_freq[ch]+!!ch]); if(ch != CPL_CH && ch != ctx->lfe_ch) - skip_bits(gb, 2); /* skip gainrng */ + skip_bits(gbc, 2); /* skip gainrng */ } } /* bit allocation information */ - if (get_bits1(gb)) { - ctx->bit_alloc_params.slow_decay = ff_ac3_slow_decay_tab[get_bits(gb, 2)] >> ctx->bit_alloc_params.sr_shift; - ctx->bit_alloc_params.fast_decay = ff_ac3_fast_decay_tab[get_bits(gb, 2)] >> ctx->bit_alloc_params.sr_shift; - ctx->bit_alloc_params.slow_gain = ff_ac3_slow_gain_tab[get_bits(gb, 2)]; - ctx->bit_alloc_params.db_per_bit = ff_ac3_db_per_bit_tab[get_bits(gb, 2)]; - ctx->bit_alloc_params.floor = ff_ac3_floor_tab[get_bits(gb, 3)]; + if (get_bits1(gbc)) { + ctx->bit_alloc_params.slow_decay = ff_ac3_slow_decay_tab[get_bits(gbc, 2)] >> ctx->bit_alloc_params.sr_shift; + ctx->bit_alloc_params.fast_decay = ff_ac3_fast_decay_tab[get_bits(gbc, 2)] >> ctx->bit_alloc_params.sr_shift; + ctx->bit_alloc_params.slow_gain = ff_ac3_slow_gain_tab[get_bits(gbc, 2)]; + ctx->bit_alloc_params.db_per_bit = ff_ac3_db_per_bit_tab[get_bits(gbc, 2)]; + ctx->bit_alloc_params.floor = ff_ac3_floor_tab[get_bits(gbc, 3)]; for(ch=!ctx->cpl_in_use; ch<=ctx->channels; ch++) { bit_alloc_stages[ch] = FFMAX(bit_alloc_stages[ch], 2); } } /* signal-to-noise ratio offsets and fast gains (signal-to-mask ratios) */ - if (get_bits1(gb)) { + if (get_bits1(gbc)) { int csnr; - csnr = (get_bits(gb, 6) - 15) << 4; + csnr = (get_bits(gbc, 6) - 15) << 4; for (ch = !ctx->cpl_in_use; ch <= ctx->channels; ch++) { /* snr offset and fast gain */ - ctx->snr_offset[ch] = (csnr + get_bits(gb, 4)) << 2; - ctx->fast_gain[ch] = ff_ac3_fast_gain_tab[get_bits(gb, 3)]; + ctx->snr_offset[ch] = (csnr + get_bits(gbc, 4)) << 2; + ctx->fast_gain[ch] = ff_ac3_fast_gain_tab[get_bits(gbc, 3)]; } memset(bit_alloc_stages, 3, AC3_MAX_CHANNELS); } /* coupling leak information */ - if (ctx->cpl_in_use && get_bits1(gb)) { - ctx->bit_alloc_params.cpl_fast_leak = get_bits(gb, 3); - ctx->bit_alloc_params.cpl_slow_leak = get_bits(gb, 3); + if (ctx->cpl_in_use && get_bits1(gbc)) { + ctx->bit_alloc_params.cpl_fast_leak = get_bits(gbc, 3); + ctx->bit_alloc_params.cpl_slow_leak = get_bits(gbc, 3); bit_alloc_stages[CPL_CH] = FFMAX(bit_alloc_stages[CPL_CH], 2); } /* delta bit allocation information */ - if (get_bits1(gb)) { + if (get_bits1(gbc)) { /* delta bit allocation exists (strategy) */ for (ch = !ctx->cpl_in_use; ch <= fbw_channels; ch++) { - ctx->dba_mode[ch] = get_bits(gb, 2); + ctx->dba_mode[ch] = get_bits(gbc, 2); if (ctx->dba_mode[ch] == DBA_RESERVED) { av_log(ctx->avctx, AV_LOG_ERROR, "delta bit allocation strategy reserved\n"); return -1; @@ -957,11 +957,11 @@ static int ac3_parse_audio_block(AC3Deco /* channel delta offset, len and bit allocation */ for (ch = !ctx->cpl_in_use; ch <= fbw_channels; ch++) { if (ctx->dba_mode[ch] == DBA_NEW) { - ctx->dba_nsegs[ch] = get_bits(gb, 3); + ctx->dba_nsegs[ch] = get_bits(gbc, 3); for (seg = 0; seg <= ctx->dba_nsegs[ch]; seg++) { - ctx->dba_offsets[ch][seg] = get_bits(gb, 5); - ctx->dba_lengths[ch][seg] = get_bits(gb, 4); - ctx->dba_values[ch][seg] = get_bits(gb, 3); + ctx->dba_offsets[ch][seg] = get_bits(gbc, 5); + ctx->dba_lengths[ch][seg] = get_bits(gbc, 4); + ctx->dba_values[ch][seg] = get_bits(gbc, 3); } } } @@ -1000,10 +1000,10 @@ static int ac3_parse_audio_block(AC3Deco } /* unused dummy data */ - if (get_bits1(gb)) { - int skipl = get_bits(gb, 9); + if (get_bits1(gbc)) { + int skipl = get_bits(gbc, 9); while(skipl--) - skip_bits(gb, 8); + skip_bits(gbc, 8); } /* unpack the transform coefficients @@ -1063,7 +1063,7 @@ static int ac3_decode_frame(AVCodecConte int i, blk, ch, err; /* initialize the GetBitContext with the start of valid AC-3 Frame */ - init_get_bits(&ctx->gb, buf, buf_size * 8); + init_get_bits(&ctx->gbc, buf, buf_size * 8); /* parse the syncinfo */ err = ac3_parse_header(ctx);

1 0