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

ffv1dec: transparency plane support. 

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2011-11-28 17:40:39 +01:00
parent 492aab8589
commit 2027d073ae
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
libavcodec/ffv1.c
View File

@ -1368,18 +1368,18 @@ static void decode_plane(FFV1Context *s, uint8_t *src, int w, int h, int stride,
static void decode_rgb_frame(FFV1Context *s, uint32_t *src, int w, int h, int stride){ static void decode_rgb_frame(FFV1Context *s, uint32_t *src, int w, int h, int stride){
int x, y, p; int x, y, p;
int16_t *sample[3][2]; int16_t *sample[4][2];
for(x=0; x<3; x++){ for(x=0; x<4; x++){
sample[x][0] = s->sample_buffer + x*2 *(w+6) + 3; sample[x][0] = s->sample_buffer + x*2 *(w+6) + 3;
sample[x][1] = s->sample_buffer + (x*2+1)*(w+6) + 3; sample[x][1] = s->sample_buffer + (x*2+1)*(w+6) + 3;
} }
s->run_index=0; s->run_index=0;
memset(s->sample_buffer, 0, 6*(w+6)*sizeof(*s->sample_buffer)); memset(s->sample_buffer, 0, 8*(w+6)*sizeof(*s->sample_buffer));
for(y=0; y<h; y++){ for(y=0; y<h; y++){
for(p=0; p<3; p++){ for(p=0; p<3 + s->transparency; p++){
int16_t *temp = sample[p][0]; //FIXME try a normal buffer int16_t *temp = sample[p][0]; //FIXME try a normal buffer
sample[p][0]= sample[p][1]; sample[p][0]= sample[p][1];
@ -1387,12 +1387,13 @@ static void decode_rgb_frame(FFV1Context *s, uint32_t *src, int w, int h, int st
sample[p][1][-1]= sample[p][0][0 ]; sample[p][1][-1]= sample[p][0][0 ];
sample[p][0][ w]= sample[p][0][w-1]; sample[p][0][ w]= sample[p][0][w-1];
decode_line(s, w, sample[p], FFMIN(p, 1), 9); decode_line(s, w, sample[p], (p+1)/2, 9);
} }
for(x=0; x<w; x++){ for(x=0; x<w; x++){
int g= sample[0][1][x]; int g= sample[0][1][x];
int b= sample[1][1][x]; int b= sample[1][1][x];
int r= sample[2][1][x]; int r= sample[2][1][x];
int a= sample[3][1][x];
// assert(g>=0 && b>=0 && r>=0); // assert(g>=0 && b>=0 && r>=0);
// assert(g<256 && b<512 && r<512); // assert(g<256 && b<512 && r<512);
@ -1403,7 +1404,7 @@ static void decode_rgb_frame(FFV1Context *s, uint32_t *src, int w, int h, int st
b += g; b += g;
r += g; r += g;
src[x + stride*y]= b + (g<<8) + (r<<16) + (0xFF<<24); src[x + stride*y]= b + (g<<8) + (r<<16) + (a<<24);
} }
} }
} }
@ -1502,8 +1503,8 @@ static int read_extra_header(FFV1Context *f){
get_rac(c, state); //no chroma = false get_rac(c, state); //no chroma = false
f->chroma_h_shift= get_symbol(c, state, 0); f->chroma_h_shift= get_symbol(c, state, 0);
f->chroma_v_shift= get_symbol(c, state, 0); f->chroma_v_shift= get_symbol(c, state, 0);
get_rac(c, state); //transparency plane f->transparency= get_rac(c, state);
f->plane_count= 2; f->plane_count= 2 + f->transparency;
f->num_h_slices= 1 + get_symbol(c, state, 0); f->num_h_slices= 1 + get_symbol(c, state, 0);
f->num_v_slices= 1 + get_symbol(c, state, 0); f->num_v_slices= 1 + get_symbol(c, state, 0);
if(f->num_h_slices > (unsigned)f->width || f->num_v_slices > (unsigned)f->height){ if(f->num_h_slices > (unsigned)f->width || f->num_v_slices > (unsigned)f->height){
@ -1559,8 +1560,8 @@ static int read_header(FFV1Context *f){
get_rac(c, state); //no chroma = false get_rac(c, state); //no chroma = false
f->chroma_h_shift= get_symbol(c, state, 0); f->chroma_h_shift= get_symbol(c, state, 0);
f->chroma_v_shift= get_symbol(c, state, 0); f->chroma_v_shift= get_symbol(c, state, 0);
get_rac(c, state); //transparency plane f->transparency= get_rac(c, state);
f->plane_count= 2; f->plane_count= 2 + f->transparency;
} }
if(f->colorspace==0){ if(f->colorspace==0){