RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-01-01 04:12:14 +00:00
Code Issues Projects Releases Wiki Activity

avfilter/vulkan: Store format in filter, remove query function

Browse Source 
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt 2021-09-28 00:42:44 +02:00
parent be8bc645b6
commit 4c0adcd07e
6 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavfilter/vf_avgblur_vulkan.c
View File

@ -404,7 +404,7 @@ const AVFilter ff_vf_avgblur_vulkan = {
.uninit = &avgblur_vulkan_uninit, .uninit = &avgblur_vulkan_uninit,
FILTER_INPUTS(avgblur_vulkan_inputs), FILTER_INPUTS(avgblur_vulkan_inputs),
FILTER_OUTPUTS(avgblur_vulkan_outputs), 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, .priv_class = &avgblur_vulkan_class,
.flags_internal = FF_FILTER_FLAG_HWFRAME_AWARE, .flags_internal = FF_FILTER_FLAG_HWFRAME_AWARE,
}; };

2
libavfilter/vf_chromaber_vulkan.c
View File

@ -339,7 +339,7 @@ const AVFilter ff_vf_chromaber_vulkan = {
.uninit = &chromaber_vulkan_uninit, .uninit = &chromaber_vulkan_uninit,
FILTER_INPUTS(chromaber_vulkan_inputs), FILTER_INPUTS(chromaber_vulkan_inputs),
FILTER_OUTPUTS(chromaber_vulkan_outputs), 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, .priv_class = &chromaber_vulkan_class,
.flags_internal = FF_FILTER_FLAG_HWFRAME_AWARE, .flags_internal = FF_FILTER_FLAG_HWFRAME_AWARE,
}; };

2
libavfilter/vf_overlay_vulkan.c
View File

@ -482,7 +482,7 @@ const AVFilter ff_vf_overlay_vulkan = {
.activate = &overlay_vulkan_activate, .activate = &overlay_vulkan_activate,
FILTER_INPUTS(overlay_vulkan_inputs), FILTER_INPUTS(overlay_vulkan_inputs),
FILTER_OUTPUTS(overlay_vulkan_outputs), 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, .priv_class = &overlay_vulkan_class,
.flags_internal = FF_FILTER_FLAG_HWFRAME_AWARE, .flags_internal = FF_FILTER_FLAG_HWFRAME_AWARE,
}; };

2
libavfilter/vf_scale_vulkan.c
View File

@ -530,7 +530,7 @@ const AVFilter ff_vf_scale_vulkan = {
.uninit = &scale_vulkan_uninit, .uninit = &scale_vulkan_uninit,
FILTER_INPUTS(scale_vulkan_inputs), FILTER_INPUTS(scale_vulkan_inputs),
FILTER_OUTPUTS(scale_vulkan_outputs), 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, .priv_class = &scale_vulkan_class,
.flags_internal = FF_FILTER_FLAG_HWFRAME_AWARE, .flags_internal = FF_FILTER_FLAG_HWFRAME_AWARE,
}; };

9
libavfilter/vulkan.c
View File

@ -589,15 +589,6 @@ err:
return AVERROR(ENOMEM); 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, static int vulkan_filter_set_device(AVFilterContext *avctx,
AVBufferRef *device) AVBufferRef *device)
{ {

1
libavfilter/vulkan.h
View File

@ -197,7 +197,6 @@ extern const VkComponentMapping ff_comp_identity_map;
/** /**
* General lavfi IO functions * General lavfi IO functions
*/ */
int ff_vk_filter_query_formats (AVFilterContext *avctx);
int ff_vk_filter_init (AVFilterContext *avctx); int ff_vk_filter_init (AVFilterContext *avctx);
int ff_vk_filter_config_input (AVFilterLink *inlink); int ff_vk_filter_config_input (AVFilterLink *inlink);
int ff_vk_filter_config_output (AVFilterLink *outlink); int ff_vk_filter_config_output (AVFilterLink *outlink);