LAV
/
FFmpeg
1
0
Fork 0
Code

avcodec/dnxhddec: Use VLC symbol table to avoid lookup 

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt 2023-09-16 02:54:54 +02:00
parent 156f53e987
commit 4dae62f708
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavcodec/dnxhddec.c
View File

@ -142,9 +142,10 @@ static int dnxhd_init_vlc(DNXHDContext *ctx, uint32_t cid, int bitdepth)
ctx->cid_table->dc_bits, 1, 1,
ctx->cid_table->dc_codes, 1, 1, 0)) < 0)
goto out;
if ((ret = vlc_init(&ctx->run_vlc, DNXHD_VLC_BITS, 62,
if ((ret = ff_vlc_init_sparse(&ctx->run_vlc, DNXHD_VLC_BITS, 62,
ctx->cid_table->run_bits, 1, 1,
ctx->cid_table->run_codes, 2, 2, 0)) < 0)
ctx->cid_table->run_codes, 2, 2,
ctx->cid_table->run, 1, 1, 0)) < 0)
goto out;
ctx->cid = cid;
@ -358,7 +359,7 @@ static av_always_inline int dnxhd_decode_dct_block(const DNXHDContext *ctx,
int level_shift,
int dc_shift)
{
int i, j, index1, index2, len, flags;
int i, j, index1, len, flags;
int level, component, sign;
const int *scale;
const uint8_t *weight_matrix;
@ -425,10 +426,11 @@ static av_always_inline int dnxhd_decode_dct_block(const DNXHDContext *ctx,
}
if (flags & 2) {
int run;
UPDATE_CACHE(bs, &row->gb);
GET_VLC(index2, bs, &row->gb, ctx->run_vlc.table,
GET_VLC(run, bs, &row->gb, ctx->run_vlc.table,
DNXHD_VLC_BITS, 2);
i += ctx->cid_table->run[index2];
i += run;
}
if (++i > 63) {