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

avcodec/mpeg12: Use ff_rl_mpeg1.table_(run|level) directly 

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

8
libavcodec/mpeg12.c
View File

@ -152,11 +152,11 @@ static av_cold void mpeg12_init_vlcs(void)
&table_mb_btype[0][1], 2, 1,
&table_mb_btype[0][0], 2, 1, 64);
ff_init_2d_vlc_rl(ff_mpeg1_vlc_table, ff_mpeg1_rl_vlc, ff_rl_mpeg1.table_run,
ff_rl_mpeg1.table_level, ff_rl_mpeg1.n,
ff_init_2d_vlc_rl(ff_mpeg1_vlc_table, ff_mpeg1_rl_vlc, ff_mpeg12_run,
ff_mpeg12_level, MPEG12_RL_NB_ELEMS,
FF_ARRAY_ELEMS(ff_mpeg1_rl_vlc), 0);
ff_init_2d_vlc_rl(ff_mpeg2_vlc_table, ff_mpeg2_rl_vlc, ff_rl_mpeg1.table_run,
ff_rl_mpeg1.table_level, ff_rl_mpeg1.n,
ff_init_2d_vlc_rl(ff_mpeg2_vlc_table, ff_mpeg2_rl_vlc, ff_mpeg12_run,
ff_mpeg12_level, MPEG12_RL_NB_ELEMS,
FF_ARRAY_ELEMS(ff_mpeg2_rl_vlc), 0);
}

8
libavcodec/mpeg12data.c
View File

@ -130,7 +130,7 @@ const uint16_t ff_mpeg2_vlc_table[MPEG12_RL_NB_ELEMS + 2][2] = {
{0x06,4}, /* EOB */
};
static const int8_t mpeg1_level[111] = {
const int8_t ff_mpeg12_level[MPEG12_RL_NB_ELEMS] = {
1, 2, 3, 4, 5, 6, 7, 8,
9, 10, 11, 12, 13, 14, 15, 16,
17, 18, 19, 20, 21, 22, 23, 24,
@ -147,7 +147,7 @@ static const int8_t mpeg1_level[111] = {
1, 1, 1, 1, 1, 1, 1,
};
static const int8_t mpeg1_run[111] = {
const int8_t ff_mpeg12_run[MPEG12_RL_NB_ELEMS] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
@ -168,8 +168,8 @@ RLTable ff_rl_mpeg1 = {
111,
111,
ff_mpeg1_vlc_table,
mpeg1_run,
mpeg1_level,
ff_mpeg12_run,
ff_mpeg12_level,
};
const uint8_t ff_mpeg12_mbAddrIncrTable[36][2] = {

3
libavcodec/mpeg12vlc.h
View File

@ -54,6 +54,9 @@ void ff_mpeg12_init_vlcs(void);
extern RLTable ff_rl_mpeg1;
extern const int8_t ff_mpeg12_level[MPEG12_RL_NB_ELEMS];
extern const int8_t ff_mpeg12_run[MPEG12_RL_NB_ELEMS];
extern const uint16_t ff_mpeg1_vlc_table[MPEG12_RL_NB_ELEMS + 2][2];
extern const uint16_t ff_mpeg2_vlc_table[MPEG12_RL_NB_ELEMS + 2][2];