May 2008 - FFmpeg-soc - lists.ffmpeg.org

[soc]: r2290 - eac3/ac3dec.c
by jbr 01 Jun '08

01 Jun '08

Author: jbr Date: Sat May 31 23:40:03 2008 New Revision: 2290 Log: cosmetics: indent Modified: eac3/ac3dec.c Modified: eac3/ac3dec.c ============================================================================== --- eac3/ac3dec.c (original) +++ eac3/ac3dec.c Sat May 31 23:40:03 2008 @@ -971,8 +971,8 @@ static int decode_audio_block(AC3DecodeC if (s->exp_strategy[blk][ch] != EXP_REUSE) { s->dexps[ch][0] = get_bits(gbc, 4) << !ch; decode_exponents(gbc, s->exp_strategy[blk][ch], - s->num_exp_groups[ch], s->dexps[ch][0], - &s->dexps[ch][s->start_freq[ch]+!!ch]); + s->num_exp_groups[ch], s->dexps[ch][0], + &s->dexps[ch][s->start_freq[ch]+!!ch]); if(ch != CPL_CH && ch != s->lfe_ch) skip_bits(gbc, 2); /* skip gainrng */ }

1 0

[soc]: r2289 - eac3/ac3dec.c
by jbr 01 Jun '08

01 Jun '08

Author: jbr Date: Sat May 31 23:32:07 2008 New Revision: 2289 Log: cosmetics: remove unneeded braces Modified: eac3/ac3dec.c Modified: eac3/ac3dec.c ============================================================================== --- eac3/ac3dec.c (original) +++ eac3/ac3dec.c Sat May 31 23:32:07 2008 @@ -986,9 +986,8 @@ static int decode_audio_block(AC3DecodeC s->bit_alloc_params.slow_gain = ff_ac3_slow_gain_tab[get_bits(gbc, 2)]; s->bit_alloc_params.db_per_bit = ff_ac3_db_per_bit_tab[get_bits(gbc, 2)]; s->bit_alloc_params.floor = ff_ac3_floor_tab[get_bits(gbc, 3)]; - for(ch=!s->cpl_in_use[blk]; ch<=s->channels; ch++) { + for(ch=!s->cpl_in_use[blk]; ch<=s->channels; ch++) bit_alloc_stages[ch] = FFMAX(bit_alloc_stages[ch], 2); - } } else if (!blk) { av_log(s->avctx, AV_LOG_ERROR, "new bit allocation info must be present in block 0\n"); return -1;

1 0

Make Your Initial Checkins
by Mike Melanson 01 Jun '08

01 Jun '08

Hi students, I see that some students have made their initial checkins by at least creating new directories for their projects. For those who haven't, please do so. This will indicate that: 1) You're still alive at the start of the SoC. 2) That your repository privileges work. Thanks... -- -Mike Melanson

4 6

[soc]: r2288 - eac3/ac3dec.c
by jbr 01 Jun '08

01 Jun '08

