diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2022-09-06 16:53:48 +0200 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2022-09-16 18:07:29 +0200 |
| commit | 465e27e0f2b35b13d348c882c723158a36a802ef (patch) | |
| tree | d13dd4a30a5fec7cc8e7702183364990e1130016 /libavcodec/dcahuff.c | |
| parent | 3652114596096a2b015972e9db063323c408c91e (diff) | |
| download | ffmpeg-465e27e0f2b35b13d348c882c723158a36a802ef.tar.gz | |
avcodec/dcahuff: Replace DCAVLC by ordinary VLCs
This is possible now that the offsets are already applied
when creating the VLC.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Diffstat (limited to 'libavcodec/dcahuff.c')
| -rw-r--r-- | libavcodec/dcahuff.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/libavcodec/dcahuff.c b/libavcodec/dcahuff.c index a7518aded8..937a87ee05 100644 --- a/libavcodec/dcahuff.c +++ b/libavcodec/dcahuff.c @@ -768,10 +768,10 @@ const uint8_t ff_dca_vlc_src_tables[][2] = { { 4, 3 }, { 0, 3 }, { 2, 2 }, { 3, 2 }, }; -DCAVLC ff_dca_vlc_bit_allocation; +VLC ff_dca_vlc_bit_allocation[5]; VLC ff_dca_vlc_transition_mode[4]; VLC ff_dca_vlc_scale_factor[5]; -DCAVLC ff_dca_vlc_quant_index[DCA_CODE_BOOKS]; +VLC ff_dca_vlc_quant_index[DCA_CODE_BOOKS][7]; VLC ff_dca_vlc_tnl_grp[5]; VLC ff_dca_vlc_tnl_scf; @@ -791,7 +791,6 @@ av_cold void ff_dca_init_vlcs(void) static VLCElem dca_table[30218]; const uint8_t (*src_table)[2] = ff_dca_vlc_src_tables; unsigned offset = 0; - int i; #define DCA_INIT_VLC(vlc, nb_bits, nb_codes, entry_offset) \ do { \ @@ -805,15 +804,13 @@ av_cold void ff_dca_init_vlcs(void) } while (0) for (unsigned i = 0; i < DCA_CODE_BOOKS; i++) { - ff_dca_vlc_quant_index[i].max_depth = 1 + (i > 4); for (unsigned j = 0; j < ff_dca_quant_index_group_size[i]; j++) - DCA_INIT_VLC(ff_dca_vlc_quant_index[i].vlc[j], bitalloc_maxbits[i][j], + DCA_INIT_VLC(ff_dca_vlc_quant_index[i][j], bitalloc_maxbits[i][j], ff_dca_bitalloc_sizes[i], ff_dca_bitalloc_offsets[i]); } - ff_dca_vlc_bit_allocation.max_depth = 2; - for (i = 0; i < 5; i++) - DCA_INIT_VLC(ff_dca_vlc_bit_allocation.vlc[i], bitalloc_12_vlc_bits[i], 12, 1); + for (unsigned i = 0; i < FF_ARRAY_ELEMS(ff_dca_vlc_bit_allocation); i++) + DCA_INIT_VLC(ff_dca_vlc_bit_allocation[i], bitalloc_12_vlc_bits[i], 12, 1); for (unsigned i = 0; i < FF_ARRAY_ELEMS(ff_dca_vlc_scale_factor); i++) DCA_INIT_VLC(ff_dca_vlc_scale_factor[i], DCA_SCALES_VLC_BITS, 129, -64); |