| Message ID | 20240524052058.1671400-1-haihao.xiang@intel.com |
|---|---|
| State | New |
| Headers | show |
| Series | [FFmpeg-devel,1/2] lavc/qsvdec: fix keyframes | expand |
| Context | Check | Description |
|---|---|---|
| yinshiyou/make_loongarch64 | success | Make finished |
| yinshiyou/make_fate_loongarch64 | success | Make fate finished |
| andriy/make_x86 | success | Make finished |
| andriy/make_fate_x86 | success | Make fate finished |
On Vr, 2024-05-24 at 13:20 +0800, Xiang, Haihao wrote: > From: Haihao Xiang <haihao.xiang@intel.com> > > 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> > --- > libavcodec/qsvdec.c | 10 ++++++++-- > 1 file changed, 8 insertions(+), 2 deletions(-) > > diff --git a/libavcodec/qsvdec.c b/libavcodec/qsvdec.c > index df0d49bc10..6ffd498456 100644 > --- a/libavcodec/qsvdec.c > +++ b/libavcodec/qsvdec.c > @@ -885,12 +885,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; > } > > /* update the surface properties */ Will apply, -Haihao
diff --git a/libavcodec/qsvdec.c b/libavcodec/qsvdec.c index df0d49bc10..6ffd498456 100644 --- a/libavcodec/qsvdec.c +++ b/libavcodec/qsvdec.c @@ -885,12 +885,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; } /* update the surface properties */