Author: jbr Date: Sat May 31 18:35:44 2008 New Revision: 2288 Log: simplify Modified: eac3/ac3dec.c Modified: eac3/ac3dec.c ============================================================================== --- eac3/ac3dec.c (original) +++ eac3/ac3dec.c Sat May 31 18:35:44 2008 @@ -1117,11 +1117,8 @@ static int decode_audio_block(AC3DecodeC } if(bit_alloc_stages[ch] > 0) { /* Compute bit allocation */ - const uint8_t *bap_tab; - if (!s->eac3 || s->channel_uses_aht[ch] == 0) - bap_tab = ff_ac3_bap_tab; - else - bap_tab = ff_eac3_hebap_tab; + const uint8_t *bap_tab = (!s->eac3 || !s->channel_uses_aht[ch]) ? + ff_ac3_bap_tab : ff_eac3_hebap_tab; ff_ac3_bit_alloc_calc_bap(s->mask[ch], s->psd[ch], s->start_freq[ch], s->end_freq[ch], s->snr_offset[ch],

1 0

[soc]: r2287 - eac3/ac3dec.c
by jbr 01 Jun '08

01 Jun '08

Author: jbr Date: Sat May 31 18:33:03 2008 New Revision: 2287 Log: cosmetics: indent Modified: eac3/ac3dec.c Modified: eac3/ac3dec.c ============================================================================== --- eac3/ac3dec.c (original) +++ eac3/ac3dec.c Sat May 31 18:33:03 2008 @@ -1122,11 +1122,11 @@ static int decode_audio_block(AC3DecodeC bap_tab = ff_ac3_bap_tab; else bap_tab = ff_eac3_hebap_tab; - ff_ac3_bit_alloc_calc_bap(s->mask[ch], s->psd[ch], - s->start_freq[ch], s->end_freq[ch], - s->snr_offset[ch], - s->bit_alloc_params.floor, - bap_tab, s->bap[ch]); + ff_ac3_bit_alloc_calc_bap(s->mask[ch], s->psd[ch], + s->start_freq[ch], s->end_freq[ch], + s->snr_offset[ch], + s->bit_alloc_params.floor, + bap_tab, s->bap[ch]); } }

1 0

[soc]: r2286 - in eac3: ac3dec.c ac3dec.h eac3dec.c
by jbr 01 Jun '08

01 Jun '08

Author: jbr Date: Sat May 31 18:32:39 2008 New Revision: 2286 Log: remove redundant variable, hebap, from decode context Modified: eac3/ac3dec.c eac3/ac3dec.h eac3/eac3dec.c Modified: eac3/ac3dec.c ============================================================================== --- eac3/ac3dec.c (original) +++ eac3/ac3dec.c Sat May 31 18:32:39 2008 @@ -509,7 +509,7 @@ static void remove_dithering(AC3DecodeCo for(ch=1; ch<=s->fbw_channels; ch++) { if(!s->dither_flag[ch]) { coeffs = s->fixed_coeffs[ch]; - bap = s->channel_uses_aht[ch] ? s->hebap[ch] : s->bap[ch]; + bap = s->bap[ch]; if(s->channel_in_cpl[ch]) end = s->start_freq[CPL_CH]; else @@ -519,7 +519,7 @@ static void remove_dithering(AC3DecodeCo coeffs[i] = 0; } if(s->channel_in_cpl[ch]) { - bap = s->channel_uses_aht[CPL_CH] ? s->hebap[CPL_CH] : s->bap[CPL_CH]; + bap = s->bap[CPL_CH]; for(; i<s->end_freq[CPL_CH]; i++) { if(!bap[i]) coeffs[i] = 0; @@ -1117,17 +1117,16 @@ static int decode_audio_block(AC3DecodeC } if(bit_alloc_stages[ch] > 0) { /* Compute bit allocation */ + const uint8_t *bap_tab; if (!s->eac3 || s->channel_uses_aht[ch] == 0) + bap_tab = ff_ac3_bap_tab; + else + bap_tab = ff_eac3_hebap_tab; ff_ac3_bit_alloc_calc_bap(s->mask[ch], s->psd[ch], s->start_freq[ch], s->end_freq[ch], s->snr_offset[ch], s->bit_alloc_params.floor, - ff_ac3_bap_tab, s->bap[ch]); - else - ff_ac3_bit_alloc_calc_bap(s->mask[ch], s->psd[ch], - s->start_freq[ch], s->end_freq[ch], s->snr_offset[ch], - s->bit_alloc_params.floor, ff_eac3_hebap_tab, - s->hebap[ch]); + bap_tab, s->bap[ch]); } } Modified: eac3/ac3dec.h ============================================================================== --- eac3/ac3dec.h (original) +++ eac3/ac3dec.h Sat May 31 18:32:39 2008 @@ -176,7 +176,6 @@ typedef struct AC3DecodeContext { 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 Modified: eac3/eac3dec.c ============================================================================== --- eac3/eac3dec.c (original) +++ eac3/eac3dec.c Sat May 31 18:32:39 2008 @@ -183,7 +183,7 @@ void ff_eac3_get_transform_coeffs_aht_ch /* read 1-bit GAQ gain codes */ gs = 0; for (bin = s->start_freq[ch]; bin < s->end_freq[ch]; bin++) { - if (s->hebap[ch][bin] > 7 && s->hebap[ch][bin] < end_bap) + if (s->bap[ch][bin] > 7 && s->bap[ch][bin] < end_bap) gaq_gain[gs++] = get_bits1(gbc) << (gaq_mode-1); } } else if (gaq_mode == EAC3_GAQ_124) { @@ -191,7 +191,7 @@ void ff_eac3_get_transform_coeffs_aht_ch int gc = 2; gs = 0; for (bin = s->start_freq[ch]; bin < s->end_freq[ch]; bin++) { - if (s->hebap[ch][bin] > 7 && s->hebap[ch][bin] < end_bap) { + if (s->bap[ch][bin] > 7 && s->bap[ch][bin] < end_bap) { if(gc++ == 2) { int group_gain = get_bits(gbc, 5); gaq_gain[gs++] = gaq_ungroup_tab[group_gain][0]; @@ -205,7 +205,7 @@ void ff_eac3_get_transform_coeffs_aht_ch gs=0; for (bin = s->start_freq[ch]; bin < s->end_freq[ch]; bin++) { - int hebap = s->hebap[ch][bin]; + int hebap = s->bap[ch][bin]; int bits = ff_eac3_bits_vs_hebap[hebap]; if (!hebap) { /* hebap=0 */

1 0

[soc]: r2285 - eac3/ac3dec.c
by jbr 01 Jun '08

01 Jun '08

Author: jbr Date: Sat May 31 18:15:30 2008 New Revision: 2285 Log: add a check for invalid channel mode when coupling is used. Modified: eac3/ac3dec.c Modified: eac3/ac3dec.c ============================================================================== --- eac3/ac3dec.c (original) +++ eac3/ac3dec.c Sat May 31 18:15:30 2008 @@ -793,6 +793,11 @@ static int decode_audio_block(AC3DecodeC /* coupling in use */ int cpl_begin_freq, cpl_end_freq; + if (channel_mode < AC3_CHMODE_STEREO) { + av_log(s->avctx, AV_LOG_ERROR, "coupling not allowed in mono or dual-mono\n"); + return -1; + } + /* check for enhanced coupling */ if (s->eac3 && get_bits1(gbc)) { /* TODO: parse enhanced coupling strategy info */

1 0

[soc]: r2284 - in eac3: ac3dec.h eac3dec.c
by jbr 31 May '08

31 May '08

Author: jbr Date: Sat May 31 17:55:29 2008 New Revision: 2284 Log: move gaq_gain out of decode context and make it local Modified: eac3/ac3dec.h eac3/eac3dec.c Modified: eac3/ac3dec.h ============================================================================== --- eac3/ac3dec.h (original) +++ eac3/ac3dec.h Sat May 31 17:55:29 2008 @@ -98,7 +98,6 @@ typedef struct AC3DecodeContext { ///@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 int pre_mantissa[6][AC3_MAX_CHANNELS][256]; ///< Pre-IDCT mantissas ///@} Modified: eac3/eac3dec.c ============================================================================== --- eac3/eac3dec.c (original) +++ eac3/eac3dec.c Sat May 31 17:55:29 2008 @@ -172,6 +172,7 @@ void ff_eac3_get_transform_coeffs_aht_ch int bin, blk, gs; int end_bap, gaq_mode; GetBitContext *gbc = &s->gbc; + int gaq_gain[AC3_MAX_COEFS]; gaq_mode = get_bits(gbc, 2); end_bap = (gaq_mode < 2) ? 12 : 17; @@ -183,7 +184,7 @@ void ff_eac3_get_transform_coeffs_aht_ch gs = 0; for (bin = s->start_freq[ch]; bin < s->end_freq[ch]; bin++) { if (s->hebap[ch][bin] > 7 && s->hebap[ch][bin] < end_bap) - s->gaq_gain[gs++] = get_bits1(gbc) << (gaq_mode-1); + gaq_gain[gs++] = get_bits1(gbc) << (gaq_mode-1); } } else if (gaq_mode == EAC3_GAQ_124) { /* read 1.67-bit GAQ gain codes (3 codes in 5 bits) */ @@ -193,9 +194,9 @@ void ff_eac3_get_transform_coeffs_aht_ch if (s->hebap[ch][bin] > 7 && s->hebap[ch][bin] < end_bap) { if(gc++ == 2) { int group_gain = get_bits(gbc, 5); - s->gaq_gain[gs++] = gaq_ungroup_tab[group_gain][0]; - s->gaq_gain[gs++] = gaq_ungroup_tab[group_gain][1]; - s->gaq_gain[gs++] = gaq_ungroup_tab[group_gain][2]; + gaq_gain[gs++] = gaq_ungroup_tab[group_gain][0]; + gaq_gain[gs++] = gaq_ungroup_tab[group_gain][1]; + gaq_gain[gs++] = gaq_ungroup_tab[group_gain][2]; gc = 0; } } @@ -221,7 +222,7 @@ void ff_eac3_get_transform_coeffs_aht_ch /* Gain Adaptive Quantization */ int gbits, log_gain; if (gaq_mode != EAC3_GAQ_NO && hebap < end_bap) { - log_gain = s->gaq_gain[gs++]; + log_gain = gaq_gain[gs++]; } else { log_gain = 0; }

1 0

[soc]: r2283 - eac3/ac3dec.h
by jbr 31 May '08

31 May '08

Author: jbr Date: Sat May 31 17:44:26 2008 New Revision: 2283 Log: only define spx_in_use when testing spx Modified: eac3/ac3dec.h Modified: eac3/ac3dec.h ============================================================================== --- eac3/ac3dec.h (original) +++ eac3/ac3dec.h Sat May 31 17:44:26 2008 @@ -106,9 +106,7 @@ typedef struct AC3DecodeContext { ///@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) -#endif int spx_in_use; ///< spectral extension in use -#if TEST_SPX int chinspx[AC3_MAX_CHANNELS]; ///< Channel in spectral extension int spxstrtf; ///< Spectral extension start copy frequency code int spxbegf; ///< Spectral extension begin frequency code

1 0

Re: [FFmpeg-soc] expand filter (alternative to pad syntax)
by Ryo Hirafuji 31 May '08

31 May '08

Sorry, the source I posted was broken. Here is a correct source. -- Ryo Hirafuji blog http://ledyba.ddo.jp/ dojin http://ledyba.ddo.jp/Pegasus/ web http://ledyba.hp.infoseek.co.jp/

8 37