lavc/qsvdec: fix keyframes
MFX_FRAMETYPE_IDR is ORed to the frame type for AVC and HEVC keyframes, and MFX_FRAMETYPE_I is taken as keyframe flag for other codecs when getting the output surface from the SDK, hence we may mark the output frame as keyframe accordingly. Signed-off-by: Haihao Xiang <haihao.xiang@intel.com>
This commit is contained in:
parent
a11122f9c6
commit
dbdd9ccded
@ -931,12 +931,18 @@ static int qsv_decode(AVCodecContext *avctx, QSVContext *q,
|
||||
frame->flags |= AV_FRAME_FLAG_INTERLACED *
|
||||
!(outsurf->Info.PicStruct & MFX_PICSTRUCT_PROGRESSIVE);
|
||||
frame->pict_type = ff_qsv_map_pictype(aframe.frame->dec_info.FrameType);
|
||||
//Key frame is IDR frame is only suitable for H264. For HEVC, IRAPs are key frames.
|
||||
if (avctx->codec_id == AV_CODEC_ID_H264) {
|
||||
|
||||
if (avctx->codec_id == AV_CODEC_ID_H264 ||
|
||||
avctx->codec_id == AV_CODEC_ID_HEVC) {
|
||||
if (aframe.frame->dec_info.FrameType & MFX_FRAMETYPE_IDR)
|
||||
frame->flags |= AV_FRAME_FLAG_KEY;
|
||||
else
|
||||
frame->flags &= ~AV_FRAME_FLAG_KEY;
|
||||
} else {
|
||||
if (aframe.frame->dec_info.FrameType & MFX_FRAMETYPE_I)
|
||||
frame->flags |= AV_FRAME_FLAG_KEY;
|
||||
else
|
||||
frame->flags &= ~AV_FRAME_FLAG_KEY;
|
||||
}
|
||||
frame->crop_left = outsurf->Info.CropX;
|
||||
frame->crop_top = outsurf->Info.CropY;
|
||||
|
Loading…
Reference in New Issue
Block a user