diff mbox series

[FFmpeg-devel,10/11] avfilter/overlay_vulkan: call av_vkfmt_from_pixfmt only one time

Message ID 20211119135248.14518-10-jianhua.wu@intel.com
State Accepted
Commit 999048b6b18bd47a3415721376b5346a651bf785
Headers show
Series [FFmpeg-devel,01/11] avfilter/avgblur_vulkan: check if shader is created with success | expand

Checks

Context Check Description
andriy/make_x86 success Make finished
andriy/make_fate_x86 success Make fate finished
andriy/make_ppc success Make finished
andriy/make_fate_ppc success Make fate finished

Commit Message

Wu Jianhua Nov. 19, 2021, 1:52 p.m. UTC 
Signed-off-by: Wu Jianhua <jianhua.wu@intel.com>
---
 libavfilter/vf_overlay_vulkan.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)
diff mbox series

Patch

diff --git a/libavfilter/vf_overlay_vulkan.c b/libavfilter/vf_overlay_vulkan.c
index 705e92e268..13dde25b22 100644
--- a/libavfilter/vf_overlay_vulkan.c
+++ b/libavfilter/vf_overlay_vulkan.c
@@ -242,9 +242,13 @@  static int process_frames(AVFilterContext *avctx, AVFrame *out_f,
     AVVkFrame *main    = (AVVkFrame *)main_f->data[0];
     AVVkFrame *overlay = (AVVkFrame *)overlay_f->data[0];
 
-    AVHWFramesContext *main_fc = (AVHWFramesContext*)main_f->hw_frames_ctx->data;
+    AVHWFramesContext *main_fc    = (AVHWFramesContext*)main_f->hw_frames_ctx->data;
     AVHWFramesContext *overlay_fc = (AVHWFramesContext*)overlay_f->hw_frames_ctx->data;
 
+    const VkFormat *output_formats     = av_vkfmt_from_pixfmt(s->vkctx.output_format);
+    const VkFormat *main_sw_formats    = av_vkfmt_from_pixfmt(main_fc->sw_format);
+    const VkFormat *overlay_sw_formats = av_vkfmt_from_pixfmt(overlay_fc->sw_format);
+
     /* Update descriptors and init the exec context */
     ff_vk_start_exec_recording(vkctx, s->exec);
     cmd_buf = ff_vk_get_exec_buf(s->exec);
@@ -252,17 +256,17 @@  static int process_frames(AVFilterContext *avctx, AVFrame *out_f,
     for (int i = 0; i < planes; i++) {
         RET(ff_vk_create_imageview(vkctx, s->exec,
                                    &s->main_images[i].imageView, main->img[i],
-                                   av_vkfmt_from_pixfmt(main_fc->sw_format)[i],
+                                   main_sw_formats[i],
                                    ff_comp_identity_map));
 
         RET(ff_vk_create_imageview(vkctx, s->exec,
                                    &s->overlay_images[i].imageView, overlay->img[i],
-                                   av_vkfmt_from_pixfmt(overlay_fc->sw_format)[i],
+                                   overlay_sw_formats[i],
                                    ff_comp_identity_map));
 
         RET(ff_vk_create_imageview(vkctx, s->exec,
                                    &s->output_images[i].imageView, out->img[i],
-                                   av_vkfmt_from_pixfmt(s->vkctx.output_format)[i],
+                                   output_formats[i],
                                    ff_comp_identity_map));
 
         s->main_images[i].imageLayout    = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL;