Move msmpeg4 tables from a header file to msmpegdata.c.

Originally committed as revision 10107 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Diego Biurrun 2007-08-13 17:57:06 +00:00
parent 5e4c7ca224
commit 9488b966c7
4 changed files with 2014 additions and 2024 deletions

View File

@ -86,7 +86,6 @@ int frame_count = 0;
#endif
#include "msmpeg4data.h"
#include "msmpeg4tab.h"
#ifdef CONFIG_ENCODERS //strangely gcc includes this even if it is not references
static uint8_t rl_length[NB_RL_TABLES][MAX_LEVEL+1][MAX_RUN+1][2];

File diff suppressed because it is too large Load Diff

View File

@ -32,6 +32,18 @@
#include "common.h"
#include "bitstream.h"
#include "rl.h"
/* motion vector table */
typedef struct MVTable {
int n;
const uint16_t *table_mv_code;
const uint8_t *table_mv_bits;
const uint8_t *table_mvx;
const uint8_t *table_mvy;
uint16_t *table_mv_index; /* encoding: convert mv to index in table_mv */
VLC vlc; /* decoding: vlc */
} MVTable;
extern VLC ff_msmp4_mb_i_vlc;
extern VLC ff_msmp4_dc_luma_vlc[2];
@ -40,4 +52,49 @@ extern VLC ff_msmp4_dc_chroma_vlc[2];
/* intra picture macro block coded block pattern */
extern const uint16_t ff_msmp4_mb_i_table[64][2];
extern const uint8_t cbpy_tab[16][2];
extern const uint8_t DCtab_lum[13][2];
extern const uint8_t DCtab_chrom[13][2];
extern const uint8_t mvtab[33][2];
extern const uint8_t intra_MCBPC_code[9];
extern const uint8_t intra_MCBPC_bits[9];
extern const uint8_t inter_MCBPC_code[28];
extern const uint8_t inter_MCBPC_bits[28];
#define WMV1_SCANTABLE_COUNT 4
extern const uint8_t *wmv1_scantable[WMV1_SCANTABLE_COUNT+1];
#define NB_RL_TABLES 6
extern RLTable rl_table[NB_RL_TABLES];
extern const uint8_t wmv1_y_dc_scale_table[32];
extern const uint8_t wmv1_c_dc_scale_table[32];
extern const uint8_t old_ff_y_dc_scale_table[32];
extern const uint8_t old_ff_c_dc_scale_table[32];
extern MVTable mv_tables[2];
extern const uint8_t v2_mb_type[8][2];
extern const uint8_t v2_intra_cbpc[4][2];
extern const uint32_t table_mb_non_intra[128][2];
extern const uint8_t table_inter_intra[4][2];
extern const uint32_t ff_table0_dc_lum[120][2];
extern const uint32_t ff_table1_dc_lum[120][2];
extern const uint32_t ff_table0_dc_chroma[120][2];
extern const uint32_t ff_table1_dc_chroma[120][2];
#define WMV2_INTER_CBP_TABLE_COUNT 4
extern const uint32_t (*wmv2_inter_table[WMV2_INTER_CBP_TABLE_COUNT])[2];
extern const uint8_t wmv2_scantableA[64];
extern const uint8_t wmv2_scantableB[64];
#endif /* MSMPEG4DATA_H */

File diff suppressed because it is too large Load Diff