Changeset 108358 in vbox

Timestamp:

Feb 24, 2025 4:36:40 PM (8 weeks ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

167718

Message:

libs/dxvk-2.3.1: Video decode: cleanups. bugref:10529

File:

• trunk/src/libs/dxvk-2.3.1/src/dxvk/dxvk_video_decoder.cpp (modified) (9 diffs)

trunk/src/libs/dxvk-2.3.1/src/dxvk/dxvk_video_decoder.cpp

@@ -769 +769 @@
 
     /* Reference pictures and the destination slot to be bound for video decoding. */
+    std::vector<VkVideoDecodeH264DpbSlotInfoKHR> h264DpbSlotInfo(maxRefSlotsCount + 1);
     std::vector<VkVideoPictureResourceInfoKHR> pictureResourceInfo(maxRefSlotsCount + 1);
     std::vector<VkVideoReferenceSlotInfoKHR> referenceSlotsInfo(maxRefSlotsCount + 1);
@@ -787 +788 @@
         continue;
       }
+
+      h264DpbSlotInfo[refSlotsCount] =
+        { VK_STRUCTURE_TYPE_VIDEO_DECODE_H264_DPB_SLOT_INFO_KHR };
+      h264DpbSlotInfo[refSlotsCount].pStdReferenceInfo = &m_DPB.slots[dpbSlotIndex].stdRefInfo;
 
       pictureResourceInfo[refSlotsCount] =
@@ -796 +801 @@
 
       referenceSlotsInfo[refSlotsCount] =
-        { VK_STRUCTURE_TYPE_VIDEO_REFERENCE_SLOT_INFO_KHR };
+        { VK_STRUCTURE_TYPE_VIDEO_REFERENCE_SLOT_INFO_KHR, &h264DpbSlotInfo[refSlotsCount] };
       referenceSlotsInfo[refSlotsCount].slotIndex         = dpbSlotIndex;
       referenceSlotsInfo[refSlotsCount].pPictureResource  = &pictureResourceInfo[refSlotsCount];
@@ -804 +809 @@
 
     /* Destination picture. */
+    h264DpbSlotInfo[refSlotsCount] =
+      { VK_STRUCTURE_TYPE_VIDEO_DECODE_H264_DPB_SLOT_INFO_KHR };
+    h264DpbSlotInfo[refSlotsCount].pStdReferenceInfo = &dstDPBSlot.stdRefInfo;
+
     pictureResourceInfo[refSlotsCount] =
       { VK_STRUCTURE_TYPE_VIDEO_PICTURE_RESOURCE_INFO_KHR };
@@ -809 +818 @@
     pictureResourceInfo[refSlotsCount].codedExtent      = { m_sampleWidth, m_sampleHeight };
     pictureResourceInfo[refSlotsCount].baseArrayLayer   = 0; /* "relative to the image subresource range" of the view */
-    pictureResourceInfo[refSlotsCount].imageViewBinding = m_DPB.slots[dstSlotIndex].imageView->handle();
+    pictureResourceInfo[refSlotsCount].imageViewBinding = dstDPBSlot.imageView->handle();
 
     referenceSlotsInfo[refSlotsCount] =
-      { VK_STRUCTURE_TYPE_VIDEO_REFERENCE_SLOT_INFO_KHR };
+      { VK_STRUCTURE_TYPE_VIDEO_REFERENCE_SLOT_INFO_KHR, &h264DpbSlotInfo[refSlotsCount] };
     referenceSlotsInfo[refSlotsCount].slotIndex         = -1;
     referenceSlotsInfo[refSlotsCount].pPictureResource  = &pictureResourceInfo[refSlotsCount];
