Message ID | 20200630011841.23025-1-fei.w.wang@intel.com |
---|---|
State | Accepted |
Commit | a17c99026520530b6d5649e4cbae34525d54c438 |
Headers | show |
Series | [FFmpeg-devel,v1] avfilter/tonemap_vaapi: set va parameters filters and numbers | expand |
Context | Check | Description |
---|---|---|
andriy/default | pending | |
andriy/make | success | Make finished |
andriy/make_fate | success | Make fate finished |
> -----Original Message----- > From: ffmpeg-devel <ffmpeg-devel-bounces@ffmpeg.org> On Behalf Of Fei > Wang > Sent: Tuesday, June 30, 2020 09:19 > To: ffmpeg-devel@ffmpeg.org > Cc: Wang, Fei W <fei.w.wang@intel.com> > Subject: [FFmpeg-devel] [PATCH v1] avfilter/tonemap_vaapi: set va parameters > filters and numbers > > This can fill VAProcPipelineParameterBuffer correctly and make the > pipeline works. > > Signed-off-by: Fei Wang <fei.w.wang@intel.com> > --- > libavfilter/vf_tonemap_vaapi.c | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/libavfilter/vf_tonemap_vaapi.c b/libavfilter/vf_tonemap_vaapi.c > index 2f41b90424..9f52590a49 100644 > --- a/libavfilter/vf_tonemap_vaapi.c > +++ b/libavfilter/vf_tonemap_vaapi.c > @@ -296,6 +296,11 @@ static int tonemap_vaapi_filter_frame(AVFilterLink > *inlink, AVFrame *input_frame > if (err < 0) > goto fail; > > + if (vpp_ctx->nb_filter_buffers) { > + params.filters = &vpp_ctx->filter_buffers[0]; > + params.num_filters = vpp_ctx->nb_filter_buffers; > + } > + > err = ff_vaapi_vpp_render_picture(avctx, ¶ms, output_frame); > if (err < 0) > goto fail; This fixed the broken tonemap_vaapi filter, I'll apply it if no objection. Thanks Haihao
> -----Original Message----- > From: ffmpeg-devel <ffmpeg-devel-bounces@ffmpeg.org> On Behalf Of Xiang, > Haihao > Sent: Wednesday, January 12, 2022 5:16 AM > To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org> > Cc: Wang, Fei W <fei.w.wang@intel.com> > Subject: Re: [FFmpeg-devel] [PATCH v1] avfilter/tonemap_vaapi: set va > parameters filters and numbers > > > > -----Original Message----- > > From: ffmpeg-devel <ffmpeg-devel-bounces@ffmpeg.org> On Behalf Of Fei > > Wang > > Sent: Tuesday, June 30, 2020 09:19 > > To: ffmpeg-devel@ffmpeg.org > > Cc: Wang, Fei W <fei.w.wang@intel.com> > > Subject: [FFmpeg-devel] [PATCH v1] avfilter/tonemap_vaapi: set va > parameters > > filters and numbers > > > > This can fill VAProcPipelineParameterBuffer correctly and make the > > pipeline works. > > > > Signed-off-by: Fei Wang <fei.w.wang@intel.com> > > --- > > libavfilter/vf_tonemap_vaapi.c | 5 +++++ > > 1 file changed, 5 insertions(+) > > > > diff --git a/libavfilter/vf_tonemap_vaapi.c > b/libavfilter/vf_tonemap_vaapi.c > > index 2f41b90424..9f52590a49 100644 > > --- a/libavfilter/vf_tonemap_vaapi.c > > +++ b/libavfilter/vf_tonemap_vaapi.c > > @@ -296,6 +296,11 @@ static int tonemap_vaapi_filter_frame(AVFilterLink > > *inlink, AVFrame *input_frame > > if (err < 0) > > goto fail; > > > > + if (vpp_ctx->nb_filter_buffers) { > > + params.filters = &vpp_ctx->filter_buffers[0]; > > + params.num_filters = vpp_ctx->nb_filter_buffers; > > + } > > + > > err = ff_vaapi_vpp_render_picture(avctx, ¶ms, output_frame); > > if (err < 0) > > goto fail; > > This fixed the broken tonemap_vaapi filter, I'll apply it if no objection. LGTM. I have a similar patch. sw
On Wed, 2022-01-12 at 04:29 +0000, Soft Works wrote: > > -----Original Message----- > > From: ffmpeg-devel <ffmpeg-devel-bounces@ffmpeg.org> On Behalf Of Xiang, > > Haihao > > Sent: Wednesday, January 12, 2022 5:16 AM > > To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org> > > Cc: Wang, Fei W <fei.w.wang@intel.com> > > Subject: Re: [FFmpeg-devel] [PATCH v1] avfilter/tonemap_vaapi: set va > > parameters filters and numbers > > > > > > > -----Original Message----- > > > From: ffmpeg-devel <ffmpeg-devel-bounces@ffmpeg.org> On Behalf Of Fei > > > Wang > > > Sent: Tuesday, June 30, 2020 09:19 > > > To: ffmpeg-devel@ffmpeg.org > > > Cc: Wang, Fei W <fei.w.wang@intel.com> > > > Subject: [FFmpeg-devel] [PATCH v1] avfilter/tonemap_vaapi: set va > > > > parameters > > > filters and numbers > > > > > > This can fill VAProcPipelineParameterBuffer correctly and make the > > > pipeline works. > > > > > > Signed-off-by: Fei Wang <fei.w.wang@intel.com> > > > --- > > > libavfilter/vf_tonemap_vaapi.c | 5 +++++ > > > 1 file changed, 5 insertions(+) > > > > > > diff --git a/libavfilter/vf_tonemap_vaapi.c > > > > b/libavfilter/vf_tonemap_vaapi.c > > > index 2f41b90424..9f52590a49 100644 > > > --- a/libavfilter/vf_tonemap_vaapi.c > > > +++ b/libavfilter/vf_tonemap_vaapi.c > > > @@ -296,6 +296,11 @@ static int tonemap_vaapi_filter_frame(AVFilterLink > > > *inlink, AVFrame *input_frame > > > if (err < 0) > > > goto fail; > > > > > > + if (vpp_ctx->nb_filter_buffers) { > > > + params.filters = &vpp_ctx->filter_buffers[0]; > > > + params.num_filters = vpp_ctx->nb_filter_buffers; > > > + } > > > + > > > err = ff_vaapi_vpp_render_picture(avctx, ¶ms, output_frame); > > > if (err < 0) > > > goto fail; > > > > This fixed the broken tonemap_vaapi filter, I'll apply it if no objection. > > LGTM. I have a similar patch. > > sw Applied, thx -Haihao
diff --git a/libavfilter/vf_tonemap_vaapi.c b/libavfilter/vf_tonemap_vaapi.c index 2f41b90424..9f52590a49 100644 --- a/libavfilter/vf_tonemap_vaapi.c +++ b/libavfilter/vf_tonemap_vaapi.c @@ -296,6 +296,11 @@ static int tonemap_vaapi_filter_frame(AVFilterLink *inlink, AVFrame *input_frame if (err < 0) goto fail; + if (vpp_ctx->nb_filter_buffers) { + params.filters = &vpp_ctx->filter_buffers[0]; + params.num_filters = vpp_ctx->nb_filter_buffers; + } + err = ff_vaapi_vpp_render_picture(avctx, ¶ms, output_frame); if (err < 0) goto fail;
This can fill VAProcPipelineParameterBuffer correctly and make the pipeline works. Signed-off-by: Fei Wang <fei.w.wang@intel.com> --- libavfilter/vf_tonemap_vaapi.c | 5 +++++ 1 file changed, 5 insertions(+)