Alignment
All checks were successful
CI / React UI Build (push) Successful in 10s
CI / Native Windows Build And Tests (push) Successful in 2m59s
CI / Windows Release Package (push) Has been skipped

This commit is contained in:
Aiden
2026-05-12 20:38:26 +10:00
parent 0a1fe440d9
commit a39be6fb20
2 changed files with 9 additions and 8 deletions

View File

@@ -160,7 +160,7 @@ void RuntimeRenderScene::RenderFrame(uint64_t frameIndex, unsigned width, unsign
} }
// Shader source contract: // Shader source contract:
// - gVideoInput is the raw/latest input texture for every layer in the stack. // - gVideoInput is the decoded latest input texture for every layer in the stack.
// - gLayerInput starts as gVideoInput for the first layer, then becomes the previous layer output. // - gLayerInput starts as gVideoInput for the first layer, then becomes the previous layer output.
GLuint layerInputTexture = videoInputTexture; GLuint layerInputTexture = videoInputTexture;
std::size_t nextTargetIndex = 0; std::size_t nextTargetIndex = 0;

View File

@@ -189,7 +189,7 @@ void DeckLinkInput::HandleFrameArrived(IDeckLinkVideoInputFrame* inputFrame)
mNoInputSourceFrames.fetch_add(1, std::memory_order_relaxed); mNoInputSourceFrames.fetch_add(1, std::memory_order_relaxed);
bool expected = false; bool expected = false;
if (mLoggedNoInputSource.compare_exchange_strong(expected, true, std::memory_order_relaxed)) if (mLoggedNoInputSource.compare_exchange_strong(expected, true, std::memory_order_relaxed))
LogWarning("decklink-input", "DeckLink input callback reports no input source."); TryLog(LogLevel::Warning, "decklink-input", "DeckLink input callback reports no input source.");
return; return;
} }
@@ -199,7 +199,7 @@ void DeckLinkInput::HandleFrameArrived(IDeckLinkVideoInputFrame* inputFrame)
mUnsupportedFrames.fetch_add(1, std::memory_order_relaxed); mUnsupportedFrames.fetch_add(1, std::memory_order_relaxed);
bool expected = false; bool expected = false;
if (mLoggedUnsupportedFrame.compare_exchange_strong(expected, true, std::memory_order_relaxed)) if (mLoggedUnsupportedFrame.compare_exchange_strong(expected, true, std::memory_order_relaxed))
LogWarning("decklink-input", "DeckLink input frame dimensions do not match the configured mailbox."); TryLog(LogLevel::Warning, "decklink-input", "DeckLink input frame dimensions do not match the configured mailbox.");
return; return;
} }
@@ -209,7 +209,7 @@ void DeckLinkInput::HandleFrameArrived(IDeckLinkVideoInputFrame* inputFrame)
mUnsupportedFrames.fetch_add(1, std::memory_order_relaxed); mUnsupportedFrames.fetch_add(1, std::memory_order_relaxed);
bool expected = false; bool expected = false;
if (mLoggedUnsupportedFrame.compare_exchange_strong(expected, true, std::memory_order_relaxed)) if (mLoggedUnsupportedFrame.compare_exchange_strong(expected, true, std::memory_order_relaxed))
LogWarning("decklink-input", "DeckLink input frame does not expose IDeckLinkVideoBuffer."); TryLog(LogLevel::Warning, "decklink-input", "DeckLink input frame does not expose IDeckLinkVideoBuffer.");
return; return;
} }
@@ -218,7 +218,7 @@ void DeckLinkInput::HandleFrameArrived(IDeckLinkVideoInputFrame* inputFrame)
mUnsupportedFrames.fetch_add(1, std::memory_order_relaxed); mUnsupportedFrames.fetch_add(1, std::memory_order_relaxed);
bool expected = false; bool expected = false;
if (mLoggedUnsupportedFrame.compare_exchange_strong(expected, true, std::memory_order_relaxed)) if (mLoggedUnsupportedFrame.compare_exchange_strong(expected, true, std::memory_order_relaxed))
LogWarning("decklink-input", "DeckLink input frame buffer could not be opened for read access."); TryLog(LogLevel::Warning, "decklink-input", "DeckLink input frame buffer could not be opened for read access.");
return; return;
} }
@@ -237,13 +237,14 @@ void DeckLinkInput::HandleFrameArrived(IDeckLinkVideoInputFrame* inputFrame)
mSubmitMisses.fetch_add(1, std::memory_order_relaxed); mSubmitMisses.fetch_add(1, std::memory_order_relaxed);
bool expected = false; bool expected = false;
if (mLoggedSubmitMiss.compare_exchange_strong(expected, true, std::memory_order_relaxed)) if (mLoggedSubmitMiss.compare_exchange_strong(expected, true, std::memory_order_relaxed))
LogWarning("decklink-input", "DeckLink input frame could not be submitted to InputFrameMailbox."); TryLog(LogLevel::Warning, "decklink-input", "DeckLink input frame could not be submitted to InputFrameMailbox.");
} }
mCapturedFrames.fetch_add(1, std::memory_order_relaxed); mCapturedFrames.fetch_add(1, std::memory_order_relaxed);
bool expectedFirstFrame = false; bool expectedFirstFrame = false;
if (mLoggedFirstFrame.compare_exchange_strong(expectedFirstFrame, true, std::memory_order_relaxed)) if (mLoggedFirstFrame.compare_exchange_strong(expectedFirstFrame, true, std::memory_order_relaxed))
{ {
Log( TryLog(
LogLevel::Log,
"decklink-input", "decklink-input",
std::string("First DeckLink ") + (mCapturePixelFormat == bmdFormat8BitBGRA ? "BGRA8" : "UYVY8 raw") + " input frame submitted to InputFrameMailbox."); std::string("First DeckLink ") + (mCapturePixelFormat == bmdFormat8BitBGRA ? "BGRA8" : "UYVY8 raw") + " input frame submitted to InputFrameMailbox.");
} }
@@ -254,7 +255,7 @@ void DeckLinkInput::HandleFrameArrived(IDeckLinkVideoInputFrame* inputFrame)
void DeckLinkInput::HandleFormatChanged() void DeckLinkInput::HandleFormatChanged()
{ {
mUnsupportedFrames.fetch_add(1, std::memory_order_relaxed); mUnsupportedFrames.fetch_add(1, std::memory_order_relaxed);
LogWarning("decklink-input", "DeckLink input format changed; input edge does not auto-switch formats yet."); TryLog(LogLevel::Warning, "decklink-input", "DeckLink input format changed; input edge does not auto-switch formats yet.");
} }
bool DeckLinkInput::DiscoverInput(const DeckLinkInputConfig& config, std::string& error) bool DeckLinkInput::DiscoverInput(const DeckLinkInputConfig& config, std::string& error)