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

Factorize quant table read and write code in ffv1.c

Browse Source 
Originally committed as revision 25436 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2010-10-10 21:04:34 +00:00
parent 54ce8a4c8b
commit 4f22b3bbbf
1 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
libavcodec/ffv1.c
View File

@ -591,6 +591,12 @@ 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]){
int i;
for(i=0; i<5; i++)
write_quant_table(c, quant_table[i]);
}
static void write_header(FFV1Context *f){ static void write_header(FFV1Context *f){
uint8_t state[CONTEXT_SIZE]; uint8_t state[CONTEXT_SIZE];
int i; int i;
@ -614,8 +620,7 @@ static void write_header(FFV1Context *f){
put_symbol(c, state, f->chroma_v_shift, 0); put_symbol(c, state, f->chroma_v_shift, 0);
put_rac(c, state, 0); //no transparency plane put_rac(c, state, 0); //no transparency plane
for(i=0; i<5; i++) write_quant_tables(c, f->quant_table);
write_quant_table(c, f->quant_table[i]);
} }
#endif /* CONFIG_FFV1_ENCODER */ #endif /* CONFIG_FFV1_ENCODER */
@ -995,6 +1000,19 @@ 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]){
int i;
int context_count=1;
for(i=0; i<5; i++){
context_count*= read_quant_table(c, quant_table[i], context_count);
if(context_count > 32768U){
return -1;
}
}
return (context_count+1)/2;
}
static int read_header(FFV1Context *f){ static int read_header(FFV1Context *f){
uint8_t state[CONTEXT_SIZE]; uint8_t state[CONTEXT_SIZE];
int i, context_count; int i, context_count;
@ -1052,16 +1070,11 @@ static int read_header(FFV1Context *f){
} }
//printf("%d %d %d\n", f->chroma_h_shift, f->chroma_v_shift,f->avctx->pix_fmt); //printf("%d %d %d\n", f->chroma_h_shift, f->chroma_v_shift,f->avctx->pix_fmt);
context_count= read_quant_tables(c, f->quant_table);
context_count=1; if(context_count < 0){
for(i=0; i<5; i++){
context_count*= read_quant_table(c, f->quant_table[i], context_count);
if(context_count < 0 || context_count > 32768){
av_log(f->avctx, AV_LOG_ERROR, "read_quant_table error\n"); av_log(f->avctx, AV_LOG_ERROR, "read_quant_table error\n");
return -1; return -1;
} }
}
context_count= (context_count+1)/2;
for(i=0; i<f->plane_count; i++){ for(i=0; i<f->plane_count; i++){
PlaneContext * const p= &f->plane[i]; PlaneContext * const p= &f->plane[i];