| Message ID | 20230729033538.1731-1-jamrial@gmail.com |
|---|---|
| State | Accepted |
| Commit | 075dfc271bb78c9c179360d848f746ce76660876 |
| Headers | show |
| Series | [FFmpeg-devel] avfilter/qsvvpp: remove usage of deprecated fields | 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 Sa, 2023-07-29 at 00:35 -0300, James Almer wrote: > Added by mistake in 88b3841149b9f41d6c5ec7930dcd5c6caf28b198. > > Signed-off-by: James Almer <jamrial@gmail.com> > --- > libavfilter/qsvvpp.c | 9 +++++++-- > 1 file changed, 7 insertions(+), 2 deletions(-) > > diff --git a/libavfilter/qsvvpp.c b/libavfilter/qsvvpp.c > index a03de05d9c..2833703891 100644 > --- a/libavfilter/qsvvpp.c > +++ b/libavfilter/qsvvpp.c > @@ -540,14 +540,19 @@ static QSVFrame *query_frame(QSVVPPContext *s, > AVFilterLink *outlink, const AVFr > mfxExtBuffer *extbuf = s->vpp_param.ExtParam[i]; > > if (extbuf->BufferId == MFX_EXTBUFF_VPP_DEINTERLACING) { > +#if FF_API_INTERLACED_FRAME > +FF_DISABLE_DEPRECATION_WARNINGS > out_frame->frame->interlaced_frame = 0; > +FF_ENABLE_DEPRECATION_WARNINGS > +#endif > + out_frame->frame->flags &= ~AV_FRAME_FLAG_INTERLACED; > break; > } > } > > out_frame->surface.Info.PicStruct = > - !out_frame->frame->interlaced_frame ? MFX_PICSTRUCT_PROGRESSIVE : > - (out_frame->frame->top_field_first ? MFX_PICSTRUCT_FIELD_TFF : > + !(out_frame->frame->flags & AV_FRAME_FLAG_INTERLACED) ? > MFX_PICSTRUCT_PROGRESSIVE : > + ((out_frame->frame->flags & AV_FRAME_FLAG_TOP_FIELD_FIRST) ? > MFX_PICSTRUCT_FIELD_TFF : > MFX_PICSTRUCT_FIELD_BFF); > > return out_frame; LGTM, thanks for fixing this! - Haihao
diff --git a/libavfilter/qsvvpp.c b/libavfilter/qsvvpp.c index a03de05d9c..2833703891 100644 --- a/libavfilter/qsvvpp.c +++ b/libavfilter/qsvvpp.c @@ -540,14 +540,19 @@ static QSVFrame *query_frame(QSVVPPContext *s, AVFilterLink *outlink, const AVFr mfxExtBuffer *extbuf = s->vpp_param.ExtParam[i]; if (extbuf->BufferId == MFX_EXTBUFF_VPP_DEINTERLACING) { +#if FF_API_INTERLACED_FRAME +FF_DISABLE_DEPRECATION_WARNINGS out_frame->frame->interlaced_frame = 0; +FF_ENABLE_DEPRECATION_WARNINGS +#endif + out_frame->frame->flags &= ~AV_FRAME_FLAG_INTERLACED; break; } } out_frame->surface.Info.PicStruct = - !out_frame->frame->interlaced_frame ? MFX_PICSTRUCT_PROGRESSIVE : - (out_frame->frame->top_field_first ? MFX_PICSTRUCT_FIELD_TFF : + !(out_frame->frame->flags & AV_FRAME_FLAG_INTERLACED) ? MFX_PICSTRUCT_PROGRESSIVE : + ((out_frame->frame->flags & AV_FRAME_FLAG_TOP_FIELD_FIRST) ? MFX_PICSTRUCT_FIELD_TFF : MFX_PICSTRUCT_FIELD_BFF); return out_frame;
Added by mistake in 88b3841149b9f41d6c5ec7930dcd5c6caf28b198. Signed-off-by: James Almer <jamrial@gmail.com> --- libavfilter/qsvvpp.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)