virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Replace 5 by named constant MAX_CONTEXT_INPUTS in ffv1.c

Browse Source 
Originally committed as revision 25529 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2010-10-19 17:26:27 +00:00
parent 095e5c0b6d
commit c868524b9a
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavcodec/ffv1.c
View File

@ -38,6 +38,7 @@
#define CONTEXT_SIZE 32 #define CONTEXT_SIZE 32
#define MAX_QUANT_TABLES 8 #define MAX_QUANT_TABLES 8
#define MAX_CONTEXT_INPUTS 5
extern const uint8_t ff_log2_run[32]; extern const uint8_t ff_log2_run[32];
@ -216,7 +217,7 @@ typedef struct VlcState{
} VlcState; } VlcState;
typedef struct PlaneContext{ typedef struct PlaneContext{
int16_t quant_table[5][256]; int16_t quant_table[MAX_CONTEXT_INPUTS][256];
int context_count; int context_count;
uint8_t (*state)[CONTEXT_SIZE]; uint8_t (*state)[CONTEXT_SIZE];
VlcState *vlc_state; VlcState *vlc_state;
@ -239,8 +240,8 @@ typedef struct FFV1Context{
int plane_count; int plane_count;
int ac; ///< 1=range coder <-> 0=golomb rice int ac; ///< 1=range coder <-> 0=golomb rice
PlaneContext plane[MAX_PLANES]; PlaneContext plane[MAX_PLANES];
int16_t quant_table[5][256]; int16_t quant_table[MAX_CONTEXT_INPUTS][256];
int16_t quant_tables[MAX_QUANT_TABLES][5][256]; int16_t quant_tables[MAX_QUANT_TABLES][MAX_CONTEXT_INPUTS][256];
int context_count[MAX_QUANT_TABLES]; int context_count[MAX_QUANT_TABLES];
uint8_t state_transition[256]; uint8_t state_transition[256];
int run_index; int run_index;
@ -610,7 +611,7 @@ static void write_quant_table(RangeCoder *c, int16_t *quant_table){
put_symbol(c, state, i-last-1, 0); put_symbol(c, state, i-last-1, 0);
} }
static void write_quant_tables(RangeCoder *c, int16_t quant_table[5][256]){ static void write_quant_tables(RangeCoder *c, int16_t quant_table[MAX_CONTEXT_INPUTS][256]){
int i; int i;
for(i=0; i<5; i++) for(i=0; i<5; i++)
write_quant_table(c, quant_table[i]); write_quant_table(c, quant_table[i]);
@ -1208,7 +1209,7 @@ static int read_quant_table(RangeCoder *c, int16_t *quant_table, int scale){
return 2*v - 1; return 2*v - 1;
} }
static int read_quant_tables(RangeCoder *c, int16_t quant_table[5][256]){ static int read_quant_tables(RangeCoder *c, int16_t quant_table[MAX_CONTEXT_INPUTS][256]){
int i; int i;
int context_count=1; int context_count=1;