RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avcodec/cook: Inline constants 

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
This commit is contained in:
Andreas Rheinhardt 2020-10-27 15:32:27 +01:00
parent 3ff0179b19
commit 7eef70a001
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavcodec/cook.c
View File

@ -65,6 +65,9 @@
#define SUBBAND_SIZE 20 #define SUBBAND_SIZE 20
#define MAX_SUBPACKETS 5 #define MAX_SUBPACKETS 5
#define QUANT_VLC_BITS 9
#define COUPLING_VLC_BITS 6
typedef struct cook_gains { typedef struct cook_gains {
int *now; int *now;
int *previous; int *previous;
@ -212,7 +215,7 @@ static av_cold int init_cook_vlc_tables(COOKContext *q)
result = 0; result = 0;
for (i = 0; i < 13; i++) { for (i = 0; i < 13; i++) {
result |= build_vlc(&q->envelope_quant_index[i], 9, result |= build_vlc(&q->envelope_quant_index[i], QUANT_VLC_BITS,
envelope_quant_index_huffcounts[i], envelope_quant_index_huffcounts[i],
envelope_quant_index_huffsyms[i], 1, -12, q->avctx); envelope_quant_index_huffsyms[i], 1, -12, q->avctx);
} }
@ -226,7 +229,7 @@ static av_cold int init_cook_vlc_tables(COOKContext *q)
for (i = 0; i < q->num_subpackets; i++) { for (i = 0; i < q->num_subpackets; i++) {
if (q->subpacket[i].joint_stereo == 1) { if (q->subpacket[i].joint_stereo == 1) {
result |= build_vlc(&q->subpacket[i].channel_coupling, 6, result |= build_vlc(&q->subpacket[i].channel_coupling, COUPLING_VLC_BITS,
ccpl_huffcounts[q->subpacket[i].js_vlc_bits - 2], ccpl_huffcounts[q->subpacket[i].js_vlc_bits - 2],
ccpl_huffsyms[q->subpacket[i].js_vlc_bits - 2], 1, ccpl_huffsyms[q->subpacket[i].js_vlc_bits - 2], 1,
0, q->avctx); 0, q->avctx);
@ -396,7 +399,7 @@ static int decode_envelope(COOKContext *q, COOKSubpacket *p,
vlc_index = 13; // the VLC tables >13 are identical to No. 13 vlc_index = 13; // the VLC tables >13 are identical to No. 13
j = get_vlc2(&q->gb, q->envelope_quant_index[vlc_index - 1].table, j = get_vlc2(&q->gb, q->envelope_quant_index[vlc_index - 1].table,
q->envelope_quant_index[vlc_index - 1].bits, 2); QUANT_VLC_BITS, 2);
quant_index_table[i] = quant_index_table[i - 1] + j; // differential encoding quant_index_table[i] = quant_index_table[i - 1] + j; // differential encoding
if (quant_index_table[i] > 63 || quant_index_table[i] < -63) { if (quant_index_table[i] > 63 || quant_index_table[i] < -63) {
av_log(q->avctx, AV_LOG_ERROR, av_log(q->avctx, AV_LOG_ERROR,
@ -775,7 +778,7 @@ static int decouple_info(COOKContext *q, COOKSubpacket *p, int *decouple_tab)
for (i = 0; i < length; i++) for (i = 0; i < length; i++)
decouple_tab[start + i] = get_vlc2(&q->gb, decouple_tab[start + i] = get_vlc2(&q->gb,
p->channel_coupling.table, p->channel_coupling.table,
p->channel_coupling.bits, 3); COUPLING_VLC_BITS, 3);
else else
for (i = 0; i < length; i++) { for (i = 0; i < length; i++) {
int v = get_bits(&q->gb, p->js_vlc_bits); int v = get_bits(&q->gb, p->js_vlc_bits);