Message ID | 20240306052559.2762518-1-haihao.xiang@intel.com |
---|---|
State | Accepted |
Commit | eb7d019b326b0c34e07f2369f31e8ba266fa666b |
Headers | show |
Series | [FFmpeg-devel] lavfi/vulkan_filter: fix input format | 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 |
Mar 6, 2024, 06:26 by haihao.xiang-at-intel.com@ffmpeg.org: > From: Haihao Xiang <haihao.xiang@intel.com> > > Otherwise s->input_format is always yuv420p. > > This fixes invalid output format for hwframe download in the command > below: > ./ffmpeg -init_hw_device vulkan -f lavfi \ > -i testsrc=duration=1,format=nv12 \ > -vf 'hwupload,format=vulkan,scale_vulkan=1024:768,hwdownload,format=nv12' \ > -f null - > > Signed-off-by: Haihao Xiang <haihao.xiang@intel.com> > --- > libavfilter/vulkan_filter.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/libavfilter/vulkan_filter.c b/libavfilter/vulkan_filter.c > index d3dc2fdacb..cef42eeb4d 100644 > --- a/libavfilter/vulkan_filter.c > +++ b/libavfilter/vulkan_filter.c > @@ -187,6 +187,7 @@ int ff_vk_filter_config_input(AVFilterLink *inlink) > s->input_frames_ref = inlink->hw_frames_ctx; > > /* Defaults */ > + s->input_format = input_frames->sw_format; > s->output_format = input_frames->sw_format; > s->output_width = inlink->w; > s->output_height = inlink->h; > LGTM Thanks
On Do, 2024-03-07 at 05:05 +0100, Lynne wrote: > Mar 6, 2024, 06:26 by haihao.xiang-at-intel.com@ffmpeg.org: > > > From: Haihao Xiang <haihao.xiang@intel.com> > > > > Otherwise s->input_format is always yuv420p. > > > > This fixes invalid output format for hwframe download in the command > > below: > > ./ffmpeg -init_hw_device vulkan -f lavfi \ > > -i testsrc=duration=1,format=nv12 \ > > -vf 'hwupload,format=vulkan,scale_vulkan=1024:768,hwdownload,format=nv12' \ > > -f null - > > > > Signed-off-by: Haihao Xiang <haihao.xiang@intel.com> > > --- > > libavfilter/vulkan_filter.c | 1 + > > 1 file changed, 1 insertion(+) > > > > diff --git a/libavfilter/vulkan_filter.c b/libavfilter/vulkan_filter.c > > index d3dc2fdacb..cef42eeb4d 100644 > > --- a/libavfilter/vulkan_filter.c > > +++ b/libavfilter/vulkan_filter.c > > @@ -187,6 +187,7 @@ int ff_vk_filter_config_input(AVFilterLink *inlink) > > s->input_frames_ref = inlink->hw_frames_ctx; > > > > /* Defaults */ > > + s->input_format = input_frames->sw_format; > > s->output_format = input_frames->sw_format; > > s->output_width = inlink->w; > > s->output_height = inlink->h; > > > > LGTM > Thanks Thanks for reviewing the patch, pushed. BRs Haihao
diff --git a/libavfilter/vulkan_filter.c b/libavfilter/vulkan_filter.c index d3dc2fdacb..cef42eeb4d 100644 --- a/libavfilter/vulkan_filter.c +++ b/libavfilter/vulkan_filter.c @@ -187,6 +187,7 @@ int ff_vk_filter_config_input(AVFilterLink *inlink) s->input_frames_ref = inlink->hw_frames_ctx; /* Defaults */ + s->input_format = input_frames->sw_format; s->output_format = input_frames->sw_format; s->output_width = inlink->w; s->output_height = inlink->h;