generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libavcodec/mpeg12.c
View File

@ -70,22 +70,21 @@ static const uint8_t table_mb_btype[11][2] = {
#define INIT_2D_VLC_RL(rl, static_size)\ #define INIT_2D_VLC_RL(rl, static_size)\
{\ {\
static RL_VLC_ELEM rl_vlc_table[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;\ 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; 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++) { for (i = 0; i < vlc.table_size; i++) {
int code = vlc->table[i][0]; int code = vlc.table[i][0];
int len = vlc->table[i][1]; int len = vlc.table[i][1];
int level, run; int level, run;
if (len == 0) { // illegal code if (len == 0) { // illegal code

12
libavcodec/mpegvideo.c
View File

@ -1618,9 +1618,13 @@ av_cold void ff_init_rl(RLTable *rl,
} }
} }
av_cold void ff_init_vlc_rl(RLTable *rl, const VLC *vlc) av_cold void ff_init_vlc_rl(RLTable *rl, unsigned static_size)
{ {
int i, q; int i, q;
VLC_TYPE table[1500][2] = {{0}};
VLC vlc = { .table = table, .table_allocated = static_size };
av_assert0(static_size <= FF_ARRAY_ELEMS(table));
init_vlc(&vlc, 9, rl->n + 1, &rl->table_vlc[0][1], 4, 2, &rl->table_vlc[0][0], 4, 2, INIT_VLC_USE_NEW_STATIC);
for (q = 0; q < 32; q++) { for (q = 0; q < 32; q++) {
int qmul = q * 2; int qmul = q * 2;
@ -1630,9 +1634,9 @@ av_cold void ff_init_vlc_rl(RLTable *rl, const VLC *vlc)
qmul = 1; qmul = 1;
qadd = 0; qadd = 0;
} }
for (i = 0; i < vlc->table_size; i++) { for (i = 0; i < vlc.table_size; i++) {
int code = vlc->table[i][0]; int code = vlc.table[i][0];
int len = vlc->table[i][1]; int len = vlc.table[i][1];
int level, run; int level, run;
if (len == 0) { // illegal code if (len == 0) { // illegal code

8
libavcodec/rl.h
View File

@ -53,22 +53,18 @@ typedef struct RLTable {
* the level and run tables, if this is NULL av_malloc() will be used * the level and run tables, if this is NULL av_malloc() will be used
*/ */
void ff_init_rl(RLTable *rl, uint8_t static_store[2][2*MAX_RUN + MAX_LEVEL + 3]); void ff_init_rl(RLTable *rl, uint8_t static_store[2][2*MAX_RUN + MAX_LEVEL + 3]);
void ff_init_vlc_rl(RLTable *rl, const VLC *vlc); void ff_init_vlc_rl(RLTable *rl, unsigned static_size);
#define INIT_VLC_RL(rl, static_size)\ #define INIT_VLC_RL(rl, static_size)\
{\ {\
int q;\ int q;\
static RL_VLC_ELEM rl_vlc_table[32][static_size];\ static RL_VLC_ELEM rl_vlc_table[32][static_size];\
VLC tmp_vlc;\
INIT_VLC_STATIC(&tmp_vlc, 9, rl.n + 1,\
&rl.table_vlc[0][1], 4, 2,\
&rl.table_vlc[0][0], 4, 2, static_size);\
\ \
if(!rl.rl_vlc[0]){\ if(!rl.rl_vlc[0]){\
for(q=0; q<32; q++)\ for(q=0; q<32; q++)\
rl.rl_vlc[q]= rl_vlc_table[q];\ rl.rl_vlc[q]= rl_vlc_table[q];\
\ \
ff_init_vlc_rl(&rl, &tmp_vlc);\ ff_init_vlc_rl(&rl, static_size);\
}\ }\
} }