@@ -851 +860 @@
 
     /*
-     * Setup "active reference pictures."
-     */
-    /* Reuse first refFramesCount elements in pictureResourceInfo and referenceSlotsInfo.
-     * Add h264DpbSlotInfo to referenceSlotsInfo.
-     */
-    /* VkVideoReferenceSlotInfoKHR refSlotInfo[idxRefSlot].pNext */
-    std::vector<VkVideoDecodeH264DpbSlotInfoKHR> h264DpbSlotInfo(refSlotsCount);
-
-    for (uint32_t i = 0; i < refSlotsCount; ++i) {
-      const DxvkRefFrameInfo& r = parms.refFrames[i];
-
-      StdVideoDecodeH264ReferenceInfo& stdRefInfo = m_DPB.slots[referenceSlotsInfo[i].slotIndex].stdRefInfo;
-
-      h264DpbSlotInfo[i] =
-        { VK_STRUCTURE_TYPE_VIDEO_DECODE_H264_DPB_SLOT_INFO_KHR };
-      h264DpbSlotInfo[i].pStdReferenceInfo = &stdRefInfo;
-
-      referenceSlotsInfo[i].pNext = &h264DpbSlotInfo[i];
-    }
-
-    /*
      * Setup video decoding parameters 'decodeInfo' (VkVideoDecodeInfoKHR).
-     */
+     *
+     * Reuse first refFramesCount elements in referenceSlotsInfo as pReferenceSlots for decodeVideo.
+     * The last element is the destination picture for pSetupReferenceSlot.
+     */
+
+    /* Update the destination DPB slot index. It was set to -1 for beginVideoCoding above. */
+    referenceSlotsInfo[refSlotsCount].slotIndex = dstSlotIndex;
+
     /* VkVideoDecodeInfoKHR decodeInfo.pNext */
     VkVideoDecodeH264PictureInfoKHR h264PictureInfo =
@@ -880 +875 @@
     h264PictureInfo.sliceCount      = parms.sliceOffsets.size();
     h264PictureInfo.pSliceOffsets   = parms.sliceOffsets.data();
-
-    /* VkVideoReferenceSlotInfoKHR dstSlotInfo.pNext */
-    VkVideoDecodeH264DpbSlotInfoKHR dstH264DpbSlotInfo =
-      { VK_STRUCTURE_TYPE_VIDEO_DECODE_H264_DPB_SLOT_INFO_KHR };
-    dstH264DpbSlotInfo.pStdReferenceInfo    = &dstDPBSlot.stdRefInfo;
-
-    /* VkVideoReferenceSlotInfoKHR  dstSlotInfo.pPictureResource */
-    VkVideoPictureResourceInfoKHR dstPictureResourceInfo =
-      { VK_STRUCTURE_TYPE_VIDEO_PICTURE_RESOURCE_INFO_KHR };
-    dstPictureResourceInfo.codedOffset      = { 0, 0 };
-    dstPictureResourceInfo.codedExtent      = { m_sampleWidth, m_sampleHeight };
-    dstPictureResourceInfo.baseArrayLayer   = 0; /* "relative to the image subresource range" of the view */
-    dstPictureResourceInfo.imageViewBinding = dstDPBSlot.imageView->handle();
-
-    /* VkVideoDecodeInfoKHR decodeInfo.pSetupReferenceSlot */
-    VkVideoReferenceSlotInfoKHR dstSlotInfo =
-      { VK_STRUCTURE_TYPE_VIDEO_REFERENCE_SLOT_INFO_KHR, &dstH264DpbSlotInfo };
-    dstSlotInfo.slotIndex                   = dstSlotIndex;
-    dstSlotInfo.pPictureResource            = &dstPictureResourceInfo;
 
     VkVideoDecodeInfoKHR decodeInfo =
@@ -920 +896 @@
       decodeInfo.dstPictureResource.imageViewBinding = dstDPBSlot.imageView->handle();
     }
-    decodeInfo.pSetupReferenceSlot = &dstSlotInfo;
+    decodeInfo.pSetupReferenceSlot = &referenceSlotsInfo[refSlotsCount];
     decodeInfo.referenceSlotCount  = refSlotsCount;
     decodeInfo.pReferenceSlots     = referenceSlotsInfo.data();
@@ -932 +908 @@
         ", view=", s.pPictureResource->imageViewBinding));
     }
-    Logger::info(str::format("VREF:  dst: slotIndex=", dstSlotInfo.slotIndex,
-      ", FrameNum=", dstH264DpbSlotInfo.pStdReferenceInfo->FrameNum,
+    Logger::info(str::format("VREF:  dst: slotIndex=", dstSlotIndex,
+      ", FrameNum=", dstDPBSlot.stdRefInfo.FrameNum,
       ", is_ref=", parms.stdH264PictureInfo.flags.is_reference,
-      ", view=", dstSlotInfo.pPictureResource->imageViewBinding));
+      ", view=", dstDPBSlot.imageView->handle()));
 #endif