From 200484a84b6de27670ed1bfe554e1982b87f997b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADctor=20Manuel=20J=C3=A1quez=20Leal?=
 <vjaquez@igalia.com>
Date: Thu, 19 Sep 2024 12:47:17 +0200
Subject: [PATCH] vkencoder-private: shuffle down VkVideoBeginCodingInfoKHR
 initialization

to make it more cohesive

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/8007>
---
 .../gst/vulkan/gstvkencoder-private.c         | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/subprojects/gst-plugins-bad/gst-libs/gst/vulkan/gstvkencoder-private.c b/subprojects/gst-plugins-bad/gst-libs/gst/vulkan/gstvkencoder-private.c
index c125cb65c0..6d59188e30 100644
--- a/subprojects/gst-plugins-bad/gst-libs/gst/vulkan/gstvkencoder-private.c
+++ b/subprojects/gst-plugins-bad/gst-libs/gst/vulkan/gstvkencoder-private.c
@@ -953,14 +953,7 @@ gst_vulkan_encoder_encode (GstVulkanEncoder * self, GstVideoInfo * info,
   if (!gst_vulkan_operation_begin (priv->exec, &err))
     goto bail;
 
-  /* Prepare the encoding scope by flling the VkVideoBeginCodingInfoKHR structure */
   /* *INDENT-OFF* */
-  begin_coding = (VkVideoBeginCodingInfoKHR) {
-    .sType = VK_STRUCTURE_TYPE_VIDEO_BEGIN_CODING_INFO_KHR,
-    .pNext = NULL,
-    .videoSession = priv->session.session->handle,
-    .videoSessionParameters = priv->session_params->handle,
-  };
   coding_ctrl = (VkVideoCodingControlInfoKHR) {
     .sType = VK_STRUCTURE_TYPE_VIDEO_CODING_CONTROL_INFO_KHR,
   };
@@ -1015,8 +1008,16 @@ gst_vulkan_encoder_encode (GstVulkanEncoder * self, GstVideoInfo * info,
   ref_slots[nb_refs].slotIndex = -1;
 
   /* Setup the begin coding structure using the reference slots */
-  begin_coding.referenceSlotCount = nb_refs + 1;
-  begin_coding.pReferenceSlots = ref_slots;
+  /* *INDENT-OFF* */
+  begin_coding = (VkVideoBeginCodingInfoKHR) {
+    .sType = VK_STRUCTURE_TYPE_VIDEO_BEGIN_CODING_INFO_KHR,
+    .pNext = NULL,
+    .videoSession = priv->session.session->handle,
+    .videoSessionParameters = priv->session_params->handle,
+    .referenceSlotCount = nb_refs + 1,
+    .pReferenceSlots = ref_slots,
+  };
+  /* *INDENT-ON* */
 
   cmd_buf = priv->exec->cmd_buf;
   priv->vk.CmdBeginVideoCoding (cmd_buf->cmd, &begin_coding);