Chiebot-Mirror
/
FFmpeg
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

avcodec/clearvideo: Avoid code tables for initializing VLCs

Browse Source 
The ClearVideo decoder uses VLC tables that are initialized at runtime
from static length, symbol and codes tables. Yet the code tables can be
omitted by subjecting all of these tables to the permutation that orders
the codes from left to right in the tree. After this is done, the codes
can be easily computed at runtime from the lengths and therefore
omitted. This saves about 10KB.

Only one minor complication is encountered when doing so: The tree
corresponding to the AC VLC codes is incomplete; but this can be
handled by adding an entry with negative length.

Furthermore, there are also VLCs that are only initialized with lengths
and codes tables with codes of type uint16_t. These have also been
switched to ff_init_vlc_from_lengths() as this means that one can
replace the uint16_t codes tables with uint8_t symbols tables.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
pull/358/head
Andreas Rheinhardt 4 years ago
parent c055d8f026
commit c82a559e6f
2 changed files with 910 additions and 1721 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 154
      libavcodec/clearvideo.c
  2. 2477
      libavcodec/clearvideodata.h

154
libavcodec/clearvideo.c
Unescape View File

@ -696,159 +696,143 @@ static av_cold int clv_decode_init(AVCodecContext *avctx)
av_log(avctx, AV_LOG_ERROR, "Error initialising DC VLC\n");
return ret;
}
ret = ff_init_vlc_sparse(&c->ac_vlc, 9, NUM_AC_CODES,
clv_ac_bits, 1, 1,
clv_ac_codes, 1, 1,
clv_ac_syms, 2, 2, 0);
ret = ff_init_vlc_from_lengths(&c->ac_vlc, 9, NUM_AC_CODES,
clv_ac_bits, 1,
clv_ac_syms, 2, 2, 0, 0, avctx);
if (ret) {
av_log(avctx, AV_LOG_ERROR, "Error initialising AC VLC\n");
return ret;
}
ret = init_vlc(&c->ylev[0].flags_cb, 9, FF_ARRAY_ELEMS(clv_flagsy_0_bits),
clv_flagsy_0_bits, 1, 1,
clv_flagsy_0_codes, 2, 2, 0);
ret = ff_init_vlc_from_lengths(&c->ylev[0].flags_cb, 9, FF_ARRAY_ELEMS(clv_flagsy_0_bits),
clv_flagsy_0_bits, 1,
clv_flagsy_0_syms, 1, 1, 0, 0, avctx);
if (ret)
return ret;
ret = init_vlc(&c->ylev[1].flags_cb, 9, FF_ARRAY_ELEMS(clv_flagsy_1_bits),
clv_flagsy_1_bits, 1, 1,
clv_flagsy_1_codes, 2, 2, 0);
ret = ff_init_vlc_from_lengths(&c->ylev[1].flags_cb, 9, FF_ARRAY_ELEMS(clv_flagsy_1_bits),
clv_flagsy_1_bits, 1,
clv_flagsy_1_syms, 1, 1, 0, 0, avctx);
if (ret)
return ret;
ret = init_vlc(&c->ylev[2].flags_cb, 9, FF_ARRAY_ELEMS(clv_flagsy_2_bits),
clv_flagsy_2_bits, 1, 1,
clv_flagsy_2_codes, 2, 2, 0);
ret = ff_init_vlc_from_lengths(&c->ylev[2].flags_cb, 9, FF_ARRAY_ELEMS(clv_flagsy_2_bits),
clv_flagsy_2_bits, 1,
clv_flagsy_2_syms, 1, 1, 0, 0, avctx);
if (ret)
return ret;
ret = init_vlc(&c->ulev[0].flags_cb, 9, FF_ARRAY_ELEMS(clv_flagsu_0_bits),
clv_flagsu_0_bits, 1, 1,
clv_flagsu_0_codes, 2, 2, 0);
ret = ff_init_vlc_from_lengths(&c->ulev[0].flags_cb, 9, FF_ARRAY_ELEMS(clv_flagsu_0_bits),
clv_flagsu_0_bits, 1,
clv_flagsu_0_syms, 1, 1, 0, 0, avctx);
if (ret)
return ret;
ret = init_vlc(&c->ulev[1].flags_cb, 9, FF_ARRAY_ELEMS(clv_flagsu_1_bits),
clv_flagsu_1_bits, 1, 1,
clv_flagsu_1_codes, 2, 2, 0);
ret = ff_init_vlc_from_lengths(&c->ulev[1].flags_cb, 9, FF_ARRAY_ELEMS(clv_flagsu_1_bits),
clv_flagsu_1_bits, 1,
clv_flagsu_1_syms, 1, 1, 0, 0, avctx);
if (ret)
return ret;
ret = init_vlc(&c->vlev[0].flags_cb, 9, FF_ARRAY_ELEMS(clv_flagsv_0_bits),
clv_flagsv_0_bits, 1, 1,
clv_flagsv_0_codes, 2, 2, 0);
ret = ff_init_vlc_from_lengths(&c->vlev[0].flags_cb, 9, FF_ARRAY_ELEMS(clv_flagsv_0_bits),
clv_flagsv_0_bits, 1,
clv_flagsv_0_syms, 1, 1, 0, 0, avctx);
if (ret)
return ret;
ret = init_vlc(&c->vlev[1].flags_cb, 9, FF_ARRAY_ELEMS(clv_flagsv_1_bits),
clv_flagsv_1_bits, 1, 1,
clv_flagsv_1_codes, 2, 2, 0);
ret = ff_init_vlc_from_lengths(&c->vlev[1].flags_cb, 9, FF_ARRAY_ELEMS(clv_flagsv_1_bits),
clv_flagsv_1_bits, 1,
clv_flagsv_1_syms, 1, 1, 0, 0, avctx);
if (ret)
return ret;
ret = ff_init_vlc_sparse(&c->ylev[0].mv_cb, 9, FF_ARRAY_ELEMS(clv_mvy_0_bits),
clv_mvy_0_bits, 1, 1,
clv_mvy_0_codes, 2, 2,
clv_mvy_0_syms, 2, 2, 0);
ret = ff_init_vlc_from_lengths(&c->ylev[0].mv_cb, 9, FF_ARRAY_ELEMS(clv_mvy_0_bits),
clv_mvy_0_bits, 1,
clv_mvy_0_syms, 2, 2, 0, 0, avctx);
if (ret)
return ret;
ret = ff_init_vlc_sparse(&c->ylev[1].mv_cb, 9, FF_ARRAY_ELEMS(clv_mvy_1_bits),
clv_mvy_1_bits, 1, 1,
clv_mvy_1_codes, 2, 2,
clv_mvy_1_syms, 2, 2, 0);
ret = ff_init_vlc_from_lengths(&c->ylev[1].mv_cb, 9, FF_ARRAY_ELEMS(clv_mvy_1_bits),
clv_mvy_1_bits, 1,
clv_mvy_1_syms, 2, 2, 0, 0, avctx);
if (ret)
return ret;
ret = ff_init_vlc_sparse(&c->ylev[2].mv_cb, 9, FF_ARRAY_ELEMS(clv_mvy_2_bits),
clv_mvy_2_bits, 1, 1,
clv_mvy_2_codes, 2, 2,
clv_mvy_2_syms, 2, 2, 0);
ret = ff_init_vlc_from_lengths(&c->ylev[2].mv_cb, 9, FF_ARRAY_ELEMS(clv_mvy_2_bits),
clv_mvy_2_bits, 1,
clv_mvy_2_syms, 2, 2, 0, 0, avctx);
if (ret)
return ret;
ret = ff_init_vlc_sparse(&c->ylev[3].mv_cb, 9, FF_ARRAY_ELEMS(clv_mvy_3_bits),
clv_mvy_3_bits, 1, 1,
clv_mvy_3_codes, 2, 2,
clv_mvy_3_syms, 2, 2, 0);
ret = ff_init_vlc_from_lengths(&c->ylev[3].mv_cb, 9, FF_ARRAY_ELEMS(clv_mvy_3_bits),
clv_mvy_3_bits, 1,
clv_mvy_3_syms, 2, 2, 0, 0, avctx);
if (ret)
return ret;
ret = ff_init_vlc_sparse(&c->ulev[1].mv_cb, 9, FF_ARRAY_ELEMS(clv_mvu_1_bits),
clv_mvu_1_bits, 1, 1,
clv_mvu_1_codes, 2, 2,
clv_mvu_1_syms, 2, 2, 0);
ret = ff_init_vlc_from_lengths(&c->ulev[1].mv_cb, 9, FF_ARRAY_ELEMS(clv_mvu_1_bits),
clv_mvu_1_bits, 1,
clv_mvu_1_syms, 2, 2, 0, 0, avctx);
if (ret)
return ret;
ret = ff_init_vlc_sparse(&c->ulev[2].mv_cb, 9, FF_ARRAY_ELEMS(clv_mvu_2_bits),
clv_mvu_2_bits, 1, 1,
clv_mvu_2_codes, 2, 2,
clv_mvu_2_syms, 2, 2, 0);
ret = ff_init_vlc_from_lengths(&c->ulev[2].mv_cb, 9, FF_ARRAY_ELEMS(clv_mvu_2_bits),
clv_mvu_2_bits, 1,
clv_mvu_2_syms, 2, 2, 0, 0, avctx);
if (ret)
return ret;
ret = ff_init_vlc_sparse(&c->vlev[1].mv_cb, 9, FF_ARRAY_ELEMS(clv_mvv_1_bits),
clv_mvv_1_bits, 1, 1,
clv_mvv_1_codes, 2, 2,
clv_mvv_1_syms, 2, 2, 0);
ret = ff_init_vlc_from_lengths(&c->vlev[1].mv_cb, 9, FF_ARRAY_ELEMS(clv_mvv_1_bits),
clv_mvv_1_bits, 1,
clv_mvv_1_syms, 2, 2, 0, 0, avctx);
if (ret)
return ret;
ret = ff_init_vlc_sparse(&c->vlev[2].mv_cb, 9, FF_ARRAY_ELEMS(clv_mvv_2_bits),
clv_mvv_2_bits, 1, 1,
clv_mvv_2_codes, 2, 2,
clv_mvv_2_syms, 2, 2, 0);
ret = ff_init_vlc_from_lengths(&c->vlev[2].mv_cb, 9, FF_ARRAY_ELEMS(clv_mvv_2_bits),
clv_mvv_2_bits, 1,
clv_mvv_2_syms, 2, 2, 0, 0, avctx);
if (ret)
return ret;
ret = ff_init_vlc_sparse(&c->ylev[1].bias_cb, 9, FF_ARRAY_ELEMS(clv_biasy_1_bits),
clv_biasy_1_bits, 1, 1,
clv_biasy_1_codes, 2, 2,
clv_biasy_1_syms, 2, 2, 0);
ret = ff_init_vlc_from_lengths(&c->ylev[1].bias_cb, 9, FF_ARRAY_ELEMS(clv_biasy_1_bits),
clv_biasy_1_bits, 1,
clv_biasy_1_syms, 2, 2, 0, 0, avctx);
if (ret)
return ret;
ret = ff_init_vlc_sparse(&c->ylev[2].bias_cb, 9, FF_ARRAY_ELEMS(clv_biasy_2_bits),
clv_biasy_2_bits, 1, 1,
clv_biasy_2_codes, 2, 2,
clv_biasy_2_syms, 2, 2, 0);
ret = ff_init_vlc_from_lengths(&c->ylev[2].bias_cb, 9, FF_ARRAY_ELEMS(clv_biasy_2_bits),
clv_biasy_2_bits, 1,
clv_biasy_2_syms, 2, 2, 0, 0, avctx);
if (ret)
return ret;
ret = ff_init_vlc_sparse(&c->ylev[3].bias_cb, 9, FF_ARRAY_ELEMS(clv_biasy_3_bits),
clv_biasy_3_bits, 1, 1,
clv_biasy_3_codes, 2, 2,
clv_biasy_3_syms, 2, 2, 0);
ret = ff_init_vlc_from_lengths(&c->ylev[3].bias_cb, 9, FF_ARRAY_ELEMS(clv_biasy_3_bits),
clv_biasy_3_bits, 1,
clv_biasy_3_syms, 2, 2, 0, 0, avctx);
if (ret)
return ret;
ret = ff_init_vlc_sparse(&c->ulev[1].bias_cb, 9, FF_ARRAY_ELEMS(clv_biasu_1_bits),
clv_biasu_1_bits, 1, 1,
clv_biasu_1_codes, 2, 2,
clv_biasu_1_syms, 2, 2, 0);
ret = ff_init_vlc_from_lengths(&c->ulev[1].bias_cb, 9, FF_ARRAY_ELEMS(clv_biasu_1_bits),
clv_biasu_1_bits, 1,
clv_biasu_1_syms, 2, 2, 0, 0, avctx);
if (ret)
return ret;
ret = ff_init_vlc_sparse(&c->ulev[2].bias_cb, 9, FF_ARRAY_ELEMS(clv_biasu_2_bits),
clv_biasu_2_bits, 1, 1,
clv_biasu_2_codes, 2, 2,
clv_biasu_2_syms, 2, 2, 0);
ret = ff_init_vlc_from_lengths(&c->ulev[2].bias_cb, 9, FF_ARRAY_ELEMS(clv_biasu_2_bits),
clv_biasu_2_bits, 1,
clv_biasu_2_syms, 2, 2, 0, 0, avctx);
if (ret)
return ret;
ret = ff_init_vlc_sparse(&c->vlev[1].bias_cb, 9, FF_ARRAY_ELEMS(clv_biasv_1_bits),
clv_biasv_1_bits, 1, 1,
clv_biasv_1_codes, 2, 2,
clv_biasv_1_syms, 2, 2, 0);
ret = ff_init_vlc_from_lengths(&c->vlev[1].bias_cb, 9, FF_ARRAY_ELEMS(clv_biasv_1_bits),
clv_biasv_1_bits, 1,
clv_biasv_1_syms, 2, 2, 0, 0, avctx);
if (ret)
return ret;
ret = ff_init_vlc_sparse(&c->vlev[2].bias_cb, 9, FF_ARRAY_ELEMS(clv_biasv_2_bits),
clv_biasv_2_bits, 1, 1,
clv_biasv_2_codes, 2, 2,
clv_biasv_2_syms, 2, 2, 0);
ret = ff_init_vlc_from_lengths(&c->vlev[2].bias_cb, 9, FF_ARRAY_ELEMS(clv_biasv_2_bits),
clv_biasv_2_bits, 1,
clv_biasv_2_syms, 2, 2, 0, 0, avctx);
if (ret)
return ret;

2477
libavcodec/clearvideodata.h
View File

File diff suppressed because it is too large Load Diff
Write Preview
Loading…
Cancel
Save