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

avcodec/smacker: Use better nb_codes estimate when initializing VLC 

Using the real number of read codes allows to leave a loop in
ff_init_vlc_sparse earlier; notice that all codes not explicitly
set by reading data have been set to zero earlier (i.e. they are
zero-length codes) and such codes are ignored by ff_init_vlc_sparse.

This improves performance: When compiled with GCC 9, the time spent on
one call to smka_decode_frame() for the sample from ticket #2425
decreased from 2195367 decicycles to 2068389 decicycles. For Clang 9,
it improved from 1602075 to 1534188 decicycles. These tests have been
performed 20 times and each times the input file has been looped
32 times to get a sufficient number of frames.

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
This commit is contained in:
Andreas Rheinhardt 2020-06-25 16:50:24 +02:00
parent 01dbcbb37a
commit 2db38ae734
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/smacker.c
View File

@ -214,7 +214,7 @@ static int smacker_decode_header_tree(SmackVContext *smk, GetBitContext *gb, int
goto error;
skip_bits1(gb);
if (h[i].current > 1) {
err = init_vlc(&vlc[i], SMKTREE_BITS, h[i].length,
err = init_vlc(&vlc[i], SMKTREE_BITS, h[i].current,
INIT_VLC_DEFAULT_SIZES(h[i].lengths),
INIT_VLC_DEFAULT_SIZES(h[i].bits),
INIT_VLC_LE);
@ -657,7 +657,7 @@ static int smka_decode_frame(AVCodecContext *avctx, void *data,
goto error;
skip_bits1(&gb);
if(h[i].current > 1) {
ret = init_vlc(&vlc[i], SMKTREE_BITS, h[i].length,
ret = init_vlc(&vlc[i], SMKTREE_BITS, h[i].current,
h[i].lengths, sizeof(int), sizeof(int),
h[i].bits, sizeof(uint32_t), sizeof(uint32_t), INIT_VLC_LE);
if (ret < 0) {