MrBesen/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avcodec/dca_core: Inline number of bits of scale factor VLCs

Browse Source 
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt 2022-09-06 14:53:48 +02:00
parent 597bfff342
commit 9dbc370769
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/dca_core.c
View File

@ -362,7 +362,8 @@ static inline int parse_scale(DCACoreDecoder *s, int *scale_index, int sel)
// If Huffman code was used, the difference of scales was encoded
if (sel < 5)
*scale_index += dca_get_vlc(&s->gb, &ff_dca_vlc_scale_factor, sel);
*scale_index += get_vlc2(&s->gb, ff_dca_vlc_scale_factor[sel].table,
DCA_SCALES_VLC_BITS, 2);
else
*scale_index = get_bits(&s->gb, sel + 1);
@ -381,7 +382,8 @@ static inline int parse_joint_scale(DCACoreDecoder *s, int sel)
// Absolute value was encoded even when Huffman code was used
if (sel < 5)
scale_index = dca_get_vlc(&s->gb, &ff_dca_vlc_scale_factor, sel);
scale_index = get_vlc2(&s->gb, ff_dca_vlc_scale_factor[sel].table,
DCA_SCALES_VLC_BITS, 2);
else
scale_index = get_bits(&s->gb, sel + 1);

7
libavcodec/dcahuff.c
View File

@ -770,7 +770,7 @@ const uint8_t ff_dca_vlc_src_tables[][2] = {
DCAVLC ff_dca_vlc_bit_allocation;
VLC ff_dca_vlc_transition_mode[4];
DCAVLC ff_dca_vlc_scale_factor;
VLC ff_dca_vlc_scale_factor[5];
DCAVLC ff_dca_vlc_quant_index[DCA_CODE_BOOKS];
VLC ff_dca_vlc_tnl_grp[5];
@ -815,9 +815,8 @@ av_cold void ff_dca_init_vlcs(void)
for (i = 0; i < 5; i++)
DCA_INIT_VLC(ff_dca_vlc_bit_allocation.vlc[i], bitalloc_12_vlc_bits[i], 12, 1);
ff_dca_vlc_scale_factor.max_depth = 2;
for (i = 0; i < 5; i++)
DCA_INIT_VLC(ff_dca_vlc_scale_factor.vlc[i], SCALES_VLC_BITS, 129, -64);
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);
for (unsigned i = 0; i < FF_ARRAY_ELEMS(ff_dca_vlc_transition_mode); i++)
DCA_INIT_VLC(ff_dca_vlc_transition_mode[i], DCA_TMODE_VLC_BITS, 4, 0);

3
libavcodec/dcahuff.h
View File

@ -43,7 +43,8 @@ typedef struct DCAVLC {
extern DCAVLC ff_dca_vlc_bit_allocation;
#define DCA_TMODE_VLC_BITS 3
extern VLC ff_dca_vlc_transition_mode[4];
extern DCAVLC ff_dca_vlc_scale_factor;
#define DCA_SCALES_VLC_BITS 9
extern VLC ff_dca_vlc_scale_factor[5];
extern DCAVLC ff_dca_vlc_quant_index[DCA_CODE_BOOKS];
extern VLC ff_dca_vlc_tnl_grp[5];