October 2023 - ffmpeg-cvslog - lists.ffmpeg.org

avcodec/wmavoice: Avoid unnecessary VLC structure
by Andreas Rheinhardt 31 Oct '23

31 Oct '23

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Tue Sep 26 22:53:37 2023 +0200| [f2687a3b691d98ffa9ce356279ed37e9e18af9a9] | committer: Andreas Rheinhardt avcodec/wmavoice: Avoid unnecessary VLC structure Everything besides VLC.table is basically write-only and even VLC.table can be removed by accessing the underlying table directly. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f2687a3b691d98ffa… --- libavcodec/wmavoice.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libavcodec/wmavoice.c b/libavcodec/wmavoice.c index dd7cc64d63..4e93aadab2 100644 --- a/libavcodec/wmavoice.c +++ b/libavcodec/wmavoice.c @@ -60,7 +60,7 @@ /** * Frame type VLC coding. */ -static VLC frame_type_vlc; +static VLCElem frame_type_vlc[132]; /** * Adaptive codebook types. @@ -320,9 +320,9 @@ static av_cold void wmavoice_init_static_data(void) 14, 14, 14, 14 }; - VLC_INIT_STATIC_FROM_LENGTHS(&frame_type_vlc, VLC_NBITS, - FF_ARRAY_ELEMS(bits), bits, - 1, NULL, 0, 0, 0, 0, 132); + VLC_INIT_STATIC_TABLE_FROM_LENGTHS(frame_type_vlc, VLC_NBITS, + FF_ARRAY_ELEMS(bits), bits, + 1, NULL, 0, 0, 0, 0); } static av_cold void wmavoice_flush(AVCodecContext *ctx) @@ -1503,7 +1503,7 @@ static int synth_frame(AVCodecContext *ctx, GetBitContext *gb, int frame_idx, int pitch[MAX_BLOCKS], av_uninit(last_block_pitch); /* Parse frame type ("frame header"), see frame_descs */ - int bd_idx = s->vbm_tree[get_vlc2(gb, frame_type_vlc.table, 6, 3)], block_nsamples; + int bd_idx = s->vbm_tree[get_vlc2(gb, frame_type_vlc, 6, 3)], block_nsamples; if (bd_idx < 0) { av_log(ctx, AV_LOG_ERROR,

1 0

avcodec/wmaprodec: Avoid superfluous VLC structures
by Andreas Rheinhardt 31 Oct '23

31 Oct '23

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Tue Sep 26 22:50:41 2023 +0200| [5615f9dab4e7f911ce8799c34c0ca425b0e2a090] | committer: Andreas Rheinhardt avcodec/wmaprodec: Avoid superfluous VLC structures For all VLCs here, the number of bits of the VLC is write-only, because it is hardcoded at the call site. Therefore one can replace these VLC structures with the only thing that is actually used: The pointer to the VLCElem table. And in most cases one can even avoid this. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5615f9dab4e7f911c… --- libavcodec/wma.c | 4 +-- libavcodec/wma.h | 2 +- libavcodec/wmadec.c | 2 +- libavcodec/wmaprodec.c | 73 +++++++++++++++++++++++++++----------------------- 4 files changed, 43 insertions(+), 38 deletions(-) diff --git a/libavcodec/wma.c b/libavcodec/wma.c index 3b4d049a83..5eacf230fa 100644 --- a/libavcodec/wma.c +++ b/libavcodec/wma.c @@ -424,7 +424,7 @@ unsigned int ff_wma_get_large_val(GetBitContext *gb) * @return 0 on success, -1 otherwise */ int ff_wma_run_level_decode(AVCodecContext *avctx, GetBitContext *gb, - VLC *vlc, const float *level_table, + const VLCElem *vlc, const float *level_table, const uint16_t *run_table, int version, WMACoef *ptr, int offset, int num_coefs, int block_len, int frame_len_bits, @@ -435,7 +435,7 @@ int ff_wma_run_level_decode(AVCodecContext *avctx, GetBitContext *gb, uint32_t *iptr = (uint32_t *) ptr; const unsigned int coef_mask = block_len - 1; for (; offset < num_coefs; offset++) { - code = get_vlc2(gb, vlc->table, VLCBITS, VLCMAX); + code = get_vlc2(gb, vlc, VLCBITS, VLCMAX); if (code > 1) { /** normal code */ offset += run_table[code]; diff --git a/libavcodec/wma.h b/libavcodec/wma.h index 5dc604154d..3d0d872ea3 100644 --- a/libavcodec/wma.h +++ b/libavcodec/wma.h @@ -155,7 +155,7 @@ int ff_wma_total_gain_to_bits(int total_gain); int ff_wma_end(AVCodecContext *avctx); unsigned int ff_wma_get_large_val(GetBitContext *gb); int ff_wma_run_level_decode(AVCodecContext *avctx, GetBitContext *gb, - VLC *vlc, const float *level_table, + const VLCElem *vlc, const float *level_table, const uint16_t *run_table, int version, WMACoef *ptr, int offset, int num_coefs, int block_len, int frame_len_bits, diff --git a/libavcodec/wmadec.c b/libavcodec/wmadec.c index ab48e28ebc..3427e482dc 100644 --- a/libavcodec/wmadec.c +++ b/libavcodec/wmadec.c @@ -616,7 +616,7 @@ static int wma_decode_block(WMACodecContext *s) * there is potentially less energy there */ tindex = (ch == 1 && s->ms_stereo); memset(ptr, 0, s->block_len * sizeof(WMACoef)); - ret = ff_wma_run_level_decode(s->avctx, &s->gb, &s->coef_vlc[tindex], + ret = ff_wma_run_level_decode(s->avctx, &s->gb, s->coef_vlc[tindex].table, s->level_table[tindex], s->run_table[tindex], 0, ptr, 0, nb_coefs[ch], s->block_len, s->frame_len_bits, coef_nb_bits); diff --git a/libavcodec/wmaprodec.c b/libavcodec/wmaprodec.c index 61b86ad6d1..65b269adda 100644 --- a/libavcodec/wmaprodec.c +++ b/libavcodec/wmaprodec.c @@ -132,12 +132,12 @@ #define SCALEMAXDEPTH ((HUFF_SCALE_MAXBITS+SCALEVLCBITS-1)/SCALEVLCBITS) #define SCALERLMAXDEPTH ((HUFF_SCALE_RL_MAXBITS+VLCBITS-1)/VLCBITS) -static VLC sf_vlc; ///< scale factor DPCM vlc -static VLC sf_rl_vlc; ///< scale factor run length vlc -static VLC vec4_vlc; ///< 4 coefficients per symbol -static VLC vec2_vlc; ///< 2 coefficients per symbol -static VLC vec1_vlc; ///< 1 coefficient per symbol -static VLC coef_vlc[2]; ///< coefficient run length vlc codes +static VLCElem sf_vlc[616]; ///< scale factor DPCM vlc +static VLCElem sf_rl_vlc[1406]; ///< scale factor run length vlc +static VLCElem vec4_vlc[604]; ///< 4 coefficients per symbol +static VLCElem vec2_vlc[562]; ///< 2 coefficients per symbol +static VLCElem vec1_vlc[562]; ///< 1 coefficient per symbol +static const VLCElem *coef_vlc[2]; ///< coefficient run length vlc codes static float sin64[33]; ///< sine table for decorrelation /** @@ -320,27 +320,32 @@ static av_cold int get_rate(AVCodecContext *avctx) static av_cold void decode_init_static(void) { - VLC_INIT_STATIC_FROM_LENGTHS(&sf_vlc, SCALEVLCBITS, HUFF_SCALE_SIZE, - &scale_table[0][1], 2, - &scale_table[0][0], 2, 1, -60, 0, 616); - VLC_INIT_STATIC_FROM_LENGTHS(&sf_rl_vlc, VLCBITS, HUFF_SCALE_RL_SIZE, - &scale_rl_table[0][1], 2, - &scale_rl_table[0][0], 2, 1, 0, 0, 1406); - VLC_INIT_STATIC_FROM_LENGTHS(&coef_vlc[0], VLCBITS, HUFF_COEF0_SIZE, - coef0_lens, 1, - coef0_syms, 2, 2, 0, 0, 2108); - VLC_INIT_STATIC_FROM_LENGTHS(&coef_vlc[1], VLCBITS, HUFF_COEF1_SIZE, + static VLCElem vlc_buf[2108 + 3912]; + VLCInitState state = VLC_INIT_STATE(vlc_buf); + + VLC_INIT_STATIC_TABLE_FROM_LENGTHS(sf_vlc, SCALEVLCBITS, HUFF_SCALE_SIZE, + &scale_table[0][1], 2, + &scale_table[0][0], 2, 1, -60, 0); + VLC_INIT_STATIC_TABLE_FROM_LENGTHS(sf_rl_vlc, VLCBITS, HUFF_SCALE_RL_SIZE, + &scale_rl_table[0][1], 2, + &scale_rl_table[0][0], 2, 1, 0, 0); + coef_vlc[0] = + ff_vlc_init_tables_from_lengths(&state, VLCBITS, HUFF_COEF0_SIZE, + coef0_lens, 1, + coef0_syms, 2, 2, 0, 0); + coef_vlc[1] = + ff_vlc_init_tables_from_lengths(&state, VLCBITS, HUFF_COEF1_SIZE, &coef1_table[0][1], 2, - &coef1_table[0][0], 2, 1, 0, 0, 3912); - VLC_INIT_STATIC_FROM_LENGTHS(&vec4_vlc, VLCBITS, HUFF_VEC4_SIZE, - vec4_lens, 1, - vec4_syms, 2, 2, -1, 0, 604); - VLC_INIT_STATIC_FROM_LENGTHS(&vec2_vlc, VLCBITS, HUFF_VEC2_SIZE, - &vec2_table[0][1], 2, - &vec2_table[0][0], 2, 1, -1, 0, 562); - VLC_INIT_STATIC_FROM_LENGTHS(&vec1_vlc, VLCBITS, HUFF_VEC1_SIZE, - &vec1_table[0][1], 2, - &vec1_table[0][0], 2, 1, 0, 0, 562); + &coef1_table[0][0], 2, 1, 0, 0); + VLC_INIT_STATIC_TABLE_FROM_LENGTHS(vec4_vlc, VLCBITS, HUFF_VEC4_SIZE, + vec4_lens, 1, + vec4_syms, 2, 2, -1, 0); + VLC_INIT_STATIC_TABLE_FROM_LENGTHS(vec2_vlc, VLCBITS, HUFF_VEC2_SIZE, + &vec2_table[0][1], 2, + &vec2_table[0][0], 2, 1, -1, 0); + VLC_INIT_STATIC_TABLE_FROM_LENGTHS(vec1_vlc, VLCBITS, HUFF_VEC1_SIZE, + &vec1_table[0][1], 2, + &vec1_table[0][0], 2, 1, 0, 0); /** calculate sine values for the decorrelation matrix */ for (int i = 0; i < 33; i++) @@ -929,7 +934,7 @@ static int decode_coeffs(WMAProDecodeCtx *s, int c) 0x41400000, 0x41500000, 0x41600000, 0x41700000, }; int vlctable; - VLC* vlc; + const VLCElem *vlc; WMAProChannelCtx* ci = &s->channel[c]; int rl_mode = 0; int cur_coeff = 0; @@ -940,7 +945,7 @@ static int decode_coeffs(WMAProDecodeCtx *s, int c) ff_dlog(s->avctx, "decode coefficients for channel %i\n", c); vlctable = get_bits1(&s->gb); - vlc = &coef_vlc[vlctable]; + vlc = coef_vlc[vlctable]; if (vlctable) { run = coef1_run; @@ -958,17 +963,17 @@ static int decode_coeffs(WMAProDecodeCtx *s, int c) int i; unsigned int idx; - idx = get_vlc2(&s->gb, vec4_vlc.table, VLCBITS, VEC4MAXDEPTH); + idx = get_vlc2(&s->gb, vec4_vlc, VLCBITS, VEC4MAXDEPTH); if ((int)idx < 0) { for (i = 0; i < 4; i += 2) { - idx = get_vlc2(&s->gb, vec2_vlc.table, VLCBITS, VEC2MAXDEPTH); + idx = get_vlc2(&s->gb, vec2_vlc, VLCBITS, VEC2MAXDEPTH); if ((int)idx < 0) { uint32_t v0, v1; - v0 = get_vlc2(&s->gb, vec1_vlc.table, VLCBITS, VEC1MAXDEPTH); + v0 = get_vlc2(&s->gb, vec1_vlc, VLCBITS, VEC1MAXDEPTH); if (v0 == HUFF_VEC1_SIZE - 1) v0 += ff_wma_get_large_val(&s->gb); - v1 = get_vlc2(&s->gb, vec1_vlc.table, VLCBITS, VEC1MAXDEPTH); + v1 = get_vlc2(&s->gb, vec1_vlc, VLCBITS, VEC1MAXDEPTH); if (v1 == HUFF_VEC1_SIZE - 1) v1 += ff_wma_get_large_val(&s->gb); vals[i ] = av_float2int(v0); @@ -1059,7 +1064,7 @@ static int decode_scale_factors(WMAProDecodeCtx* s) s->channel[c].scale_factor_step = get_bits(&s->gb, 2) + 1; val = 45 / s->channel[c].scale_factor_step; for (sf = s->channel[c].scale_factors; sf < sf_end; sf++) { - val += get_vlc2(&s->gb, sf_vlc.table, SCALEVLCBITS, SCALEMAXDEPTH); + val += get_vlc2(&s->gb, sf_vlc, SCALEVLCBITS, SCALEMAXDEPTH); *sf = val; } } else { @@ -1071,7 +1076,7 @@ static int decode_scale_factors(WMAProDecodeCtx* s) int val; int sign; - idx = get_vlc2(&s->gb, sf_rl_vlc.table, VLCBITS, SCALERLMAXDEPTH); + idx = get_vlc2(&s->gb, sf_rl_vlc, VLCBITS, SCALERLMAXDEPTH); if (!idx) { uint32_t code = get_bits(&s->gb, 14);

1 0

avcodec/mpeg12: Avoid unnecessary VLC structures
by Andreas Rheinhardt 31 Oct '23

31 Oct '23

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Tue Sep 26 19:51:45 2023 +0200| [7e2120c4d955a99d004a2ac9b690233027fae1fb] | committer: Andreas Rheinhardt avcodec/mpeg12: Avoid unnecessary VLC structures Everything besides VLC.table is basically write-only and even VLC.table can be removed by accessing the underlying tables directly. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7e2120c4d955a99d0… --- libavcodec/mpeg12.c | 58 +++++++++++++++++++++++++------------------------- libavcodec/mpeg12dec.c | 12 +++++------ libavcodec/mpeg12dec.h | 4 ++-- libavcodec/mpeg12vlc.h | 14 ++++++------ 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c index 70033ec725..8d88820c46 100644 --- a/libavcodec/mpeg12.c +++ b/libavcodec/mpeg12.c @@ -115,43 +115,43 @@ void ff_mpeg1_clean_buffers(MpegEncContext *s) /******************************************/ /* decoding */ -VLC ff_mv_vlc; +VLCElem ff_mv_vlc[266]; -VLC ff_dc_lum_vlc; -VLC ff_dc_chroma_vlc; +VLCElem ff_dc_lum_vlc[512]; +VLCElem ff_dc_chroma_vlc[514]; -VLC ff_mbincr_vlc; -VLC ff_mb_ptype_vlc; -VLC ff_mb_btype_vlc; -VLC ff_mb_pat_vlc; +VLCElem ff_mbincr_vlc[538]; +VLCElem ff_mb_ptype_vlc[64]; +VLCElem ff_mb_btype_vlc[64]; +VLCElem ff_mb_pat_vlc[512]; RL_VLC_ELEM ff_mpeg1_rl_vlc[680]; RL_VLC_ELEM ff_mpeg2_rl_vlc[674]; static av_cold void mpeg12_init_vlcs(void) { - VLC_INIT_STATIC(&ff_dc_lum_vlc, DC_VLC_BITS, 12, - ff_mpeg12_vlc_dc_lum_bits, 1, 1, - ff_mpeg12_vlc_dc_lum_code, 2, 2, 512); - VLC_INIT_STATIC(&ff_dc_chroma_vlc, DC_VLC_BITS, 12, - ff_mpeg12_vlc_dc_chroma_bits, 1, 1, - ff_mpeg12_vlc_dc_chroma_code, 2, 2, 514); - VLC_INIT_STATIC(&ff_mv_vlc, MV_VLC_BITS, 17, - &ff_mpeg12_mbMotionVectorTable[0][1], 2, 1, - &ff_mpeg12_mbMotionVectorTable[0][0], 2, 1, 266); - VLC_INIT_STATIC(&ff_mbincr_vlc, MBINCR_VLC_BITS, 36, - &ff_mpeg12_mbAddrIncrTable[0][1], 2, 1, - &ff_mpeg12_mbAddrIncrTable[0][0], 2, 1, 538); - VLC_INIT_STATIC(&ff_mb_pat_vlc, MB_PAT_VLC_BITS, 64, - &ff_mpeg12_mbPatTable[0][1], 2, 1, - &ff_mpeg12_mbPatTable[0][0], 2, 1, 512); - - VLC_INIT_STATIC(&ff_mb_ptype_vlc, MB_PTYPE_VLC_BITS, 7, - &table_mb_ptype[0][1], 2, 1, - &table_mb_ptype[0][0], 2, 1, 64); - VLC_INIT_STATIC(&ff_mb_btype_vlc, MB_BTYPE_VLC_BITS, 11, - &table_mb_btype[0][1], 2, 1, - &table_mb_btype[0][0], 2, 1, 64); + VLC_INIT_STATIC_TABLE(ff_dc_lum_vlc, DC_VLC_BITS, 12, + ff_mpeg12_vlc_dc_lum_bits, 1, 1, + ff_mpeg12_vlc_dc_lum_code, 2, 2, 0); + VLC_INIT_STATIC_TABLE(ff_dc_chroma_vlc, DC_VLC_BITS, 12, + ff_mpeg12_vlc_dc_chroma_bits, 1, 1, + ff_mpeg12_vlc_dc_chroma_code, 2, 2, 0); + VLC_INIT_STATIC_TABLE(ff_mv_vlc, MV_VLC_BITS, 17, + &ff_mpeg12_mbMotionVectorTable[0][1], 2, 1, + &ff_mpeg12_mbMotionVectorTable[0][0], 2, 1, 0); + VLC_INIT_STATIC_TABLE(ff_mbincr_vlc, MBINCR_VLC_BITS, 36, + &ff_mpeg12_mbAddrIncrTable[0][1], 2, 1, + &ff_mpeg12_mbAddrIncrTable[0][0], 2, 1, 0); + VLC_INIT_STATIC_TABLE(ff_mb_pat_vlc, MB_PAT_VLC_BITS, 64, + &ff_mpeg12_mbPatTable[0][1], 2, 1, + &ff_mpeg12_mbPatTable[0][0], 2, 1, 0); + + VLC_INIT_STATIC_TABLE(ff_mb_ptype_vlc, MB_PTYPE_VLC_BITS, 7, + &table_mb_ptype[0][1], 2, 1, + &table_mb_ptype[0][0], 2, 1, 0); + VLC_INIT_STATIC_TABLE(ff_mb_btype_vlc, MB_BTYPE_VLC_BITS, 11, + &table_mb_btype[0][1], 2, 1, + &table_mb_btype[0][0], 2, 1, 0); ff_init_2d_vlc_rl(ff_mpeg1_vlc_table, ff_mpeg1_rl_vlc, ff_mpeg12_run, ff_mpeg12_level, MPEG12_RL_NB_ELEMS, diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c index 982c25c3fd..020b7b7564 100644 --- a/libavcodec/mpeg12dec.c +++ b/libavcodec/mpeg12dec.c @@ -117,7 +117,7 @@ static int mpeg_decode_motion(MpegEncContext *s, int fcode, int pred) { int code, sign, val, shift; - code = get_vlc2(&s->gb, ff_mv_vlc.table, MV_VLC_BITS, 2); + code = get_vlc2(&s->gb, ff_mv_vlc, MV_VLC_BITS, 2); if (code == 0) return pred; if (code < 0) @@ -470,7 +470,7 @@ static int mpeg_decode_mb(MpegEncContext *s, int16_t block[12][64]) } break; case AV_PICTURE_TYPE_P: - mb_type = get_vlc2(&s->gb, ff_mb_ptype_vlc.table, MB_PTYPE_VLC_BITS, 1); + mb_type = get_vlc2(&s->gb, ff_mb_ptype_vlc, MB_PTYPE_VLC_BITS, 1); if (mb_type < 0) { av_log(s->avctx, AV_LOG_ERROR, "Invalid mb type in P-frame at %d %d\n", s->mb_x, s->mb_y); @@ -479,7 +479,7 @@ static int mpeg_decode_mb(MpegEncContext *s, int16_t block[12][64]) mb_type = ptype2mb_type[mb_type]; break; case AV_PICTURE_TYPE_B: - mb_type = get_vlc2(&s->gb, ff_mb_btype_vlc.table, MB_BTYPE_VLC_BITS, 1); + mb_type = get_vlc2(&s->gb, ff_mb_btype_vlc, MB_BTYPE_VLC_BITS, 1); if (mb_type < 0) { av_log(s->avctx, AV_LOG_ERROR, "Invalid mb type in B-frame at %d %d\n", s->mb_x, s->mb_y); @@ -736,7 +736,7 @@ static int mpeg_decode_mb(MpegEncContext *s, int16_t block[12][64]) if (HAS_CBP(mb_type)) { s->bdsp.clear_blocks(s->block[0]); - cbp = get_vlc2(&s->gb, ff_mb_pat_vlc.table, MB_PAT_VLC_BITS, 1); + cbp = get_vlc2(&s->gb, ff_mb_pat_vlc, MB_PAT_VLC_BITS, 1); if (mb_block_count > 6) { cbp *= 1 << mb_block_count - 6; cbp |= get_bits(&s->gb, mb_block_count - 6); @@ -1422,7 +1422,7 @@ static int mpeg_decode_slice(MpegEncContext *s, int mb_y, skip_bits1(&s->gb); } else { while (get_bits_left(&s->gb) > 0) { - int code = get_vlc2(&s->gb, ff_mbincr_vlc.table, + int code = get_vlc2(&s->gb, ff_mbincr_vlc, MBINCR_VLC_BITS, 2); if (code < 0) { av_log(s->avctx, AV_LOG_ERROR, "first mb_incr damaged\n"); @@ -1591,7 +1591,7 @@ static int mpeg_decode_slice(MpegEncContext *s, int mb_y, /* read increment again */ s->mb_skip_run = 0; for (;;) { - int code = get_vlc2(&s->gb, ff_mbincr_vlc.table, + int code = get_vlc2(&s->gb, ff_mbincr_vlc, MBINCR_VLC_BITS, 2); if (code < 0) { av_log(s->avctx, AV_LOG_ERROR, "mb incr damaged\n"); diff --git a/libavcodec/mpeg12dec.h b/libavcodec/mpeg12dec.h index 4c015d3096..4641179149 100644 --- a/libavcodec/mpeg12dec.h +++ b/libavcodec/mpeg12dec.h @@ -30,9 +30,9 @@ static inline int decode_dc(GetBitContext *gb, int component) int code, diff; if (component == 0) { - code = get_vlc2(gb, ff_dc_lum_vlc.table, DC_VLC_BITS, 2); + code = get_vlc2(gb, ff_dc_lum_vlc, DC_VLC_BITS, 2); } else { - code = get_vlc2(gb, ff_dc_chroma_vlc.table, DC_VLC_BITS, 2); + code = get_vlc2(gb, ff_dc_chroma_vlc, DC_VLC_BITS, 2); } if (code == 0) { diff = 0; diff --git a/libavcodec/mpeg12vlc.h b/libavcodec/mpeg12vlc.h index 3ed35968f6..53f53947c3 100644 --- a/libavcodec/mpeg12vlc.h +++ b/libavcodec/mpeg12vlc.h @@ -39,13 +39,13 @@ #define MB_PTYPE_VLC_BITS 6 #define MB_BTYPE_VLC_BITS 6 -extern VLC ff_dc_lum_vlc; -extern VLC ff_dc_chroma_vlc; -extern VLC ff_mbincr_vlc; -extern VLC ff_mb_ptype_vlc; -extern VLC ff_mb_btype_vlc; -extern VLC ff_mb_pat_vlc; -extern VLC ff_mv_vlc; +extern VLCElem ff_dc_lum_vlc[]; +extern VLCElem ff_dc_chroma_vlc[]; +extern VLCElem ff_mbincr_vlc[]; +extern VLCElem ff_mb_ptype_vlc[]; +extern VLCElem ff_mb_btype_vlc[]; +extern VLCElem ff_mb_pat_vlc[]; +extern VLCElem ff_mv_vlc[]; void ff_mpeg12_init_vlcs(void);

1 0

avcodec/mpegaudiodec_common: Avoid superfluous VLC structures
by Andreas Rheinhardt 31 Oct '23

31 Oct '23

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Tue Sep 26 18:36:38 2023 +0200| [c9aa80c313911b9ac44ab8099bdcc612796c6b90] | committer: Andreas Rheinhardt avcodec/mpegaudiodec_common: Avoid superfluous VLC structures For some VLCs here, the number of bits of the VLC is write-only, because it is hardcoded at the call site. Therefore one can replace these VLC structures with the only thing that is actually used: The pointer to the VLCElem table. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c9aa80c313911b9ac… --- libavcodec/mpegaudiodata.h | 2 +- libavcodec/mpegaudiodec_common.c | 16 +++++++--------- libavcodec/mpegaudiodec_template.c | 5 +++-- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/libavcodec/mpegaudiodata.h b/libavcodec/mpegaudiodata.h index a4148a1ffe..fbad67a0b3 100644 --- a/libavcodec/mpegaudiodata.h +++ b/libavcodec/mpegaudiodata.h @@ -53,7 +53,7 @@ extern uint32_t ff_table_4_3_value[TABLE_4_3_SIZE]; #endif /* VLCs for decoding layer 3 huffman tables */ -extern VLC ff_huff_vlc[16]; +extern const VLCElem *ff_huff_vlc[16]; extern VLC ff_huff_quad_vlc[2]; /* layer3 scale factor size */ diff --git a/libavcodec/mpegaudiodec_common.c b/libavcodec/mpegaudiodec_common.c index 3a60b03e9e..6446d08967 100644 --- a/libavcodec/mpegaudiodec_common.c +++ b/libavcodec/mpegaudiodec_common.c @@ -64,7 +64,7 @@ const uint8_t ff_lsf_nsf_table[6][3][4] = { }; /* mpegaudio layer 3 huffman tables */ -VLC ff_huff_vlc[16]; +const VLCElem *ff_huff_vlc[16]; static VLCElem huff_vlc_tables[128 + 128 + 128 + 130 + 128 + 154 + 166 + 142 + 204 + 190 + 170 + 542 + 460 + 662 + 414]; VLC ff_huff_quad_vlc[2]; @@ -401,6 +401,7 @@ const uint8_t ff_mpa_pretab[2][22] = { static av_cold void mpegaudiodec_common_init_static(void) { + VLCInitState state = VLC_INIT_STATE(huff_vlc_tables); const uint8_t *huff_sym = mpa_huffsymbols, *huff_lens = mpa_hufflens; int offset; @@ -414,7 +415,6 @@ static av_cold void mpegaudiodec_common_init_static(void) } /* huffman decode tables */ - offset = 0; for (int i = 0; i < 15;) { uint16_t tmp_symbols[256]; int nb_codes_minus_one = mpa_huff_sizes_minus_one[i]; @@ -426,16 +426,14 @@ static av_cold void mpegaudiodec_common_init_static(void) tmp_symbols[j] = high << 1 | ((high && low) << 4) | low; } - ff_huff_vlc[++i].table = huff_vlc_tables + offset; - ff_huff_vlc[i].table_allocated = FF_ARRAY_ELEMS(huff_vlc_tables) - offset; - ff_vlc_init_from_lengths(&ff_huff_vlc[i], 7, j, - huff_lens, 1, tmp_symbols, 2, 2, - 0, VLC_INIT_STATIC_OVERLONG, NULL); - offset += ff_huff_vlc[i].table_size; + ff_huff_vlc[++i] = ff_vlc_init_tables_from_lengths(&state, 7, j, + huff_lens, 1, + tmp_symbols, 2, 2, + 0, 0); huff_lens += j; huff_sym += j; } - av_assert0(offset == FF_ARRAY_ELEMS(huff_vlc_tables)); + av_assert1(state.size == 0); offset = 0; for (int i = 0; i < 2; i++) { diff --git a/libavcodec/mpegaudiodec_template.c b/libavcodec/mpegaudiodec_template.c index 3e4ee79be6..c227604107 100644 --- a/libavcodec/mpegaudiodec_template.c +++ b/libavcodec/mpegaudiodec_template.c @@ -760,6 +760,7 @@ static int huffman_decode(MPADecodeContext *s, GranuleDef *g, /* low frequencies (called big values) */ s_index = 0; for (i = 0; i < 3; i++) { + const VLCElem *vlctab; int j, k, l, linbits; j = g->region_size[i]; if (j == 0) @@ -768,13 +769,13 @@ static int huffman_decode(MPADecodeContext *s, GranuleDef *g, k = g->table_select[i]; l = ff_mpa_huff_data[k][0]; linbits = ff_mpa_huff_data[k][1]; - vlc = &ff_huff_vlc[l]; if (!l) { memset(&g->sb_hybrid[s_index], 0, sizeof(*g->sb_hybrid) * 2 * j); s_index += 2 * j; continue; } + vlctab = ff_huff_vlc[l]; /* read huffcode and compute each couple */ for (; j > 0; j--) { @@ -787,7 +788,7 @@ static int huffman_decode(MPADecodeContext *s, GranuleDef *g, if (pos >= end_pos) break; } - y = get_vlc2(&s->gb, vlc->table, 7, 3); + y = get_vlc2(&s->gb, vlctab, 7, 3); if (!y) { g->sb_hybrid[s_index ] =

1 0

avcodec/aacps_common: Apply offset for VLCs during init
by Andreas Rheinhardt 31 Oct '23

31 Oct '23

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Tue Sep 26 18:19:57 2023 +0200| [5dc31bc67b2de29045b437037ba6a8fd81f1696c] | committer: Andreas Rheinhardt avcodec/aacps_common: Apply offset for VLCs during init This avoids having to apply it later after every get_vlc2(). Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5dc31bc67b2de2904… --- libavcodec/aacps_common.c | 14 +++++++------- libavcodec/aacpsdata.c | 6 +++--- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/libavcodec/aacps_common.c b/libavcodec/aacps_common.c index 7a83cbd7d6..74fa005aaf 100644 --- a/libavcodec/aacps_common.c +++ b/libavcodec/aacps_common.c @@ -60,7 +60,7 @@ static const int huff_iid[] = { static const VLCElem *vlc_ps[10]; -#define READ_PAR_DATA(PAR, OFFSET, MASK, ERR_CONDITION, NB_BITS, MAX_DEPTH) \ +#define READ_PAR_DATA(PAR, MASK, ERR_CONDITION, NB_BITS, MAX_DEPTH) \ /** \ * Read Inter-channel Intensity Difference/Inter-Channel Coherence/ \ * Inter-channel Phase Difference/Overall Phase Difference parameters from the \ @@ -82,7 +82,7 @@ static int read_ ## PAR ## _data(void *logctx, GetBitContext *gb, PSCommonContex int e_prev = e ? e - 1 : ps->num_env_old - 1; \ e_prev = FFMAX(e_prev, 0); \ for (b = 0; b < num; b++) { \ - int val = PAR[e_prev][b] + get_vlc2(gb, vlc_table, NB_BITS, MAX_DEPTH) - OFFSET; \ + int val = PAR[e_prev][b] + get_vlc2(gb, vlc_table, NB_BITS, MAX_DEPTH); \ if (MASK) val &= MASK; \ PAR[e][b] = val; \ if (ERR_CONDITION) \ @@ -91,7 +91,7 @@ static int read_ ## PAR ## _data(void *logctx, GetBitContext *gb, PSCommonContex } else { \ int val = 0; \ for (b = 0; b < num; b++) { \ - val += get_vlc2(gb, vlc_table, NB_BITS, MAX_DEPTH) - OFFSET; \ + val += get_vlc2(gb, vlc_table, NB_BITS, MAX_DEPTH); \ if (MASK) val &= MASK; \ PAR[e][b] = val; \ if (ERR_CONDITION) \ @@ -104,9 +104,9 @@ err: \ return AVERROR_INVALIDDATA; \ } -READ_PAR_DATA(iid, huff_offset[table_idx], 0, FFABS(ps->iid_par[e][b]) > 7 + 8 * ps->iid_quant, 9, 3) -READ_PAR_DATA(icc, huff_offset[table_idx], 0, ps->icc_par[e][b] > 7U, 9, 2) -READ_PAR_DATA(ipdopd, 0, 0x07, 0, 5, 1) +READ_PAR_DATA(iid, 0, FFABS(ps->iid_par[e][b]) > 7 + 8 * ps->iid_quant, 9, 3) +READ_PAR_DATA(icc, 0, ps->icc_par[e][b] > 7U, 9, 2) +READ_PAR_DATA(ipdopd, 0x07, 0, 5, 1) static int ps_read_extension_data(GetBitContext *gb, PSCommonContext *ps, int ps_extension_id) @@ -300,7 +300,7 @@ av_cold void ff_ps_init_common(void) ff_vlc_init_tables_from_lengths(&state, i <= 5 ? 9 : 5, huff_sizes[i], &tab[0][1], 2, &tab[0][0], 2, 1, - 0, 0); + huff_offset[i], 0); tab += huff_sizes[i]; } } diff --git a/libavcodec/aacpsdata.c b/libavcodec/aacpsdata.c index 6885b386c0..8c79a154e2 100644 --- a/libavcodec/aacpsdata.c +++ b/libavcodec/aacpsdata.c @@ -89,9 +89,9 @@ static const uint8_t aacps_huff_tabs[][2] = { }; static const int8_t huff_offset[] = { - 30, 30, - 14, 14, - 7, 7, + -30, -30, + -14, -14, + -7, -7, 0, 0, 0, 0, };

1 0

avcodec/aacps_common: Combine huffman tabels
by Andreas Rheinhardt 31 Oct '23

31 Oct '23

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Tue Sep 26 18:14:21 2023 +0200| [40a8cb9e6cdb3d05f5f984ab961a4b077185f8fe] | committer: Andreas Rheinhardt avcodec/aacps_common: Combine huffman tabels This allows to avoid the relocations inherent in an array to individual tables; it also reduces padding. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=40a8cb9e6cdb3d05f… --- libavcodec/aacps_common.c | 27 +++++---------------------- libavcodec/aacpsdata.c | 31 +++---------------------------- 2 files changed, 8 insertions(+), 50 deletions(-) diff --git a/libavcodec/aacps_common.c b/libavcodec/aacps_common.c index 653fc38da3..7a83cbd7d6 100644 --- a/libavcodec/aacps_common.c +++ b/libavcodec/aacps_common.c @@ -288,36 +288,19 @@ err: return bits_left; } -#define PS_VLC_ROW(name) \ - { name ## _tab, FF_ARRAY_ELEMS(name ## _tab) } - av_cold void ff_ps_init_common(void) { static VLCElem vlc_buf[(1544 + 832 + 1024 + 1036) + (544 + 544) + (32 + 32 + 32 + 32)]; VLCInitState state = VLC_INIT_STATE(vlc_buf); - // Syntax initialization - static const struct { - const uint8_t (*vlc_tab)[2]; - const unsigned int table_elems; - } ps_tmp[] = { - PS_VLC_ROW(huff_iid_df1), - PS_VLC_ROW(huff_iid_dt1), - PS_VLC_ROW(huff_iid_df0), - PS_VLC_ROW(huff_iid_dt0), - PS_VLC_ROW(huff_icc_df), - PS_VLC_ROW(huff_icc_dt), - PS_VLC_ROW(huff_ipd_df), - PS_VLC_ROW(huff_ipd_dt), - PS_VLC_ROW(huff_opd_df), - PS_VLC_ROW(huff_opd_dt), - }; + const uint8_t (*tab)[2] = aacps_huff_tabs; for (int i = 0; i < FF_ARRAY_ELEMS(vlc_ps); i++) { vlc_ps[i] = - ff_vlc_init_tables_from_lengths(&state, i <= 5 ? 9 : 5, ps_tmp[i].table_elems, - &ps_tmp[i].vlc_tab[0][1], 2, - &ps_tmp[i].vlc_tab[0][0], 2, 1, + ff_vlc_init_tables_from_lengths(&state, i <= 5 ? 9 : 5, huff_sizes[i], + &tab[0][1], 2, + &tab[0][0], 2, 1, 0, 0); + tab += huff_sizes[i]; } } diff --git a/libavcodec/aacpsdata.c b/libavcodec/aacpsdata.c index 8241346b0d..6885b386c0 100644 --- a/libavcodec/aacpsdata.c +++ b/libavcodec/aacpsdata.c @@ -21,7 +21,9 @@ #include <stdint.h> -static const uint8_t huff_iid_df1_tab[][2] = { +static const uint8_t huff_sizes[] = { 61, 61, 29, 29, 15, 15, 8, 8, 8, 8 }; + +static const uint8_t aacps_huff_tabs[][2] = { /* huff_iid_df1 - 61 entries */ { 28, 4 }, { 32, 4 }, { 29, 3 }, { 31, 3 }, { 27, 5 }, { 33, 5 }, { 26, 6 }, { 34, 6 }, { 25, 7 }, { 35, 7 }, @@ -36,9 +38,6 @@ static const uint8_t huff_iid_df1_tab[][2] = { { 57, 18 }, { 58, 18 }, { 0, 18 }, { 1, 18 }, { 10, 18 }, { 50, 18 }, { 14, 16 }, { 46, 16 }, { 20, 12 }, { 23, 10 }, { 30, 1 }, -}; - -static const uint8_t huff_iid_dt1_tab[][2] = { /* huff_iid_dt1 - 61 entries */ { 31, 2 }, { 26, 7 }, { 34, 7 }, { 27, 6 }, { 33, 6 }, { 35, 8 }, { 24, 9 }, { 36, 9 }, { 39, 11 }, { 41, 12 }, @@ -53,9 +52,6 @@ static const uint8_t huff_iid_dt1_tab[][2] = { { 14, 15 }, { 46, 15 }, { 50, 16 }, { 51, 16 }, { 19, 13 }, { 21, 12 }, { 25, 9 }, { 28, 5 }, { 32, 5 }, { 29, 3 }, { 30, 1 }, -}; - -static const uint8_t huff_iid_df0_tab[][2] = { /* huff_iid_df0 - 29 entries */ { 14, 1 }, { 15, 3 }, { 13, 3 }, { 16, 4 }, { 12, 4 }, { 17, 5 }, { 11, 5 }, { 10, 6 }, { 18, 6 }, { 19, 6 }, @@ -63,9 +59,6 @@ static const uint8_t huff_iid_df0_tab[][2] = { { 22, 13 }, { 6, 13 }, { 23, 14 }, { 24, 14 }, { 5, 15 }, { 25, 15 }, { 4, 16 }, { 3, 17 }, { 0, 17 }, { 1, 17 }, { 2, 17 }, { 26, 17 }, { 27, 18 }, { 28, 18 }, -}; - -static const uint8_t huff_iid_dt0_tab[][2] = { /* huff_iid_dt0 - 29 entries */ { 14, 1 }, { 13, 2 }, { 15, 3 }, { 12, 4 }, { 16, 5 }, { 11, 6 }, { 17, 7 }, { 10, 8 }, { 18, 9 }, { 9, 10 }, @@ -73,41 +66,23 @@ static const uint8_t huff_iid_dt0_tab[][2] = { { 22, 17 }, { 6, 17 }, { 23, 19 }, { 0, 19 }, { 1, 19 }, { 2, 19 }, { 3, 20 }, { 4, 20 }, { 5, 20 }, { 24, 20 }, { 25, 20 }, { 26, 20 }, { 27, 20 }, { 28, 20 }, -}; - -static const uint8_t huff_icc_df_tab[][2] = { /* huff_icc_df - 15 entries */ { 7, 1 }, { 8, 2 }, { 6, 3 }, { 9, 4 }, { 5, 5 }, { 10, 6 }, { 4, 7 }, { 11, 8 }, { 12, 9 }, { 3, 10 }, { 13, 11 }, { 2, 12 }, { 14, 13 }, { 1, 14 }, { 0, 14 }, -}; - -static const uint8_t huff_icc_dt_tab[][2] = { /* huff_icc_dt - 15 entries */ { 7, 1 }, { 8, 2 }, { 6, 3 }, { 9, 4 }, { 5, 5 }, { 10, 6 }, { 4, 7 }, { 11, 8 }, { 3, 9 }, { 12, 10 }, { 2, 11 }, { 13, 12 }, { 1, 13 }, { 0, 14 }, { 14, 14 }, -}; - -static const uint8_t huff_ipd_df_tab[][2] = { /* huff_ipd_df - 8 entries */ { 1, 3 }, { 4, 4 }, { 5, 4 }, { 3, 4 }, { 6, 4 }, { 2, 4 }, { 7, 4 }, { 0, 1 }, -}; - -static const uint8_t huff_ipd_dt_tab[][2] = { /* huff_ipd_dt - 8 entries */ { 5, 4 }, { 4, 5 }, { 3, 5 }, { 2, 4 }, { 6, 4 }, { 1, 3 }, { 7, 3 }, { 0, 1 }, -}; - -static const uint8_t huff_opd_df_tab[][2] = { /* huff_opd_df - 8 entries */ { 7, 3 }, { 1, 3 }, { 3, 4 }, { 6, 4 }, { 2, 4 }, { 5, 5 }, { 4, 5 }, { 0, 1 }, -}; - -static const uint8_t huff_opd_dt_tab[][2] = { /* huff_opd_dt - 8 entries */ { 5, 4 }, { 2, 4 }, { 6, 4 }, { 4, 5 }, { 3, 5 }, { 1, 3 }, { 7, 3 }, { 0, 1 },

1 0

avcodec/aacps_common: Switch to ff_vlc_init_tables_from_lengths()
by Andreas Rheinhardt 31 Oct '23

31 Oct '23

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Tue Sep 26 17:40:24 2023 +0200| [774611a349f687ba2cd26cc1e3c11eaa38aab484] | committer: Andreas Rheinhardt avcodec/aacps_common: Switch to ff_vlc_init_tables_from_lengths() It allows to replace codes of type uint16_t or uint32_t by symbols of type uint8_t. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=774611a349f687ba2… --- libavcodec/aacps_common.c | 28 +++---- libavcodec/aacpsdata.c | 204 +++++++++++++++++++++------------------------- 2 files changed, 102 insertions(+), 130 deletions(-) diff --git a/libavcodec/aacps_common.c b/libavcodec/aacps_common.c index 281eaa12e7..653fc38da3 100644 --- a/libavcodec/aacps_common.c +++ b/libavcodec/aacps_common.c @@ -288,13 +288,8 @@ err: return bits_left; } -#define PS_INIT_VLC_STATIC(num, nb_bits, size) \ - vlc_ps[num] = ff_vlc_init_tables(&state, nb_bits, ps_tmp[num].table_size / ps_tmp[num].elem_size, \ - ps_tmp[num].ps_bits, 1, 1, \ - ps_tmp[num].ps_codes, ps_tmp[num].elem_size, ps_tmp[num].elem_size, 0); - #define PS_VLC_ROW(name) \ - { name ## _codes, name ## _bits, sizeof(name ## _codes), sizeof(name ## _codes[0]) } + { name ## _tab, FF_ARRAY_ELEMS(name ## _tab) } av_cold void ff_ps_init_common(void) { @@ -303,8 +298,8 @@ av_cold void ff_ps_init_common(void) VLCInitState state = VLC_INIT_STATE(vlc_buf); // Syntax initialization static const struct { - const void *ps_codes, *ps_bits; - const unsigned int table_size, elem_size; + const uint8_t (*vlc_tab)[2]; + const unsigned int table_elems; } ps_tmp[] = { PS_VLC_ROW(huff_iid_df1), PS_VLC_ROW(huff_iid_dt1), @@ -318,14 +313,11 @@ av_cold void ff_ps_init_common(void) PS_VLC_ROW(huff_opd_dt), }; - PS_INIT_VLC_STATIC(0, 9, 1544); - PS_INIT_VLC_STATIC(1, 9, 832); - PS_INIT_VLC_STATIC(2, 9, 1024); - PS_INIT_VLC_STATIC(3, 9, 1036); - PS_INIT_VLC_STATIC(4, 9, 544); - PS_INIT_VLC_STATIC(5, 9, 544); - PS_INIT_VLC_STATIC(6, 5, 32); - PS_INIT_VLC_STATIC(7, 5, 32); - PS_INIT_VLC_STATIC(8, 5, 32); - PS_INIT_VLC_STATIC(9, 5, 32); + for (int i = 0; i < FF_ARRAY_ELEMS(vlc_ps); i++) { + vlc_ps[i] = + ff_vlc_init_tables_from_lengths(&state, i <= 5 ? 9 : 5, ps_tmp[i].table_elems, + &ps_tmp[i].vlc_tab[0][1], 2, + &ps_tmp[i].vlc_tab[0][0], 2, 1, + 0, 0); + } } diff --git a/libavcodec/aacpsdata.c b/libavcodec/aacpsdata.c index 7a1f490060..8241346b0d 100644 --- a/libavcodec/aacpsdata.c +++ b/libavcodec/aacpsdata.c @@ -19,118 +19,98 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -static const uint8_t huff_iid_df1_bits[] = { - 18, 18, 18, 18, 18, 18, 18, 18, 18, 17, 18, 17, 17, 16, 16, 15, 14, 14, - 13, 12, 12, 11, 10, 10, 8, 7, 6, 5, 4, 3, 1, 3, 4, 5, 6, 7, - 8, 9, 10, 11, 11, 12, 13, 14, 14, 15, 16, 16, 17, 17, 18, 17, 18, 18, - 18, 18, 18, 18, 18, 18, 18, -}; - -static const uint32_t huff_iid_df1_codes[] = { - 0x01FEB4, 0x01FEB5, 0x01FD76, 0x01FD77, 0x01FD74, 0x01FD75, 0x01FE8A, - 0x01FE8B, 0x01FE88, 0x00FE80, 0x01FEB6, 0x00FE82, 0x00FEB8, 0x007F42, - 0x007FAE, 0x003FAF, 0x001FD1, 0x001FE9, 0x000FE9, 0x0007EA, 0x0007FB, - 0x0003FB, 0x0001FB, 0x0001FF, 0x00007C, 0x00003C, 0x00001C, 0x00000C, - 0x000000, 0x000001, 0x000001, 0x000002, 0x000001, 0x00000D, 0x00001D, - 0x00003D, 0x00007D, 0x0000FC, 0x0001FC, 0x0003FC, 0x0003F4, 0x0007EB, - 0x000FEA, 0x001FEA, 0x001FD6, 0x003FD0, 0x007FAF, 0x007F43, 0x00FEB9, - 0x00FE83, 0x01FEB7, 0x00FE81, 0x01FE89, 0x01FE8E, 0x01FE8F, 0x01FE8C, - 0x01FE8D, 0x01FEB2, 0x01FEB3, 0x01FEB0, 0x01FEB1, -}; - -static const uint8_t huff_iid_dt1_bits[] = { - 16, 16, 16, 16, 16, 16, 16, 16, 16, 15, 15, 15, 15, 15, 15, 14, 14, 13, - 13, 13, 12, 12, 11, 10, 9, 9, 7, 6, 5, 3, 1, 2, 5, 6, 7, 8, - 9, 10, 11, 11, 12, 12, 13, 13, 14, 14, 15, 15, 15, 15, 16, 16, 16, 16, - 16, 16, 16, 16, 16, 16, 16, -}; - -static const uint16_t huff_iid_dt1_codes[] = { - 0x004ED4, 0x004ED5, 0x004ECE, 0x004ECF, 0x004ECC, 0x004ED6, 0x004ED8, - 0x004F46, 0x004F60, 0x002718, 0x002719, 0x002764, 0x002765, 0x00276D, - 0x0027B1, 0x0013B7, 0x0013D6, 0x0009C7, 0x0009E9, 0x0009ED, 0x0004EE, - 0x0004F7, 0x000278, 0x000139, 0x00009A, 0x00009F, 0x000020, 0x000011, - 0x00000A, 0x000003, 0x000001, 0x000000, 0x00000B, 0x000012, 0x000021, - 0x00004C, 0x00009B, 0x00013A, 0x000279, 0x000270, 0x0004EF, 0x0004E2, - 0x0009EA, 0x0009D8, 0x0013D7, 0x0013D0, 0x0027B2, 0x0027A2, 0x00271A, - 0x00271B, 0x004F66, 0x004F67, 0x004F61, 0x004F47, 0x004ED9, 0x004ED7, - 0x004ECD, 0x004ED2, 0x004ED3, 0x004ED0, 0x004ED1, -}; - -static const uint8_t huff_iid_df0_bits[] = { - 17, 17, 17, 17, 16, 15, 13, 10, 9, 7, 6, 5, 4, 3, 1, 3, 4, 5, - 6, 6, 8, 11, 13, 14, 14, 15, 17, 18, 18, -}; - -static const uint32_t huff_iid_df0_codes[] = { - 0x01FFFB, 0x01FFFC, 0x01FFFD, 0x01FFFA, 0x00FFFC, 0x007FFC, 0x001FFD, - 0x0003FE, 0x0001FE, 0x00007E, 0x00003C, 0x00001D, 0x00000D, 0x000005, - 0x000000, 0x000004, 0x00000C, 0x00001C, 0x00003D, 0x00003E, 0x0000FE, - 0x0007FE, 0x001FFC, 0x003FFC, 0x003FFD, 0x007FFD, 0x01FFFE, 0x03FFFE, - 0x03FFFF, -}; - -static const uint8_t huff_iid_dt0_bits[] = { - 19, 19, 19, 20, 20, 20, 17, 15, 12, 10, 8, 6, 4, 2, 1, 3, 5, 7, - 9, 11, 13, 14, 17, 19, 20, 20, 20, 20, 20, -}; - -static const uint32_t huff_iid_dt0_codes[] = { - 0x07FFF9, 0x07FFFA, 0x07FFFB, 0x0FFFF8, 0x0FFFF9, 0x0FFFFA, 0x01FFFD, - 0x007FFE, 0x000FFE, 0x0003FE, 0x0000FE, 0x00003E, 0x00000E, 0x000002, - 0x000000, 0x000006, 0x00001E, 0x00007E, 0x0001FE, 0x0007FE, 0x001FFE, - 0x003FFE, 0x01FFFC, 0x07FFF8, 0x0FFFFB, 0x0FFFFC, 0x0FFFFD, 0x0FFFFE, - 0x0FFFFF, -}; - -static const uint8_t huff_icc_df_bits[] = { - 14, 14, 12, 10, 7, 5, 3, 1, 2, 4, 6, 8, 9, 11, 13, -}; - -static const uint16_t huff_icc_df_codes[] = { - 0x3FFF, 0x3FFE, 0x0FFE, 0x03FE, 0x007E, 0x001E, 0x0006, 0x0000, - 0x0002, 0x000E, 0x003E, 0x00FE, 0x01FE, 0x07FE, 0x1FFE, -}; - -static const uint8_t huff_icc_dt_bits[] = { - 14, 13, 11, 9, 7, 5, 3, 1, 2, 4, 6, 8, 10, 12, 14, -}; - -static const uint16_t huff_icc_dt_codes[] = { - 0x3FFE, 0x1FFE, 0x07FE, 0x01FE, 0x007E, 0x001E, 0x0006, 0x0000, - 0x0002, 0x000E, 0x003E, 0x00FE, 0x03FE, 0x0FFE, 0x3FFF, -}; - -static const uint8_t huff_ipd_df_bits[] = { - 1, 3, 4, 4, 4, 4, 4, 4, -}; - -static const uint8_t huff_ipd_df_codes[] = { - 0x01, 0x00, 0x06, 0x04, 0x02, 0x03, 0x05, 0x07, -}; - -static const uint8_t huff_ipd_dt_bits[] = { - 1, 3, 4, 5, 5, 4, 4, 3, -}; - -static const uint8_t huff_ipd_dt_codes[] = { - 0x01, 0x02, 0x02, 0x03, 0x02, 0x00, 0x03, 0x03, -}; - -static const uint8_t huff_opd_df_bits[] = { - 1, 3, 4, 4, 5, 5, 4, 3, -}; - -static const uint8_t huff_opd_df_codes[] = { - 0x01, 0x01, 0x06, 0x04, 0x0F, 0x0E, 0x05, 0x00, -}; - -static const uint8_t huff_opd_dt_bits[] = { - 1, 3, 4, 5, 5, 4, 4, 3, -}; - -static const uint8_t huff_opd_dt_codes[] = { - 0x01, 0x02, 0x01, 0x07, 0x06, 0x00, 0x02, 0x03, +#include <stdint.h> + +static const uint8_t huff_iid_df1_tab[][2] = { + /* huff_iid_df1 - 61 entries */ + { 28, 4 }, { 32, 4 }, { 29, 3 }, { 31, 3 }, { 27, 5 }, + { 33, 5 }, { 26, 6 }, { 34, 6 }, { 25, 7 }, { 35, 7 }, + { 24, 8 }, { 36, 8 }, { 37, 9 }, { 40, 11 }, { 19, 12 }, + { 41, 12 }, { 22, 10 }, { 38, 10 }, { 9, 17 }, { 51, 17 }, + { 11, 17 }, { 49, 17 }, { 13, 16 }, { 47, 16 }, { 16, 14 }, + { 18, 13 }, { 42, 13 }, { 44, 14 }, { 12, 17 }, { 48, 17 }, + { 4, 18 }, { 5, 18 }, { 2, 18 }, { 3, 18 }, { 15, 15 }, + { 21, 11 }, { 39, 11 }, { 45, 15 }, { 8, 18 }, { 52, 18 }, + { 6, 18 }, { 7, 18 }, { 55, 18 }, { 56, 18 }, { 53, 18 }, + { 54, 18 }, { 17, 14 }, { 43, 14 }, { 59, 18 }, { 60, 18 }, + { 57, 18 }, { 58, 18 }, { 0, 18 }, { 1, 18 }, { 10, 18 }, + { 50, 18 }, { 14, 16 }, { 46, 16 }, { 20, 12 }, { 23, 10 }, + { 30, 1 }, +}; + +static const uint8_t huff_iid_dt1_tab[][2] = { + /* huff_iid_dt1 - 61 entries */ + { 31, 2 }, { 26, 7 }, { 34, 7 }, { 27, 6 }, { 33, 6 }, + { 35, 8 }, { 24, 9 }, { 36, 9 }, { 39, 11 }, { 41, 12 }, + { 9, 15 }, { 10, 15 }, { 48, 15 }, { 49, 15 }, { 17, 13 }, + { 23, 10 }, { 37, 10 }, { 43, 13 }, { 11, 15 }, { 12, 15 }, + { 4, 16 }, { 56, 16 }, { 2, 16 }, { 3, 16 }, { 59, 16 }, + { 60, 16 }, { 57, 16 }, { 58, 16 }, { 0, 16 }, { 1, 16 }, + { 5, 16 }, { 55, 16 }, { 6, 16 }, { 54, 16 }, { 13, 15 }, + { 15, 14 }, { 20, 12 }, { 40, 12 }, { 22, 11 }, { 38, 11 }, + { 45, 14 }, { 47, 15 }, { 7, 16 }, { 53, 16 }, { 18, 13 }, + { 42, 13 }, { 16, 14 }, { 44, 14 }, { 8, 16 }, { 52, 16 }, + { 14, 15 }, { 46, 15 }, { 50, 16 }, { 51, 16 }, { 19, 13 }, + { 21, 12 }, { 25, 9 }, { 28, 5 }, { 32, 5 }, { 29, 3 }, + { 30, 1 }, +}; + +static const uint8_t huff_iid_df0_tab[][2] = { + /* huff_iid_df0 - 29 entries */ + { 14, 1 }, { 15, 3 }, { 13, 3 }, { 16, 4 }, { 12, 4 }, + { 17, 5 }, { 11, 5 }, { 10, 6 }, { 18, 6 }, { 19, 6 }, + { 9, 7 }, { 20, 8 }, { 8, 9 }, { 7, 10 }, { 21, 11 }, + { 22, 13 }, { 6, 13 }, { 23, 14 }, { 24, 14 }, { 5, 15 }, + { 25, 15 }, { 4, 16 }, { 3, 17 }, { 0, 17 }, { 1, 17 }, + { 2, 17 }, { 26, 17 }, { 27, 18 }, { 28, 18 }, +}; + +static const uint8_t huff_iid_dt0_tab[][2] = { + /* huff_iid_dt0 - 29 entries */ + { 14, 1 }, { 13, 2 }, { 15, 3 }, { 12, 4 }, { 16, 5 }, + { 11, 6 }, { 17, 7 }, { 10, 8 }, { 18, 9 }, { 9, 10 }, + { 19, 11 }, { 8, 12 }, { 20, 13 }, { 21, 14 }, { 7, 15 }, + { 22, 17 }, { 6, 17 }, { 23, 19 }, { 0, 19 }, { 1, 19 }, + { 2, 19 }, { 3, 20 }, { 4, 20 }, { 5, 20 }, { 24, 20 }, + { 25, 20 }, { 26, 20 }, { 27, 20 }, { 28, 20 }, +}; + +static const uint8_t huff_icc_df_tab[][2] = { + /* huff_icc_df - 15 entries */ + { 7, 1 }, { 8, 2 }, { 6, 3 }, { 9, 4 }, { 5, 5 }, + { 10, 6 }, { 4, 7 }, { 11, 8 }, { 12, 9 }, { 3, 10 }, + { 13, 11 }, { 2, 12 }, { 14, 13 }, { 1, 14 }, { 0, 14 }, +}; + +static const uint8_t huff_icc_dt_tab[][2] = { + /* huff_icc_dt - 15 entries */ + { 7, 1 }, { 8, 2 }, { 6, 3 }, { 9, 4 }, { 5, 5 }, + { 10, 6 }, { 4, 7 }, { 11, 8 }, { 3, 9 }, { 12, 10 }, + { 2, 11 }, { 13, 12 }, { 1, 13 }, { 0, 14 }, { 14, 14 }, +}; + +static const uint8_t huff_ipd_df_tab[][2] = { + /* huff_ipd_df - 8 entries */ + { 1, 3 }, { 4, 4 }, { 5, 4 }, { 3, 4 }, { 6, 4 }, + { 2, 4 }, { 7, 4 }, { 0, 1 }, +}; + +static const uint8_t huff_ipd_dt_tab[][2] = { + /* huff_ipd_dt - 8 entries */ + { 5, 4 }, { 4, 5 }, { 3, 5 }, { 2, 4 }, { 6, 4 }, + { 1, 3 }, { 7, 3 }, { 0, 1 }, +}; + +static const uint8_t huff_opd_df_tab[][2] = { + /* huff_opd_df - 8 entries */ + { 7, 3 }, { 1, 3 }, { 3, 4 }, { 6, 4 }, { 2, 4 }, + { 5, 5 }, { 4, 5 }, { 0, 1 }, +}; + +static const uint8_t huff_opd_dt_tab[][2] = { + /* huff_opd_dt - 8 entries */ + { 5, 4 }, { 2, 4 }, { 6, 4 }, { 4, 5 }, { 3, 5 }, + { 1, 3 }, { 7, 3 }, { 0, 1 }, }; static const int8_t huff_offset[] = {

1 0

avcodec/aacps_common: Avoid superfluous VLC structures
by Andreas Rheinhardt 31 Oct '23

31 Oct '23

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Tue Sep 26 18:01:07 2023 +0200| [eb422c606aac55429cc50fb7f3a4534c4e8f3906] | committer: Andreas Rheinhardt avcodec/aacps_common: Avoid superfluous VLC structures For all VLCs here, the number of bits of the VLC is write-only, because it is hardcoded at the call site. Therefore one can replace these VLC structures with the only thing that is actually used: The pointer to the VLCElem table. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=eb422c606aac55429… --- libavcodec/aacps_common.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/libavcodec/aacps_common.c b/libavcodec/aacps_common.c index 6b5493d4c2..281eaa12e7 100644 --- a/libavcodec/aacps_common.c +++ b/libavcodec/aacps_common.c @@ -58,7 +58,7 @@ static const int huff_iid[] = { huff_iid_dt1, }; -static VLC vlc_ps[10]; +static const VLCElem *vlc_ps[10]; #define READ_PAR_DATA(PAR, OFFSET, MASK, ERR_CONDITION, NB_BITS, MAX_DEPTH) \ /** \ @@ -77,7 +77,7 @@ static int read_ ## PAR ## _data(void *logctx, GetBitContext *gb, PSCommonContex int8_t (*PAR)[PS_MAX_NR_IIDICC], int table_idx, int e, int dt) \ { \ int b, num = ps->nr_ ## PAR ## _par; \ - const VLCElem *vlc_table = vlc_ps[table_idx].table; \ + const VLCElem *vlc_table = vlc_ps[table_idx]; \ if (dt) { \ int e_prev = e ? e - 1 : ps->num_env_old - 1; \ e_prev = FFMAX(e_prev, 0); \ @@ -289,16 +289,18 @@ err: } #define PS_INIT_VLC_STATIC(num, nb_bits, size) \ - VLC_INIT_STATIC(&vlc_ps[num], nb_bits, ps_tmp[num].table_size / ps_tmp[num].elem_size, \ - ps_tmp[num].ps_bits, 1, 1, \ - ps_tmp[num].ps_codes, ps_tmp[num].elem_size, ps_tmp[num].elem_size, \ - size); + vlc_ps[num] = ff_vlc_init_tables(&state, nb_bits, ps_tmp[num].table_size / ps_tmp[num].elem_size, \ + ps_tmp[num].ps_bits, 1, 1, \ + ps_tmp[num].ps_codes, ps_tmp[num].elem_size, ps_tmp[num].elem_size, 0); #define PS_VLC_ROW(name) \ { name ## _codes, name ## _bits, sizeof(name ## _codes), sizeof(name ## _codes[0]) } av_cold void ff_ps_init_common(void) { + static VLCElem vlc_buf[(1544 + 832 + 1024 + 1036) + + (544 + 544) + (32 + 32 + 32 + 32)]; + VLCInitState state = VLC_INIT_STATE(vlc_buf); // Syntax initialization static const struct { const void *ps_codes, *ps_bits;

1 0

avcodec/aacps: Move initializing common stuff to aacdec_common.c
by Andreas Rheinhardt 31 Oct '23

31 Oct '23

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Mon Sep 25 01:46:50 2023 +0200| [4fe91e3676a1885d0e00321963845aa3acc6eee0] | committer: Andreas Rheinhardt avcodec/aacps: Move initializing common stuff to aacdec_common.c ff_ps_init() initializes some tables for AAC parametric stereo and some of them are only valid for the fixed- or floating-point decoder, whereas others (namely VLCs) are valid for both. The latter are therefore initialized by ff_ps_init_common() and because the two versions of ff_ps_init() can be run concurrently, it is guarded by an AVOnce. Yet now that there is ff_aacdec_common_init_once() there is a better way to do this: Call ff_ps_init_common() from ff_aacdec_common_init_once(). That way there is no need to guard ff_ps_init_common() by an AVOnce any more. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4fe91e3676a1885d0… --- libavcodec/aacdec_common.c | 3 +++ libavcodec/aacps.c | 1 - libavcodec/aacps_common.c | 9 +-------- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/libavcodec/aacdec_common.c b/libavcodec/aacdec_common.c index 4af60e8c7c..75368b7075 100644 --- a/libavcodec/aacdec_common.c +++ b/libavcodec/aacdec_common.c @@ -27,6 +27,7 @@ #include "aac.h" #include "aacdectab.h" +#include "aacps.h" #include "aactab.h" #include "vlc.h" @@ -312,6 +313,8 @@ static av_cold void aacdec_common_init(void) sbr_vlc_offsets[i], 0); tab += sbr_huffman_nb_codes[i]; } + + ff_ps_init_common(); } av_cold void ff_aacdec_common_init_once(void) diff --git a/libavcodec/aacps.c b/libavcodec/aacps.c index ed00006a3a..5a3e6b3dfd 100644 --- a/libavcodec/aacps.c +++ b/libavcodec/aacps.c @@ -739,7 +739,6 @@ int AAC_RENAME(ff_ps_apply)(PSContext *ps, INTFLOAT L[2][38][64], INTFLOAT R[2][ av_cold void AAC_RENAME(ff_ps_init)(void) { ps_tableinit(); - ff_ps_init_common(); } av_cold void AAC_RENAME(ff_ps_ctx_init)(PSContext *ps) diff --git a/libavcodec/aacps_common.c b/libavcodec/aacps_common.c index 11bdb960cf..6b5493d4c2 100644 --- a/libavcodec/aacps_common.c +++ b/libavcodec/aacps_common.c @@ -21,7 +21,6 @@ #include <stdint.h> #include "libavutil/common.h" -#include "libavutil/thread.h" #include "aacps.h" #include "get_bits.h" #include "aacpsdata.c" @@ -298,7 +297,7 @@ err: #define PS_VLC_ROW(name) \ { name ## _codes, name ## _bits, sizeof(name ## _codes), sizeof(name ## _codes[0]) } -static av_cold void ps_init_common(void) +av_cold void ff_ps_init_common(void) { // Syntax initialization static const struct { @@ -328,9 +327,3 @@ static av_cold void ps_init_common(void) PS_INIT_VLC_STATIC(8, 5, 32); PS_INIT_VLC_STATIC(9, 5, 32); } - -av_cold void ff_ps_init_common(void) -{ - static AVOnce init_static_once = AV_ONCE_INIT; - ff_thread_once(&init_static_once, ps_init_common); -}

1 0

avcodec/aacdec_common: Apply offset for SBR VLCs during init
by Andreas Rheinhardt 31 Oct '23

31 Oct '23

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Mon Sep 25 01:33:28 2023 +0200| [7f66d9d6c5bf19388ea889e7bc7edc636c04d091] | committer: Andreas Rheinhardt avcodec/aacdec_common: Apply offset for SBR VLCs during init This avoids having to apply it later after every get_vlc2(). Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7f66d9d6c5bf19388… --- libavcodec/aacdec_common.c | 6 +++++- libavcodec/aacsbr.h | 3 --- libavcodec/aacsbr_template.c | 26 ++++++-------------------- 3 files changed, 11 insertions(+), 24 deletions(-) diff --git a/libavcodec/aacdec_common.c b/libavcodec/aacdec_common.c index 6a592600dc..4af60e8c7c 100644 --- a/libavcodec/aacdec_common.c +++ b/libavcodec/aacdec_common.c @@ -269,6 +269,10 @@ static const uint8_t sbr_huffman_nb_codes[] = { 121, 121, 49, 49, 63, 63, 25, 25, 63, 25 }; +static const int8_t sbr_vlc_offsets[10] = { + -60, -60, -24, -24, -31, -31, -12, -12, -31, -12 +}; + const VLCElem *ff_aac_sbr_vlc[10]; static av_cold void aacdec_common_init(void) @@ -305,7 +309,7 @@ static av_cold void aacdec_common_init(void) ff_vlc_init_tables_from_lengths(&state, 9, sbr_huffman_nb_codes[i], &tab[0][1], 2, &tab[0][0], 2, 1, - 0, 0); + sbr_vlc_offsets[i], 0); tab += sbr_huffman_nb_codes[i]; } } diff --git a/libavcodec/aacsbr.h b/libavcodec/aacsbr.h index 0d182f822c..3a19fe1c7e 100644 --- a/libavcodec/aacsbr.h +++ b/libavcodec/aacsbr.h @@ -66,9 +66,6 @@ enum { EXTENSION_ID_PS = 2, }; -static const int8_t vlc_sbr_lav[10] = - { 60, 60, 24, 24, 31, 31, 12, 12, 31, 12 }; - /** Initialize SBR. */ void AAC_RENAME(ff_aac_sbr_init)(void); /** Initialize one SBR context. */ diff --git a/libavcodec/aacsbr_template.c b/libavcodec/aacsbr_template.c index a82be8a8d5..98e9fd8fed 100644 --- a/libavcodec/aacsbr_template.c +++ b/libavcodec/aacsbr_template.c @@ -804,7 +804,6 @@ static int read_sbr_envelope(AACContext *ac, SpectralBandReplication *sbr, GetBi int bits; int i, j, k; const VLCElem *t_huff, *f_huff; - int t_lav, f_lav; const int delta = (ch == 1 && sbr->bs_coupling == 1) + 1; const int odd = sbr->n[1] & 1; @@ -812,29 +811,21 @@ static int read_sbr_envelope(AACContext *ac, SpectralBandReplication *sbr, GetBi if (ch_data->bs_amp_res) { bits = 5; t_huff = ff_aac_sbr_vlc[T_HUFFMAN_ENV_BAL_3_0DB]; - t_lav = vlc_sbr_lav[T_HUFFMAN_ENV_BAL_3_0DB]; f_huff = ff_aac_sbr_vlc[F_HUFFMAN_ENV_BAL_3_0DB]; - f_lav = vlc_sbr_lav[F_HUFFMAN_ENV_BAL_3_0DB]; } else { bits = 6; t_huff = ff_aac_sbr_vlc[T_HUFFMAN_ENV_BAL_1_5DB]; - t_lav = vlc_sbr_lav[T_HUFFMAN_ENV_BAL_1_5DB]; f_huff = ff_aac_sbr_vlc[F_HUFFMAN_ENV_BAL_1_5DB]; - f_lav = vlc_sbr_lav[F_HUFFMAN_ENV_BAL_1_5DB]; } } else { if (ch_data->bs_amp_res) { bits = 6; t_huff = ff_aac_sbr_vlc[T_HUFFMAN_ENV_3_0DB]; - t_lav = vlc_sbr_lav[T_HUFFMAN_ENV_3_0DB]; f_huff = ff_aac_sbr_vlc[F_HUFFMAN_ENV_3_0DB]; - f_lav = vlc_sbr_lav[F_HUFFMAN_ENV_3_0DB]; } else { bits = 7; t_huff = ff_aac_sbr_vlc[T_HUFFMAN_ENV_1_5DB]; - t_lav = vlc_sbr_lav[T_HUFFMAN_ENV_1_5DB]; f_huff = ff_aac_sbr_vlc[F_HUFFMAN_ENV_1_5DB]; - f_lav = vlc_sbr_lav[F_HUFFMAN_ENV_1_5DB]; } } @@ -843,7 +834,7 @@ static int read_sbr_envelope(AACContext *ac, SpectralBandReplication *sbr, GetBi // bs_freq_res[0] == bs_freq_res[bs_num_env] from prev frame if (ch_data->bs_freq_res[i + 1] == ch_data->bs_freq_res[i]) { for (j = 0; j < sbr->n[ch_data->bs_freq_res[i + 1]]; j++) { - ch_data->env_facs_q[i + 1][j] = ch_data->env_facs_q[i][j] + delta * (get_vlc2(gb, t_huff, 9, 3) - t_lav); + ch_data->env_facs_q[i + 1][j] = ch_data->env_facs_q[i][j] + delta * get_vlc2(gb, t_huff, 9, 3); if (ch_data->env_facs_q[i + 1][j] > 127U) { av_log(ac->avctx, AV_LOG_ERROR, "env_facs_q %d is invalid\n", ch_data->env_facs_q[i + 1][j]); return AVERROR_INVALIDDATA; @@ -852,7 +843,7 @@ static int read_sbr_envelope(AACContext *ac, SpectralBandReplication *sbr, GetBi } else if (ch_data->bs_freq_res[i + 1]) { for (j = 0; j < sbr->n[ch_data->bs_freq_res[i + 1]]; j++) { k = (j + odd) >> 1; // find k such that f_tablelow[k] <= f_tablehigh[j] < f_tablelow[k + 1] - ch_data->env_facs_q[i + 1][j] = ch_data->env_facs_q[i][k] + delta * (get_vlc2(gb, t_huff, 9, 3) - t_lav); + ch_data->env_facs_q[i + 1][j] = ch_data->env_facs_q[i][k] + delta * get_vlc2(gb, t_huff, 9, 3); if (ch_data->env_facs_q[i + 1][j] > 127U) { av_log(ac->avctx, AV_LOG_ERROR, "env_facs_q %d is invalid\n", ch_data->env_facs_q[i + 1][j]); return AVERROR_INVALIDDATA; @@ -861,7 +852,7 @@ static int read_sbr_envelope(AACContext *ac, SpectralBandReplication *sbr, GetBi } else { for (j = 0; j < sbr->n[ch_data->bs_freq_res[i + 1]]; j++) { k = j ? 2*j - odd : 0; // find k such that f_tablehigh[k] == f_tablelow[j] - ch_data->env_facs_q[i + 1][j] = ch_data->env_facs_q[i][k] + delta * (get_vlc2(gb, t_huff, 9, 3) - t_lav); + ch_data->env_facs_q[i + 1][j] = ch_data->env_facs_q[i][k] + delta * get_vlc2(gb, t_huff, 9, 3); if (ch_data->env_facs_q[i + 1][j] > 127U) { av_log(ac->avctx, AV_LOG_ERROR, "env_facs_q %d is invalid\n", ch_data->env_facs_q[i + 1][j]); return AVERROR_INVALIDDATA; @@ -871,7 +862,7 @@ static int read_sbr_envelope(AACContext *ac, SpectralBandReplication *sbr, GetBi } else { ch_data->env_facs_q[i + 1][0] = delta * get_bits(gb, bits); // bs_env_start_value_balance for (j = 1; j < sbr->n[ch_data->bs_freq_res[i + 1]]; j++) { - ch_data->env_facs_q[i + 1][j] = ch_data->env_facs_q[i + 1][j - 1] + delta * (get_vlc2(gb, f_huff, 9, 3) - f_lav); + ch_data->env_facs_q[i + 1][j] = ch_data->env_facs_q[i + 1][j - 1] + delta * get_vlc2(gb, f_huff, 9, 3); if (ch_data->env_facs_q[i + 1][j] > 127U) { av_log(ac->avctx, AV_LOG_ERROR, "env_facs_q %d is invalid\n", ch_data->env_facs_q[i + 1][j]); return AVERROR_INVALIDDATA; @@ -892,25 +883,20 @@ static int read_sbr_noise(AACContext *ac, SpectralBandReplication *sbr, GetBitCo { int i, j; const VLCElem *t_huff, *f_huff; - int t_lav, f_lav; int delta = (ch == 1 && sbr->bs_coupling == 1) + 1; if (sbr->bs_coupling && ch) { t_huff = ff_aac_sbr_vlc[T_HUFFMAN_NOISE_BAL_3_0DB]; - t_lav = vlc_sbr_lav[T_HUFFMAN_NOISE_BAL_3_0DB]; f_huff = ff_aac_sbr_vlc[F_HUFFMAN_ENV_BAL_3_0DB]; - f_lav = vlc_sbr_lav[F_HUFFMAN_ENV_BAL_3_0DB]; } else { t_huff = ff_aac_sbr_vlc[T_HUFFMAN_NOISE_3_0DB]; - t_lav = vlc_sbr_lav[T_HUFFMAN_NOISE_3_0DB]; f_huff = ff_aac_sbr_vlc[F_HUFFMAN_ENV_3_0DB]; - f_lav = vlc_sbr_lav[F_HUFFMAN_ENV_3_0DB]; } for (i = 0; i < ch_data->bs_num_noise; i++) { if (ch_data->bs_df_noise[i]) { for (j = 0; j < sbr->n_q; j++) { - ch_data->noise_facs_q[i + 1][j] = ch_data->noise_facs_q[i][j] + delta * (get_vlc2(gb, t_huff, 9, 2) - t_lav); + ch_data->noise_facs_q[i + 1][j] = ch_data->noise_facs_q[i][j] + delta * get_vlc2(gb, t_huff, 9, 2); if (ch_data->noise_facs_q[i + 1][j] > 30U) { av_log(ac->avctx, AV_LOG_ERROR, "noise_facs_q %d is invalid\n", ch_data->noise_facs_q[i + 1][j]); return AVERROR_INVALIDDATA; @@ -919,7 +905,7 @@ static int read_sbr_noise(AACContext *ac, SpectralBandReplication *sbr, GetBitCo } else { ch_data->noise_facs_q[i + 1][0] = delta * get_bits(gb, 5); // bs_noise_start_value_balance or bs_noise_start_value_level for (j = 1; j < sbr->n_q; j++) { - ch_data->noise_facs_q[i + 1][j] = ch_data->noise_facs_q[i + 1][j - 1] + delta * (get_vlc2(gb, f_huff, 9, 3) - f_lav); + ch_data->noise_facs_q[i + 1][j] = ch_data->noise_facs_q[i + 1][j - 1] + delta * get_vlc2(gb, f_huff, 9, 3); if (ch_data->noise_facs_q[i + 1][j] > 30U) { av_log(ac->avctx, AV_LOG_ERROR, "noise_facs_q %d is invalid\n", ch_data->noise_facs_q[i + 1][j]); return AVERROR_INVALIDDATA;

1 0