diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2021-09-28 00:42:44 +0200 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2021-10-05 18:58:29 +0200 |
| commit | 4c0adcd07eafa1b051946f6e50f98678efc5a5aa (patch) | |
| tree | daf185f988ecaedf1ecf639893a9fa3b88390f93 /libavfilter | |
| parent | be8bc645b6b63c9bfdc4a4c3e256f3bae5133e2a (diff) | |
avfilter/vulkan: Store format in filter, remove query function
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Diffstat (limited to 'libavfilter')
| -rw-r--r-- | libavfilter/vf_avgblur_vulkan.c | 2 | ||||
| -rw-r--r-- | libavfilter/vf_chromaber_vulkan.c | 2 | ||||
| -rw-r--r-- | libavfilter/vf_overlay_vulkan.c | 2 | ||||
| -rw-r--r-- | libavfilter/vf_scale_vulkan.c | 2 | ||||
| -rw-r--r-- | libavfilter/vulkan.c | 9 | ||||
| -rw-r--r-- | libavfilter/vulkan.h | 1 |
6 files changed, 4 insertions, 14 deletions
diff --git a/libavfilter/vf_avgblur_vulkan.c b/libavfilter/vf_avgblur_vulkan.c index a4d855754f..5e38a80822 100644 --- a/libavfilter/vf_avgblur_vulkan.c +++ b/libavfilter/vf_avgblur_vulkan.c @@ -404,7 +404,7 @@ const AVFilter ff_vf_avgblur_vulkan = { .uninit = &avgblur_vulkan_uninit, FILTER_INPUTS(avgblur_vulkan_inputs), FILTER_OUTPUTS(avgblur_vulkan_outputs), - FILTER_QUERY_FUNC(&ff_vk_filter_query_formats), + FILTER_SINGLE_PIXFMT(AV_PIX_FMT_VULKAN), .priv_class = &avgblur_vulkan_class, .flags_internal = FF_FILTER_FLAG_HWFRAME_AWARE, }; diff --git a/libavfilter/vf_chromaber_vulkan.c b/libavfilter/vf_chromaber_vulkan.c index 87e55a9c4f..9e0926c7c0 100644 --- a/libavfilter/vf_chromaber_vulkan.c +++ b/libavfilter/vf_chromaber_vulkan.c @@ -339,7 +339,7 @@ const AVFilter ff_vf_chromaber_vulkan = { .uninit = &chromaber_vulkan_uninit, FILTER_INPUTS(chromaber_vulkan_inputs), FILTER_OUTPUTS(chromaber_vulkan_outputs), - FILTER_QUERY_FUNC(&ff_vk_filter_query_formats), + FILTER_SINGLE_PIXFMT(AV_PIX_FMT_VULKAN), .priv_class = &chromaber_vulkan_class, .flags_internal = FF_FILTER_FLAG_HWFRAME_AWARE, }; diff --git a/libavfilter/vf_overlay_vulkan.c b/libavfilter/vf_overlay_vulkan.c index 5573e5e57d..4b49878b85 100644 --- a/libavfilter/vf_overlay_vulkan.c +++ b/libavfilter/vf_overlay_vulkan.c @@ -482,7 +482,7 @@ const AVFilter ff_vf_overlay_vulkan = { .activate = &overlay_vulkan_activate, FILTER_INPUTS(overlay_vulkan_inputs), FILTER_OUTPUTS(overlay_vulkan_outputs), - FILTER_QUERY_FUNC(&ff_vk_filter_query_formats), + FILTER_SINGLE_PIXFMT(AV_PIX_FMT_VULKAN), .priv_class = &overlay_vulkan_class, .flags_internal = FF_FILTER_FLAG_HWFRAME_AWARE, }; diff --git a/libavfilter/vf_scale_vulkan.c b/libavfilter/vf_scale_vulkan.c index af9677e46a..2b83170029 100644 --- a/libavfilter/vf_scale_vulkan.c +++ b/libavfilter/vf_scale_vulkan.c @@ -530,7 +530,7 @@ const AVFilter ff_vf_scale_vulkan = { .uninit = &scale_vulkan_uninit, FILTER_INPUTS(scale_vulkan_inputs), FILTER_OUTPUTS(scale_vulkan_outputs), - FILTER_QUERY_FUNC(&ff_vk_filter_query_formats), + FILTER_SINGLE_PIXFMT(AV_PIX_FMT_VULKAN), .priv_class = &scale_vulkan_class, .flags_internal = FF_FILTER_FLAG_HWFRAME_AWARE, }; diff --git a/libavfilter/vulkan.c b/libavfilter/vulkan.c index 337c8d7d5a..e812a3e723 100644 --- a/libavfilter/vulkan.c +++ b/libavfilter/vulkan.c @@ -589,15 +589,6 @@ err: return AVERROR(ENOMEM); } -int ff_vk_filter_query_formats(AVFilterContext *avctx) -{ - static const enum AVPixelFormat pixel_formats[] = { - AV_PIX_FMT_VULKAN, AV_PIX_FMT_NONE, - }; - - return ff_set_common_formats_from_list(avctx, pixel_formats); -} - static int vulkan_filter_set_device(AVFilterContext *avctx, AVBufferRef *device) { diff --git a/libavfilter/vulkan.h b/libavfilter/vulkan.h index f9a4dc5839..d4a03abfe9 100644 --- a/libavfilter/vulkan.h +++ b/libavfilter/vulkan.h @@ -197,7 +197,6 @@ extern const VkComponentMapping ff_comp_identity_map; /** * General lavfi IO functions */ -int ff_vk_filter_query_formats (AVFilterContext *avctx); int ff_vk_filter_init (AVFilterContext *avctx); int ff_vk_filter_config_input (AVFilterLink *inlink); int ff_vk_filter_config_output (AVFilterLink *outlink); |