RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-25 00:32:31 +00:00
Code Issues Projects Releases Wiki Activity

avcodec/rv40: Avoid offset table when initializing static VLCs

Browse Source 
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
This commit is contained in:
Andreas Rheinhardt 2020-11-05 00:42:56 +01:00
parent fcde452a47
commit 477fc65d33
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libavcodec/rv40.c
View File

@ -41,11 +41,6 @@ static VLC aic_top_vlc;
static VLC aic_mode1_vlc[AIC_MODE1_NUM], aic_mode2_vlc[AIC_MODE2_NUM]; static VLC aic_mode1_vlc[AIC_MODE1_NUM], aic_mode2_vlc[AIC_MODE2_NUM];
static VLC ptype_vlc[NUM_PTYPE_VLCS], btype_vlc[NUM_BTYPE_VLCS]; static VLC ptype_vlc[NUM_PTYPE_VLCS], btype_vlc[NUM_BTYPE_VLCS];
static const int16_t mode2_offs[] = {
0, 614, 1222, 1794, 2410, 3014, 3586, 4202, 4792, 5382, 5966, 6542,
7138, 7716, 8292, 8864, 9444, 10030, 10642, 11212, 11814
};
/** /**
* Initialize all tables. * Initialize all tables.
*/ */
@ -72,7 +67,7 @@ static av_cold void rv40_init_tables(void)
aic_mode1_vlc_bits[i], 1, 1, aic_mode1_vlc_bits[i], 1, 1,
aic_mode1_vlc_codes[i], 1, 1, INIT_VLC_USE_NEW_STATIC); aic_mode1_vlc_codes[i], 1, 1, INIT_VLC_USE_NEW_STATIC);
} }
for(i = 0; i < AIC_MODE2_NUM; i++){ for (unsigned i = 0, offset = 0; i < AIC_MODE2_NUM; i++){
uint16_t syms[AIC_MODE2_SIZE]; uint16_t syms[AIC_MODE2_SIZE];
for (int j = 0; j < AIC_MODE2_SIZE; j++) { for (int j = 0; j < AIC_MODE2_SIZE; j++) {
@ -83,11 +78,12 @@ static av_cold void rv40_init_tables(void)
else else
syms[j] = first | (second << 8); syms[j] = first | (second << 8);
} }
aic_mode2_vlc[i].table = &aic_mode2_table[mode2_offs[i]]; aic_mode2_vlc[i].table = &aic_mode2_table[offset];
aic_mode2_vlc[i].table_allocated = mode2_offs[i + 1] - mode2_offs[i]; aic_mode2_vlc[i].table_allocated = FF_ARRAY_ELEMS(aic_mode2_table) - offset;
ff_init_vlc_from_lengths(&aic_mode2_vlc[i], AIC_MODE2_BITS, AIC_MODE2_SIZE, ff_init_vlc_from_lengths(&aic_mode2_vlc[i], AIC_MODE2_BITS, AIC_MODE2_SIZE,
aic_mode2_vlc_bits[i], 1, aic_mode2_vlc_bits[i], 1,
syms, 2, 2, 0, INIT_VLC_USE_NEW_STATIC, NULL); syms, 2, 2, 0, INIT_VLC_STATIC_OVERLONG, NULL);
offset += aic_mode2_vlc[i].table_size;
} }
for(i = 0; i < NUM_PTYPE_VLCS; i++){ for(i = 0; i < NUM_PTYPE_VLCS; i++){
ptype_vlc[i].table = &ptype_table[i << PTYPE_VLC_BITS]; ptype_vlc[i].table = &ptype_table[i << PTYPE_VLC_BITS];