From a39be6fb20e5efe59bc5824cf67c863057e759cf Mon Sep 17 00:00:00 2001 From: Aiden <68633820+awils27@users.noreply.github.com> Date: Tue, 12 May 2026 20:38:26 +1000 Subject: [PATCH] Alignment --- .../render/runtime/RuntimeRenderScene.cpp | 2 +- .../video/DeckLinkInput.cpp | 15 ++++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/apps/RenderCadenceCompositor/render/runtime/RuntimeRenderScene.cpp b/apps/RenderCadenceCompositor/render/runtime/RuntimeRenderScene.cpp index 1b5e7e2..5530475 100644 --- a/apps/RenderCadenceCompositor/render/runtime/RuntimeRenderScene.cpp +++ b/apps/RenderCadenceCompositor/render/runtime/RuntimeRenderScene.cpp @@ -160,7 +160,7 @@ void RuntimeRenderScene::RenderFrame(uint64_t frameIndex, unsigned width, unsign } // 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. GLuint layerInputTexture = videoInputTexture; std::size_t nextTargetIndex = 0; diff --git a/apps/RenderCadenceCompositor/video/DeckLinkInput.cpp b/apps/RenderCadenceCompositor/video/DeckLinkInput.cpp index b7ab576..e3f63fd 100644 --- a/apps/RenderCadenceCompositor/video/DeckLinkInput.cpp +++ b/apps/RenderCadenceCompositor/video/DeckLinkInput.cpp @@ -189,7 +189,7 @@ void DeckLinkInput::HandleFrameArrived(IDeckLinkVideoInputFrame* inputFrame) mNoInputSourceFrames.fetch_add(1, std::memory_order_relaxed); bool expected = false; 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; } @@ -199,7 +199,7 @@ void DeckLinkInput::HandleFrameArrived(IDeckLinkVideoInputFrame* inputFrame) mUnsupportedFrames.fetch_add(1, std::memory_order_relaxed); bool expected = false; 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; } @@ -209,7 +209,7 @@ void DeckLinkInput::HandleFrameArrived(IDeckLinkVideoInputFrame* inputFrame) mUnsupportedFrames.fetch_add(1, std::memory_order_relaxed); bool expected = false; 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; } @@ -218,7 +218,7 @@ void DeckLinkInput::HandleFrameArrived(IDeckLinkVideoInputFrame* inputFrame) mUnsupportedFrames.fetch_add(1, std::memory_order_relaxed); bool expected = false; 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; } @@ -237,13 +237,14 @@ void DeckLinkInput::HandleFrameArrived(IDeckLinkVideoInputFrame* inputFrame) mSubmitMisses.fetch_add(1, std::memory_order_relaxed); bool expected = false; 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); bool expectedFirstFrame = false; if (mLoggedFirstFrame.compare_exchange_strong(expectedFirstFrame, true, std::memory_order_relaxed)) { - Log( + TryLog( + LogLevel::Log, "decklink-input", 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() { 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)