@@ -456,7 +456,8 @@ static int parse_subframe_header(DCACoreDecoder *s, int sf,
int sel = s->transition_mode_sel[ch];
for (band = 0; band < s->subband_vq_start[ch]; band++)
if (s->bit_allocation[ch][band])
- s->transition_mode[sf][ch][band] = dca_get_vlc(&s->gb, &ff_dca_vlc_transition_mode, sel);
+ s->transition_mode[sf][ch][band] = get_vlc2(&s->gb, ff_dca_vlc_transition_mode[sel].table,
+ ff_dca_vlc_transition_mode[sel].bits,1);
}
}
@@ -1233,7 +1233,7 @@ static const uint8_t rsd_bitvals[18] = {
};
DCAVLC ff_dca_vlc_bit_allocation;
-DCAVLC ff_dca_vlc_transition_mode;
+VLC ff_dca_vlc_transition_mode[4];
DCAVLC ff_dca_vlc_scale_factor;
DCAVLC ff_dca_vlc_quant_index[DCA_CODE_BOOKS];
@@ -1276,10 +1276,8 @@ av_cold void ff_dca_init_vlcs(void)
DCA_INIT_VLC(ff_dca_vlc_scale_factor.vlc[i], SCALES_VLC_BITS, 129,
scales_bits[i], scales_codes[i]);
- ff_dca_vlc_transition_mode.offset = 0;
- ff_dca_vlc_transition_mode.max_depth = 1;
- for (i = 0; i < 4; i++)
- DCA_INIT_VLC(ff_dca_vlc_transition_mode.vlc[i], tmode_vlc_bits[i], 4,
+ for (unsigned i = 0; i < FF_ARRAY_ELEMS(ff_dca_vlc_transition_mode); i++)
+ DCA_INIT_VLC(ff_dca_vlc_transition_mode[i], tmode_vlc_bits[i], 4,
tmode_bits[i], tmode_codes[i]);
for (i = 0; i < DCA_CODE_BOOKS; i++) {
@@ -40,7 +40,7 @@ typedef struct DCAVLC {
} DCAVLC;
extern DCAVLC ff_dca_vlc_bit_allocation;
-extern DCAVLC ff_dca_vlc_transition_mode;
+extern VLC ff_dca_vlc_transition_mode[4];
extern DCAVLC ff_dca_vlc_scale_factor;
extern DCAVLC ff_dca_vlc_quant_index[DCA_CODE_BOOKS];
The ff_dca_vlc_transition_mode VLCs don't use an offset at all, so just use ordinary VLCs for them. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> --- libavcodec/dca_core.c | 3 ++- libavcodec/dcahuff.c | 8 +++----- libavcodec/dcahuff.h | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-)