Skip to content

WAR for frames that are displayed more than once #113

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

Open
dabrain34 wants to merge 1 commit into
base: main
Choose a base branch
from
+10 −10
Open

WAR for frames that are displayed more than once #113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions common/libs/VkCodecUtils/VkVideoFrameToFile.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,13 +206,14 @@ class VkVideoFrameToFileImpl : public VkVideoFrameOutput {
assert(pOutputBuffer != nullptr);

assert((pFrame->displayWidth >= 0) && (pFrame->displayHeight >= 0));

WaitAndGetStatus(vkDevCtx,
if (pFrame->frameCompleteFence) {
WaitAndGetStatus(vkDevCtx,
*vkDevCtx,
pFrame->frameCompleteFence,
pFrame->queryPool,
pFrame->startQueryId,
pFrame->pictureIndex, false, "frameCompleteFence");
}

VkFormat format = imageResource->GetImageCreateInfo().format;
const VkMpFormatInfo* mpInfo = YcbcrVkFormatInfo(format);
Expand Down
15 changes: 7 additions & 8 deletions vk_video_decoder/libs/VulkanVideoFrameBuffer/VulkanVideoFrameBuffer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@ class VkVideoFrameBuffer : public VulkanVideoFrameBuffer {
, m_perFrameDecodeImageSet()
, m_displayFrames()
, m_queryPool()
, m_ownedByDisplayMask(0)
, m_ownedByDisplay()
, m_frameNumInDisplayOrder(0)
, m_numberParameterUpdates(0)
, m_maxNumImageTypeIdx(0)
Expand Down Expand Up @@ -377,7 +377,9 @@ class VkVideoFrameBuffer : public VulkanVideoFrameBuffer {

DestroyVideoQueries();

m_ownedByDisplayMask = 0;
for (size_t i = 0; i < VulkanVideoFrameBuffer::maxImages; i++) {
m_ownedByDisplay[i] = 0;
}
m_frameNumInDisplayOrder = 0;

m_perFrameDecodeImageSet.Deinit(m_vkDevCtx);
Expand Down Expand Up @@ -511,8 +513,7 @@ class VkVideoFrameBuffer : public VulkanVideoFrameBuffer {
numberofPendingFrames = (int)m_displayFrames.size();
pictureIndex = m_displayFrames.front();
assert((pictureIndex >= 0) && ((uint32_t)pictureIndex < m_perFrameDecodeImageSet.size()));
assert(!(m_ownedByDisplayMask & (1 << pictureIndex)));
m_ownedByDisplayMask |= (1 << pictureIndex);
m_ownedByDisplay[pictureIndex]++;
m_displayFrames.pop();
m_perFrameDecodeImageSet[pictureIndex].m_inDisplayQueue = false;
m_perFrameDecodeImageSet[pictureIndex].m_ownedByConsummer = true;
Expand Down Expand Up @@ -596,10 +597,8 @@ class VkVideoFrameBuffer : public VulkanVideoFrameBuffer {
assert((picId >= 0) && ((uint32_t)picId < m_perFrameDecodeImageSet.size()));

assert(m_perFrameDecodeImageSet[picId].m_decodeOrder == pDecodedFrameRelease->decodeOrder);
assert(m_perFrameDecodeImageSet[picId].m_displayOrder == pDecodedFrameRelease->displayOrder);

assert(m_ownedByDisplayMask & (1 << picId));
m_ownedByDisplayMask &= ~(1 << picId);
m_ownedByDisplay[picId]--;
m_perFrameDecodeImageSet[picId].m_inDecodeQueue = false;
m_perFrameDecodeImageSet[picId].m_ownedByConsummer = false;
m_perFrameDecodeImageSet[picId].Release();
Expand Down Expand Up @@ -770,7 +769,7 @@ class VkVideoFrameBuffer : public VulkanVideoFrameBuffer {
NvPerFrameDecodeImageSet m_perFrameDecodeImageSet;
std::queue<uint8_t> m_displayFrames;
VkQueryPool m_queryPool;
uint32_t m_ownedByDisplayMask;
uint32_t m_ownedByDisplay[VulkanVideoFrameBuffer::maxImages];
int32_t m_frameNumInDisplayOrder;
uint32_t m_numberParameterUpdates;
uint32_t m_maxNumImageTypeIdx : 4;
Expand Down