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

avcodec/cook: Apply offset when initializing VLC table 

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
This commit is contained in:
Andreas Rheinhardt 2020-10-27 14:27:36 +01:00
parent 530d86b90d
commit 3f4cfc48dd
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/cook.c
View File

@ -200,7 +200,7 @@ static av_cold int init_cook_vlc_tables(COOKContext *q)
result |= ff_init_vlc_from_lengths(&q->envelope_quant_index[i], 9, 24, result |= ff_init_vlc_from_lengths(&q->envelope_quant_index[i], 9, 24,
envelope_quant_index_huffbits[i], 1, envelope_quant_index_huffbits[i], 1,
envelope_quant_index_huffsyms[i], 1, 1, envelope_quant_index_huffsyms[i], 1, 1,
0, 0, q->avctx); -12, 0, q->avctx);
} }
av_log(q->avctx, AV_LOG_DEBUG, "sqvh VLC init\n"); av_log(q->avctx, AV_LOG_DEBUG, "sqvh VLC init\n");
for (i = 0; i < 7; i++) { for (i = 0; i < 7; i++) {
@ -385,7 +385,7 @@ static int decode_envelope(COOKContext *q, COOKSubpacket *p,
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); q->envelope_quant_index[vlc_index - 1].bits, 2);
quant_index_table[i] = quant_index_table[i - 1] + j - 12; // 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,
"Invalid quantizer %d at position %d, outside [-63, 63] range\n", "Invalid quantizer %d at position %d, outside [-63, 63] range\n",