rl.h: Use on-stack temporary VLC tables instead of having them static.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
This commit is contained in:
Reimar Döffinger
2014-08-31 20:07:40 +02:00
parent 2ca78936c7
commit e48cd2de98
3 changed files with 19 additions and 20 deletions

View File

@@ -70,22 +70,21 @@ static const uint8_t table_mb_btype[11][2] = {
#define INIT_2D_VLC_RL(rl, static_size)\
{\
static RL_VLC_ELEM rl_vlc_table[static_size];\
VLC tmp_vlc;\
INIT_VLC_STATIC(&tmp_vlc, TEX_VLC_BITS, rl.n + 2,\
&rl.table_vlc[0][1], 4, 2,\
&rl.table_vlc[0][0], 4, 2, static_size);\
\
rl.rl_vlc[0] = rl_vlc_table;\
init_2d_vlc_rl(&rl, &tmp_vlc);\
init_2d_vlc_rl(&rl, static_size);\
}
static av_cold void init_2d_vlc_rl(RLTable *rl, const VLC *vlc)
static av_cold void init_2d_vlc_rl(RLTable *rl, unsigned static_size)
{
int i;
VLC_TYPE table[680][2] = {{0}};
VLC vlc = { .table = table, .table_allocated = static_size };
av_assert0(static_size <= FF_ARRAY_ELEMS(table));
init_vlc(&vlc, TEX_VLC_BITS, rl->n + 2, &rl->table_vlc[0][1], 4, 2, &rl->table_vlc[0][0], 4, 2, INIT_VLC_USE_NEW_STATIC);
for (i = 0; i < vlc->table_size; i++) {
int code = vlc->table[i][0];
int len = vlc->table[i][1];
for (i = 0; i < vlc.table_size; i++) {
int code = vlc.table[i][0];
int len = vlc.table[i][1];
int level, run;
if (len == 0) { // illegal code