virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-04 22:03:09 +02:00
Code Issues Releases Activity

avcodec/msmpeg4enc: Avoid using MVTable

Browse Source 
Switch to using the length+symbol table combination that is
also used by the decoder and remove MVTable as well as
the old tables altogether.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt
2025-03-15 11:08:38 +01:00
parent 3d9a581ec1
commit 967f8a924e
3 changed files with 15 additions and 1159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1139
libavcodec/msmpeg4data.c
View File

File diff suppressed because it is too large Load Diff

11
libavcodec/msmpeg4data.h
View File

@ -35,16 +35,6 @@
#include "libavutil/attributes_internal.h" #include "libavutil/attributes_internal.h"
#include "rl.h" #include "rl.h"
#include "vlc.h"
/* motion vector table */
typedef struct MVTable {
const uint16_t *table_mv_code;
const uint8_t *table_mv_bits;
const uint8_t *table_mvx;
const uint8_t *table_mvy;
const VLCElem *vlc; /* decoding: vlc */
} MVTable;
FF_VISIBILITY_PUSH_HIDDEN FF_VISIBILITY_PUSH_HIDDEN
#define NB_RL_TABLES 6 #define NB_RL_TABLES 6
@ -64,7 +54,6 @@ extern const uint16_t ff_msmp4_mv_table0[MSMPEG4_MV_TABLES_NB_ELEMS];
extern const uint8_t ff_msmp4_mv_table0_lens[MSMPEG4_MV_TABLES_NB_ELEMS]; extern const uint8_t ff_msmp4_mv_table0_lens[MSMPEG4_MV_TABLES_NB_ELEMS];
extern const uint16_t ff_msmp4_mv_table1[MSMPEG4_MV_TABLES_NB_ELEMS]; extern const uint16_t ff_msmp4_mv_table1[MSMPEG4_MV_TABLES_NB_ELEMS];
extern const uint8_t ff_msmp4_mv_table1_lens[MSMPEG4_MV_TABLES_NB_ELEMS]; extern const uint8_t ff_msmp4_mv_table1_lens[MSMPEG4_MV_TABLES_NB_ELEMS];
extern MVTable ff_mv_tables[2];
extern const uint8_t ff_v2_mb_type[8][2]; extern const uint8_t ff_v2_mb_type[8][2];
extern const uint8_t ff_v2_intra_cbpc[4][2]; extern const uint8_t ff_v2_intra_cbpc[4][2];

24
libavcodec/msmpeg4enc.c
View File

@ -55,11 +55,10 @@ static uint8_t rl_length[NB_RL_TABLES][MAX_LEVEL+1][MAX_RUN+1][2];
static uint32_t mv_vector_tables[2][4096]; static uint32_t mv_vector_tables[2][4096];
/* build the table which associate a (x,y) motion vector to a vlc */ /* build the table which associate a (x,y) motion vector to a vlc */
static av_cold void init_mv_table(const MVTable *tab, uint32_t mv_vector_table[4096], static av_cold void init_mv_table(const uint16_t mv_table[], const uint8_t mv_table_lens[],
uint32_t mv_vector_table[4096],
unsigned escape_code, int escape_length) unsigned escape_code, int escape_length)
{ {
int i, x, y;
for (int i = 0; i < 4096; i++) { for (int i = 0; i < 4096; i++) {
// Initialize to the table to "escaped". This code is equivalent to // Initialize to the table to "escaped". This code is equivalent to
// the following double loop (with x and y ranging over 0..63): // the following double loop (with x and y ranging over 0..63):
@ -67,11 +66,16 @@ static av_cold void init_mv_table(const MVTable *tab, uint32_t mv_vector_table[4
mv_vector_table[i] = (escape_code << 20) | (i << 8) | escape_length; mv_vector_table[i] = (escape_code << 20) | (i << 8) | escape_length;
} }
for (i = 0; i < MSMPEG4_MV_TABLES_NB_ELEMS - 1; i++) { for (uint32_t i = 0, code = 0; i < MSMPEG4_MV_TABLES_NB_ELEMS; i++) {
x = tab->table_mvx[i]; int sym = mv_table[i];
y = tab->table_mvy[i]; int len = mv_table_lens[i];
mv_vector_table[(x << 6) | y] = (tab->table_mv_code[i] << 8) | tab->table_mv_bits[i]; int x = sym >> 8;
int y = sym & 0xFF;
// We ignore the escape value here and restore it after the loop.
mv_vector_table[(x << 6) | y] = (code >> (24 - len)) | len;
code += 1U << (32 - len);
} }
mv_vector_table[0] = (escape_code << 20) | escape_length;
} }
void ff_msmpeg4_code012(PutBitContext *pb, int n) void ff_msmpeg4_code012(PutBitContext *pb, int n)
@ -128,8 +132,10 @@ static int get_size_of_code(const RLTable *rl, int last, int run,
static av_cold void msmpeg4_encode_init_static(void) static av_cold void msmpeg4_encode_init_static(void)
{ {
init_mv_table(&ff_mv_tables[0], mv_vector_tables[0], 0x0000, 8 + 12); init_mv_table(ff_msmp4_mv_table0, ff_msmp4_mv_table0_lens,
init_mv_table(&ff_mv_tables[1], mv_vector_tables[1], 0x000b, 4 + 12); mv_vector_tables[0], 0x0000, 8 + 12);
init_mv_table(ff_msmp4_mv_table1, ff_msmp4_mv_table1_lens,
mv_vector_tables[1], 0x000b, 4 + 12);
for (int i = 0; i < NB_RL_TABLES; i++) { for (int i = 0; i < NB_RL_TABLES; i++) {
for (int level = 1; level <= MAX_LEVEL; level++) { for (int level = 1; level <= MAX_LEVEL; level++) {