MrBesen/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avcodec/mpeg12enc, speedhqenc: Avoid redundant copies of tables

Browse Source 
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
This commit is contained in:
Andreas Rheinhardt 2020-12-08 21:28:25 +01:00
parent c7016e35a6
commit f741bd0674
2 changed files with 4 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavcodec/mpeg12enc.c
View File

@ -62,9 +62,6 @@ static uint8_t uni_mpeg2_ac_vlc_len[64 * 64 * 2];
static uint32_t mpeg1_lum_dc_uni[512];
static uint32_t mpeg1_chr_dc_uni[512];
static uint8_t mpeg1_index_run[2][64];
static int8_t mpeg1_max_level[2][64];
#define A53_MAX_CC_COUNT 0x1f
#endif /* CONFIG_MPEG1VIDEO_ENCODER || CONFIG_MPEG2VIDEO_ENCODER */
@ -722,8 +719,8 @@ next_coef:
MASK_ABS(sign, alevel);
sign &= 1;
if (alevel <= mpeg1_max_level[0][run]) {
code = mpeg1_index_run[0][run] + alevel - 1;
if (alevel <= ff_rl_mpeg1.max_level[0][run]) {
code = ff_rl_mpeg1.index_run[0][run] + alevel - 1;
/* store the VLC & sign at once */
put_bits(&s->pb, table_vlc[code][1] + 1,
(table_vlc[code][0] << 1) + sign);
@ -1046,11 +1043,6 @@ static av_cold void mpeg12_encode_init_static(void)
ff_rl_init(&ff_rl_mpeg1, mpeg12_static_rl_table_store[0]);
ff_rl_init(&ff_rl_mpeg2, mpeg12_static_rl_table_store[1]);
for (int i = 0; i < 64; i++) {
mpeg1_max_level[0][i] = ff_rl_mpeg1.max_level[0][i];
mpeg1_index_run[0][i] = ff_rl_mpeg1.index_run[0][i];
}
ff_mpeg1_init_uni_ac_vlc(&ff_rl_mpeg1, uni_mpeg1_ac_vlc_len);
ff_mpeg1_init_uni_ac_vlc(&ff_rl_mpeg2, uni_mpeg2_ac_vlc_len);

12
libavcodec/speedhqenc.c
View File

@ -46,9 +46,6 @@ static uint16_t mpeg12_vlc_dc_chroma_code_reversed[12];
static uint32_t speedhq_lum_dc_uni[512];
static uint32_t speedhq_chr_dc_uni[512];
static uint8_t speedhq_index_run[2][64];
static int8_t speedhq_max_level[2][64];
static uint8_t uni_speedhq_ac_vlc_len[64 * 64 * 2];
static uint32_t reverse(uint32_t num, int bits)
@ -77,11 +74,6 @@ static av_cold void speedhq_init_static_data(void)
ff_rl_init(&ff_rl_speedhq, speedhq_static_rl_table_store);
for (int i = 0; i < 64; i++) {
speedhq_max_level[0][i] = ff_rl_speedhq.max_level[0][i];
speedhq_index_run[0][i] = ff_rl_speedhq.index_run[0][i];
}
/* build unified dc encoding tables */
for (int i = -255; i < 256; i++) {
int adiff, index;
@ -231,8 +223,8 @@ static void encode_block(MpegEncContext *s, int16_t *block, int n)
MASK_ABS(sign, alevel);
sign &= 1;
if (alevel <= speedhq_max_level[0][run]) {
code = speedhq_index_run[0][run] + alevel - 1;
if (alevel <= ff_rl_speedhq.max_level[0][run]) {
code = ff_rl_speedhq.index_run[0][run] + alevel - 1;
/* store the VLC & sign at once */
put_bits_le(&s->pb, ff_rl_speedhq.table_vlc[code][1] + 1,
ff_rl_speedhq.table_vlc[code][0] + (sign << ff_rl_speedhq.table_vlc[code][1]));