[FFmpeg-cvslog] avutil/hwcontext_vulkan: fixed incorrect memory offset

[Wu Jianhua]

ffmpeg | branch: release/5.0 | Wu Jianhua <jianhua.wu at intel.com> | Wed Jan  5 14:33:30 2022 +0800| [b4d254f2e690ad03cd6a0b15161742ec26c97583] | committer: Lynne

avutil/hwcontext_vulkan: fixed incorrect memory offset

This commit fixed hwupload in Vulkan:

ffmpeg -init_hw_device vulkan -i test.jpg -vf hwupload,hwdownload,format=yuv420p -y out.jpg

Signed-off-by: Wu Jianhua <jianhua.wu at intel.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b4d254f2e690ad03cd6a0b15161742ec26c97583
---

 libavutil/hwcontext_vulkan.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/libavutil/hwcontext_vulkan.c b/libavutil/hwcontext_vulkan.c
index e90edea111..60a6cf6a91 100644
--- a/libavutil/hwcontext_vulkan.c
+++ b/libavutil/hwcontext_vulkan.c
@@ -1872,12 +1872,14 @@ static int alloc_bind_mem(AVHWFramesContext *hwfc, AVVkFrame *f,
 
         f->size[0] = cont_memory_requirements.size;
 
-        for (int i = 0; i < planes; i++) {
-            bind_info[i].sType  = VK_STRUCTURE_TYPE_BIND_IMAGE_MEMORY_INFO;
-            bind_info[i].image  = f->img[i];
-            bind_info[i].memory = f->mem[0];
-            bind_info[i].memoryOffset = !i ? 0 : cont_mem_size_list[i - 1];
+        for (int i = 0, offset = 0; i < planes; i++) {
+            bind_info[i].sType        = VK_STRUCTURE_TYPE_BIND_IMAGE_MEMORY_INFO;
+            bind_info[i].image        = f->img[i];
+            bind_info[i].memory       = f->mem[0];
+            bind_info[i].memoryOffset = offset;
+
             f->offset[i] = bind_info[i].memoryOffset;
+            offset += cont_mem_size_list[i];
         }
     }