RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avcodec/speedhqdec: Use ff_rl_speedhq.table_(run|level) directly 

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt 2022-10-22 02:26:52 +02:00
parent a12abf59a9
commit 65beba7889
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/speedhq.c
View File

@ -60,7 +60,7 @@ const uint16_t ff_speedhq_vlc_table[SPEEDHQ_RL_NB_ELEMS + 2][2] = {
{0x0006, 4} /* EOB */ {0x0006, 4} /* EOB */
}; };
static const uint8_t speedhq_level[121] = { const uint8_t ff_speedhq_level[121] = {
1, 2, 3, 4, 5, 6, 7, 8, 1, 2, 3, 4, 5, 6, 7, 8,
9, 10, 11, 12, 13, 14, 15, 16, 9, 10, 11, 12, 13, 14, 15, 16,
17, 18, 19, 20, 21, 22, 23, 24, 17, 18, 19, 20, 21, 22, 23, 24,
@ -79,7 +79,7 @@ static const uint8_t speedhq_level[121] = {
1, 1,
}; };
static const uint8_t speedhq_run[121] = { const uint8_t ff_speedhq_run[121] = {
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@ -102,6 +102,6 @@ RLTable ff_rl_speedhq = {
121, 121,
121, 121,
ff_speedhq_vlc_table, ff_speedhq_vlc_table,
speedhq_run, ff_speedhq_run,
speedhq_level, ff_speedhq_level,
}; };

2
libavcodec/speedhq.h
View File

@ -28,6 +28,8 @@
#define SPEEDHQ_RL_NB_ELEMS 121 #define SPEEDHQ_RL_NB_ELEMS 121
FF_VISIBILITY_PUSH_HIDDEN FF_VISIBILITY_PUSH_HIDDEN
extern const uint8_t ff_speedhq_run[SPEEDHQ_RL_NB_ELEMS];
extern const uint8_t ff_speedhq_level[SPEEDHQ_RL_NB_ELEMS];
extern const uint16_t ff_speedhq_vlc_table[SPEEDHQ_RL_NB_ELEMS + 2][2]; extern const uint16_t ff_speedhq_vlc_table[SPEEDHQ_RL_NB_ELEMS + 2][2];
extern RLTable attribute_visibility_hidden ff_rl_speedhq; extern RLTable attribute_visibility_hidden ff_rl_speedhq;

4
libavcodec/speedhqdec.c
View File

@ -566,8 +566,8 @@ static av_cold void speedhq_static_init(void)
ff_mpeg12_vlc_dc_chroma_code, 2, 2, ff_mpeg12_vlc_dc_chroma_code, 2, 2,
INIT_VLC_OUTPUT_LE, 514); INIT_VLC_OUTPUT_LE, 514);
ff_init_2d_vlc_rl(ff_speedhq_vlc_table, speedhq_rl_vlc, ff_rl_speedhq.table_run, ff_init_2d_vlc_rl(ff_speedhq_vlc_table, speedhq_rl_vlc, ff_speedhq_run,
ff_rl_speedhq.table_level, ff_rl_speedhq.n, ff_speedhq_level, SPEEDHQ_RL_NB_ELEMS,
FF_ARRAY_ELEMS(speedhq_rl_vlc), INIT_VLC_LE); FF_ARRAY_ELEMS(speedhq_rl_vlc), INIT_VLC_LE);
compute_alpha_vlcs(); compute_alpha_vlcs();