har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Factorise setting of avctx->pix_fmt.

Browse Source 
Originally committed as revision 16453 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Carl Eugen Hoyos 2009-01-06 15:16:33 +00:00
parent 7cfe7d77a4
commit 93c69a94ea
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
libavcodec/mpeg12.c
View File

@ -1212,6 +1212,22 @@ static void quant_matrix_rebuild(uint16_t *matrix, const uint8_t *old_perm,
} }
} }
static enum PixelFormat mpeg_set_pixelformat(AVCodecContext *avctx){
Mpeg1Context *s1 = avctx->priv_data;
MpegEncContext *s = &s1->mpeg_enc_ctx;
if(avctx->xvmc_acceleration)
return avctx->get_format(avctx,pixfmt_xvmc_mpg2_420);
else{
if(s->chroma_format < 2)
return PIX_FMT_YUV420P;
else if(s->chroma_format == 2)
return PIX_FMT_YUV422P;
else
return PIX_FMT_YUV444P;
}
}
/* Call this function when we know all parameters. /* Call this function when we know all parameters.
* It may be called in different places for MPEG-1 and MPEG-2. */ * It may be called in different places for MPEG-1 and MPEG-2. */
static int mpeg_decode_postinit(AVCodecContext *avctx){ static int mpeg_decode_postinit(AVCodecContext *avctx){
@ -1288,19 +1304,7 @@ static int mpeg_decode_postinit(AVCodecContext *avctx){
} }
}//MPEG-2 }//MPEG-2
if(avctx->xvmc_acceleration){ avctx->pix_fmt = mpeg_set_pixelformat(avctx);
avctx->pix_fmt = avctx->get_format(avctx,pixfmt_xvmc_mpg2_420);
}else{
if(s->chroma_format < 2){
avctx->pix_fmt = PIX_FMT_YUV420P;
}else
if(s->chroma_format == 2){
avctx->pix_fmt = PIX_FMT_YUV422P;
}else
if(s->chroma_format > 2){
avctx->pix_fmt = PIX_FMT_YUV444P;
}
}
//until then pix_fmt may be changed right after codec init //until then pix_fmt may be changed right after codec init
if( avctx->pix_fmt == PIX_FMT_XVMC_MPEG2_IDCT ) if( avctx->pix_fmt == PIX_FMT_XVMC_MPEG2_IDCT )
if( avctx->idct_algo == FF_IDCT_AUTO ) if( avctx->idct_algo == FF_IDCT_AUTO )
@ -2069,11 +2073,7 @@ static int vcr2_init_sequence(AVCodecContext *avctx)
avctx->has_b_frames= 0; //true? avctx->has_b_frames= 0; //true?
s->low_delay= 1; s->low_delay= 1;
if(avctx->xvmc_acceleration){ avctx->pix_fmt = mpeg_set_pixelformat(avctx);
avctx->pix_fmt = avctx->get_format(avctx,pixfmt_xvmc_mpg2_420);
}else{
avctx->pix_fmt = PIX_FMT_YUV420P;
}
if( avctx->pix_fmt == PIX_FMT_XVMC_MPEG2_IDCT ) if( avctx->pix_fmt == PIX_FMT_XVMC_MPEG2_IDCT )
if( avctx->idct_algo == FF_IDCT_AUTO ) if( avctx->idct_algo == FF_IDCT_AUTO )