highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dr1

Browse Source 
Originally committed as revision 1216 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2002-11-15 00:07:06 +00:00
parent 0626afe9b2
commit 22f3e8bea7
1 changed files with 33 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
libavcodec/huffyuv.c
View File

@ -412,6 +412,7 @@ s->bgr32=1;
y_size= height*stride; y_size= height*stride;
if(!(avctx->flags&CODEC_FLAG_DR1)){
s->linesize[0]= stride; s->linesize[0]= stride;
s->picture[0]= av_mallocz(y_size); s->picture[0]= av_mallocz(y_size);
@ -423,6 +424,7 @@ s->bgr32=1;
memset(s->picture[1], 128, c_size); memset(s->picture[1], 128, c_size);
memset(s->picture[2], 128, c_size); memset(s->picture[2], 128, c_size);
} }
}
// printf("pred:%d bpp:%d hbpp:%d il:%d\n", s->predictor, s->bitstream_bpp, avctx->bits_per_sample, s->interlaced); // printf("pred:%d bpp:%d hbpp:%d il:%d\n", s->predictor, s->bitstream_bpp, avctx->bits_per_sample, s->interlaced);
@ -651,9 +653,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, uint8
const int width= s->width; const int width= s->width;
const int width2= s->width>>1; const int width2= s->width>>1;
const int height= s->height; const int height= s->height;
const int fake_ystride= s->interlaced ? s->linesize[0]*2 : s->linesize[0]; int fake_ystride, fake_ustride, fake_vstride;
const int fake_ustride= s->interlaced ? s->linesize[1]*2 : s->linesize[1];
const int fake_vstride= s->interlaced ? s->linesize[2]*2 : s->linesize[2];
int i; int i;
AVPicture *picture = data; AVPicture *picture = data;
@ -668,6 +668,23 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, uint8
init_get_bits(&s->gb, s->bitstream_buffer, buf_size); init_get_bits(&s->gb, s->bitstream_buffer, buf_size);
if(avctx->flags&CODEC_FLAG_DR1){
if(avctx->get_buffer_callback(avctx, s->width, s->height, I_TYPE) < 0){
fprintf(stderr, "get_buffer() failed\n");
return -1;
}
s->linesize[0]= avctx->dr_stride;
s->linesize[1]=
s->linesize[2]= avctx->dr_uvstride;
for(i=0; i<3;i++)
s->picture[i]= avctx->dr_buffer[i];
}
fake_ystride= s->interlaced ? s->linesize[0]*2 : s->linesize[0];
fake_ustride= s->interlaced ? s->linesize[1]*2 : s->linesize[1];
fake_vstride= s->interlaced ? s->linesize[2]*2 : s->linesize[2];
if(s->bitstream_bpp<24){ if(s->bitstream_bpp<24){
int y, cy; int y, cy;
int lefty, leftu, leftv; int lefty, leftu, leftv;
@ -870,7 +887,9 @@ static int decode_end(AVCodecContext *avctx)
int i; int i;
for(i=0; i<3; i++){ for(i=0; i<3; i++){
if(!(avctx->flags&CODEC_FLAG_DR1))
av_freep(&s->picture[i]); av_freep(&s->picture[i]);
free_vlc(&s->vlc[i]); free_vlc(&s->vlc[i]);
} }
@ -1050,7 +1069,7 @@ AVCodec huffyuv_decoder = {
NULL, NULL,
decode_end, decode_end,
decode_frame, decode_frame,
0, CODEC_CAP_DR1,
NULL NULL
}; };