Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

video encode: Fix tests for implementations with detection of insufficient bitstream buffer range #487

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

video encode: Fix tests for implementations with detection of insufficient bitstream buffer range #487

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ff1e101
video: Fix missing flag in VkVideoEncodeCapabilityFlagsKHR
clemy Sep 12, 2024
03b76c5
video: correctly set dstBufferRange in VkVideoEncodeInfoKHR
clemy Sep 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion external/vulkancts/modules/vulkan/video/vktVideoCapabilitiesTests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -540,7 +540,8 @@ void VideoCapabilitiesQueryTestInstance::validateVideoEncodeCapabilities(
VALIDATE_FIELD_EQUAL(videoEncodeCapabilitiesKHR, videoEncodeCapabilitiesKHRSecond, supportedEncodeFeedbackFlags);

const VkVideoEncodeCapabilityFlagsKHR videoEncodeCapabilityFlags =
VK_VIDEO_ENCODE_CAPABILITY_PRECEDING_EXTERNALLY_ENCODED_BYTES_BIT_KHR;
VK_VIDEO_ENCODE_CAPABILITY_PRECEDING_EXTERNALLY_ENCODED_BYTES_BIT_KHR |
VK_VIDEO_ENCODE_CAPABILITY_INSUFFICIENT_BITSTREAM_BUFFER_RANGE_DETECTION_BIT_KHR;

if ((videoEncodeCapabilitiesKHR.flags & ~videoEncodeCapabilityFlags) != 0)
TCU_FAIL("Undeclared VkVideoEncodeCapabilitiesKHR.flags returned");
Expand Down
7 changes: 4 additions & 3 deletions external/vulkancts/modules/vulkan/video/vktVideoEncodeTests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2258,9 +2258,10 @@ tcu::TestStatus VideoEncodeTestInstance::iterate(void)
pNext = videoEncodePictureInfoPtr;
}

videoEncodeFrameInfos.push_back(getVideoEncodeInfo(
pNext, *encodeBuffer, dstBufferOffset, (*imagePictureResourceVector[srcPictureResourceIdx]),
setupReferenceSlotPtr, refsCount, (refsPool == 0) ? nullptr : referenceSlots));
videoEncodeFrameInfos.push_back(
getVideoEncodeInfo(pNext, *encodeBuffer, dstBufferOffset, encodeBufferSize - dstBufferOffset,
(*imagePictureResourceVector[srcPictureResourceIdx]), setupReferenceSlotPtr,
refsCount, (refsPool == 0) ? nullptr : referenceSlots));

if (!useInlineQueries)
videoDeviceDriver.cmdBeginQuery(encodeCmdBuffer, encodeQueryPool.get(), 1, 0);
Expand Down
3 changes: 2 additions & 1 deletion external/vulkancts/modules/vulkan/video/vktVideoTestUtils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1967,6 +1967,7 @@ de::MovePtr<StdVideoH264PictureParameterSet> getStdVideoH264DecodePictureParamet

de::MovePtr<VkVideoEncodeInfoKHR> getVideoEncodeInfo(const void *pNext, const VkBuffer &dstBuffer,
const VkDeviceSize &dstBufferOffset,
const VkDeviceSize &dstBufferRange,
const VkVideoPictureResourceInfoKHR &srcPictureResource,
const VkVideoReferenceSlotInfoKHR *pSetupReferenceSlot,
const uint32_t &referenceSlotCount,
Expand All @@ -1978,7 +1979,7 @@ de::MovePtr<VkVideoEncodeInfoKHR> getVideoEncodeInfo(const void *pNext, const Vk
static_cast<VkVideoEncodeFlagsKHR>(0), // VkVideoEncodeFlagsKHR flags;
dstBuffer, // VkBuffer dstBuffer;
dstBufferOffset, // VkDeviceSize dstBufferOffset;
0u, // VkDeviceSize dstBufferRange;
dstBufferRange, // VkDeviceSize dstBufferRange;
srcPictureResource, // VkVideoPictureResourceInfoKHR srcPictureResource;
pSetupReferenceSlot, // const VkVideoReferenceSlotInfoKHR* pSetupReferenceSlot;
referenceSlotCount, // uint32_t referenceSlotCount;
Expand Down
1 change: 1 addition & 0 deletions external/vulkancts/modules/vulkan/video/vktVideoTestUtils.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,6 +337,7 @@ de::MovePtr<VkVideoCodingControlInfoKHR> getVideoCodingControlInfo(VkVideoCoding

de::MovePtr<VkVideoEncodeInfoKHR> getVideoEncodeInfo(const void *pNext, const VkBuffer &dstBuffer,
const VkDeviceSize &dstBufferOffset,
const VkDeviceSize &dstBufferRange,
const VkVideoPictureResourceInfoKHR &srcPictureResource,
const VkVideoReferenceSlotInfoKHR *pSetupReferenceSlot,
const uint32_t &referenceSlotCount,
Expand Down