ffmpeg | branch: master | Ivan Uskov <ivan.us...@nablet.com> | Sat Jul 4 15:33:26 2015 +0300| [38402754b97745125b25d38bf525fe46cace9370] | committer: Michael Niedermayer
libavcodec/qsvenc.c: More correct selection of alignment of a frame height depending whether an encoded sequence progressive or not. Signed-off-by: Michael Niedermayer <michae...@gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=38402754b97745125b25d38bf525fe46cace9370 --- libavcodec/qsvenc.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c index bcf3d73..f3008c0 100644 --- a/libavcodec/qsvenc.c +++ b/libavcodec/qsvenc.c @@ -65,18 +65,29 @@ static int init_video_param(AVCodecContext *avctx, QSVEncContext *q) q->param.mfx.BufferSizeInKB = 0; q->param.mfx.FrameInfo.FourCC = MFX_FOURCC_NV12; - q->param.mfx.FrameInfo.Width = FFALIGN(avctx->width, 16); - q->param.mfx.FrameInfo.Height = FFALIGN(avctx->height, 32); q->param.mfx.FrameInfo.CropX = 0; q->param.mfx.FrameInfo.CropY = 0; q->param.mfx.FrameInfo.CropW = avctx->width; q->param.mfx.FrameInfo.CropH = avctx->height; q->param.mfx.FrameInfo.AspectRatioW = avctx->sample_aspect_ratio.num; q->param.mfx.FrameInfo.AspectRatioH = avctx->sample_aspect_ratio.den; - q->param.mfx.FrameInfo.PicStruct = MFX_PICSTRUCT_PROGRESSIVE; q->param.mfx.FrameInfo.ChromaFormat = MFX_CHROMAFORMAT_YUV420; q->param.mfx.FrameInfo.BitDepthLuma = 8; q->param.mfx.FrameInfo.BitDepthChroma = 8; + q->param.mfx.FrameInfo.Width = FFALIGN(avctx->width, 16); + + if (avctx->flags & CODEC_FLAG_INTERLACED_DCT) { + /* A true field layout (TFF or BFF) is not important here, + it will specified later during frame encoding. But it is important + to specify is frame progressive or not because allowed heigh alignment + does depend by this. + */ + q->param.mfx.FrameInfo.PicStruct = MFX_PICSTRUCT_FIELD_TFF; + q->param.mfx.FrameInfo.Height = FFALIGN(avctx->height, 32); + } else { + q->param.mfx.FrameInfo.PicStruct = MFX_PICSTRUCT_PROGRESSIVE; + q->param.mfx.FrameInfo.Height = FFALIGN(avctx->height, 16); + } if (avctx->framerate.den > 0 && avctx->framerate.num > 0) { q->param.mfx.FrameInfo.FrameRateExtN = avctx->framerate.num; _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
