Revert "Video backend"

This reverts commit 4ffbb97abf.

apps/LoopThroughWithOpenGLCompositing/gl/OpenGLComposite.cpp

@@ -1,3 +1,5 @@
+#include "DeckLinkDisplayMode.h"
+#include "DeckLinkSession.h"
 #include "OpenGLComposite.h"
 #include "GLExtensions.h"
 #include "GlRenderConstants.h"
@@ -8,7 +10,6 @@
 #include "PngScreenshotWriter.h"
 #include "RuntimeServices.h"
 #include "ShaderBuildQueue.h"
-#include "VideoIOBackendFactory.h"
 
 #include <algorithm>
 #include <chrono>
@@ -22,6 +23,7 @@
 
 OpenGLComposite::OpenGLComposite(HWND hWnd, HDC hDC, HGLRC hRC) :
 	hGLWnd(hWnd), hGLDC(hDC), hGLRC(hRC),
+	mVideoIO(std::make_unique<DeckLinkSession>()),
 	mRenderer(std::make_unique<OpenGLRenderer>()),
 	mUseCommittedLayerStates(false),
 	mScreenshotRequested(false)
@@ -35,7 +37,7 @@ OpenGLComposite::OpenGLComposite(HWND hWnd, HDC hDC, HGLRC hRC) :
 		[this]() { ProcessScreenshotRequest(); },
 		[this]() { paintGL(); });
 	mVideoIOBridge = std::make_unique<OpenGLVideoIOBridge>(
-		nullptr,
+		*mVideoIO,
 		*mRenderer,
 		*mRenderPipeline,
 		*mRuntimeHost,
@@ -54,15 +56,20 @@ OpenGLComposite::~OpenGLComposite()
 		mRuntimeServices->Stop();
 	if (mShaderBuildQueue)
 		mShaderBuildQueue->Stop();
-	if (mVideoIO)
-		mVideoIO->ReleaseResources();
+	mVideoIO->ReleaseResources();
 	mRenderer->DestroyResources();
 
 	DeleteCriticalSection(&pMutex);
 }
 
-bool OpenGLComposite::InitializeVideoIO()
+bool OpenGLComposite::InitDeckLink()
 {
+	return InitVideoIO();
+}
+
+bool OpenGLComposite::InitVideoIO()
+{
+	VideoFormatSelection		videoModes;
 	std::string						initFailureReason;
 
 	if (mRuntimeHost && mRuntimeHost->GetRepoRoot().empty())
@@ -75,31 +82,31 @@ bool OpenGLComposite::InitializeVideoIO()
 		}
 	}
 
-	if (!mRuntimeHost)
+	if (mRuntimeHost)
 	{
-		initFailureReason = "Runtime host is not available.";
-		MessageBoxA(NULL, initFailureReason.c_str(), "Video I/O initialization failed", MB_OK | MB_ICONERROR);
-		return false;
+		if (!ResolveConfiguredVideoFormats(
+			mRuntimeHost->GetInputVideoFormat(),
+			mRuntimeHost->GetInputFrameRate(),
+			mRuntimeHost->GetOutputVideoFormat(),
+			mRuntimeHost->GetOutputFrameRate(),
+			videoModes,
+			initFailureReason))
+		{
+			MessageBoxA(NULL, initFailureReason.c_str(), "DeckLink mode configuration error", MB_OK);
+			return false;
+		}
 	}
 
-	const VideoIOConfiguration videoIOConfig = mRuntimeHost->GetVideoIOConfiguration();
-	mVideoIO = CreateVideoIODevice(videoIOConfig.backendId, initFailureReason);
-	if (!mVideoIO)
-	{
-		MessageBoxA(NULL, initFailureReason.c_str(), "Video I/O initialization failed", MB_OK | MB_ICONERROR);
-		return false;
-	}
-	mVideoIOBridge->SetVideoIODevice(mVideoIO.get());
-
-	if (!mVideoIO->DiscoverDevicesAndModes(videoIOConfig, initFailureReason))
+	if (!mVideoIO->DiscoverDevicesAndModes(videoModes, initFailureReason))
 	{
 		const char* title = initFailureReason == "Please install the Blackmagic DeckLink drivers to use the features of this application."
-			? "This application requires the selected video I/O drivers installed."
-			: "Video I/O initialization failed";
+			? "This application requires the DeckLink drivers installed."
+			: "DeckLink initialization failed";
 		MessageBoxA(NULL, initFailureReason.c_str(), title, MB_OK | MB_ICONERROR);
 		return false;
 	}
-	if (!mVideoIO->SelectPreferredFormats(videoIOConfig, initFailureReason))
+	const bool outputAlphaRequired = mRuntimeHost && mRuntimeHost->ExternalKeyingEnabled();
+	if (!mVideoIO->SelectPreferredFormats(videoModes, outputAlphaRequired, initFailureReason))
 		goto error;
 
 	if (! CheckOpenGLExtensions())
@@ -114,9 +121,9 @@ bool OpenGLComposite::InitializeVideoIO()
 		goto error;
 	}
 
-	PublishVideoIOStatus(mVideoIO->DeviceName().empty()
-		? "Video I/O output device selected."
-		: ("Selected output device: " + mVideoIO->DeviceName()));
+	PublishVideoIOStatus(mVideoIO->OutputModelName().empty()
+		? "DeckLink output device selected."
+		: ("Selected output device: " + mVideoIO->OutputModelName()));
 
 	// Resize window to match output video frame, but scale large formats down by half for viewing.
 	if (mVideoIO->OutputFrameWidth() < 1920)
@@ -124,7 +131,7 @@ bool OpenGLComposite::InitializeVideoIO()
 	else
 		resizeWindow(mVideoIO->OutputFrameWidth() / 2, mVideoIO->OutputFrameHeight() / 2);
 
-	if (!mVideoIO->ConfigureInput([this](const VideoIOFrame& frame) { mVideoIOBridge->VideoFrameArrived(frame); }, initFailureReason))
+	if (!mVideoIO->ConfigureInput([this](const VideoIOFrame& frame) { mVideoIOBridge->VideoFrameArrived(frame); }, videoModes.input, initFailureReason))
 	{
 		goto error;
 	}
@@ -133,7 +140,7 @@ bool OpenGLComposite::InitializeVideoIO()
 		mRuntimeHost->SetSignalStatus(false, mVideoIO->InputFrameWidth(), mVideoIO->InputFrameHeight(), mVideoIO->InputDisplayModeName());
 	}
 
-	if (!mVideoIO->ConfigureOutput([this](const VideoIOCompletion& completion) { mVideoIOBridge->PlayoutFrameCompleted(completion); }, initFailureReason))
+	if (!mVideoIO->ConfigureOutput([this](const VideoIOCompletion& completion) { mVideoIOBridge->PlayoutFrameCompleted(completion); }, videoModes.output, mRuntimeHost && mRuntimeHost->ExternalKeyingEnabled(), initFailureReason))
 	{
 		goto error;
 	}
@@ -144,16 +151,13 @@ bool OpenGLComposite::InitializeVideoIO()
 
 error:
 	if (!initFailureReason.empty())
-		MessageBoxA(NULL, initFailureReason.c_str(), "Video I/O initialization failed", MB_OK | MB_ICONERROR);
+		MessageBoxA(NULL, initFailureReason.c_str(), "DeckLink initialization failed", MB_OK | MB_ICONERROR);
 	mVideoIO->ReleaseResources();
 	return false;
 }
 
 void OpenGLComposite::paintGL()
 {
-	if (!mVideoIO)
-		return;
-
 	if (!TryEnterCriticalSection(&pMutex))
 	{
 		ValidateRect(hGLWnd, NULL);
@@ -183,13 +187,21 @@ void OpenGLComposite::resizeWindow(int width, int height)
 
 void OpenGLComposite::PublishVideoIOStatus(const std::string& statusMessage)
 {
-	if (!mRuntimeHost || !mVideoIO)
+	if (!mRuntimeHost)
 		return;
 
 	if (!statusMessage.empty())
 		mVideoIO->SetStatusMessage(statusMessage);
 
-	mRuntimeHost->SetVideoIOStatus(mVideoIO->State());
+	mRuntimeHost->SetVideoIOStatus(
+		"decklink",
+		mVideoIO->OutputModelName(),
+		mVideoIO->SupportsInternalKeying(),
+		mVideoIO->SupportsExternalKeying(),
+		mVideoIO->KeyerInterfaceAvailable(),
+		mRuntimeHost->ExternalKeyingEnabled(),
+		mVideoIO->ExternalKeyingActive(),
+		mVideoIO->StatusMessage());
 }
 
 bool OpenGLComposite::InitOpenGLState()

apps/LoopThroughWithOpenGLCompositing/gl/OpenGLComposite.h

@@ -39,7 +39,8 @@ public:
 	OpenGLComposite(HWND hWnd, HDC hDC, HGLRC hRC);
 	~OpenGLComposite();
 
-	bool InitializeVideoIO();
+	bool InitDeckLink();
+	bool InitVideoIO();
 	bool Start();
 	bool Stop();
 	bool ReloadShader();

apps/LoopThroughWithOpenGLCompositing/gl/pipeline/OpenGLVideoIOBridge.cpp

@@ -7,7 +7,7 @@
 #include <gl/gl.h>
 
 OpenGLVideoIOBridge::OpenGLVideoIOBridge(
-	VideoIODevice* videoIO,
+	VideoIODevice& videoIO,
 	OpenGLRenderer& renderer,
 	OpenGLRenderPipeline& renderPipeline,
 	RuntimeHost& runtimeHost,
@@ -24,11 +24,6 @@ OpenGLVideoIOBridge::OpenGLVideoIOBridge(
 {
 }
 
-void OpenGLVideoIOBridge::SetVideoIODevice(VideoIODevice* videoIO)
-{
-	mVideoIO = videoIO;
-}
-
 void OpenGLVideoIOBridge::RecordFramePacing(VideoIOCompletionResult completionResult)
 {
 	const auto now = std::chrono::steady_clock::now();
@@ -62,10 +57,7 @@ void OpenGLVideoIOBridge::RecordFramePacing(VideoIOCompletionResult completionRe
 
 void OpenGLVideoIOBridge::VideoFrameArrived(const VideoIOFrame& inputFrame)
 {
-	if (mVideoIO == nullptr)
-		return;
-
-	const VideoIOState& state = mVideoIO->State();
+	const VideoIOState& state = mVideoIO.State();
 	mRuntimeHost.TrySetSignalStatus(!inputFrame.hasNoInputSource, state.inputFrameSize.width, state.inputFrameSize.height, state.inputDisplayModeName);
 
 	if (inputFrame.hasNoInputSource || inputFrame.bytes == nullptr)
@@ -99,20 +91,17 @@ void OpenGLVideoIOBridge::VideoFrameArrived(const VideoIOFrame& inputFrame)
 
 void OpenGLVideoIOBridge::PlayoutFrameCompleted(const VideoIOCompletion& completion)
 {
-	if (mVideoIO == nullptr)
-		return;
-
 	RecordFramePacing(completion.result);
 
 	EnterCriticalSection(&mMutex);
 
 	VideoIOOutputFrame outputFrame;
-	if (!mVideoIO->BeginOutputFrame(outputFrame))
+	if (!mVideoIO.BeginOutputFrame(outputFrame))
 	{
 		LeaveCriticalSection(&mMutex);
 		return;
 	}
-	const VideoIOState& state = mVideoIO->State();
+	const VideoIOState& state = mVideoIO.State();
 	RenderPipelineFrameContext frameContext;
 	frameContext.videoState = state;
 	frameContext.completion = completion;
@@ -122,12 +111,12 @@ void OpenGLVideoIOBridge::PlayoutFrameCompleted(const VideoIOCompletion& complet
 
 	mRenderPipeline.RenderFrame(frameContext, outputFrame);
 
-	mVideoIO->EndOutputFrame(outputFrame);
+	mVideoIO.EndOutputFrame(outputFrame);
 
-	mVideoIO->AccountForCompletionResult(completion.result);
+	mVideoIO.AccountForCompletionResult(completion.result);
 
 	// Schedule the next frame for playout
-	mVideoIO->ScheduleOutputFrame(outputFrame);
+	mVideoIO.ScheduleOutputFrame(outputFrame);
 
 	wglMakeCurrent(NULL, NULL);
 

apps/LoopThroughWithOpenGLCompositing/gl/pipeline/OpenGLVideoIOBridge.h

@@ -13,7 +13,7 @@ class OpenGLVideoIOBridge
 {
 public:
 	OpenGLVideoIOBridge(
-		VideoIODevice* videoIO,
+		VideoIODevice& videoIO,
 		OpenGLRenderer& renderer,
 		OpenGLRenderPipeline& renderPipeline,
 		RuntimeHost& runtimeHost,
@@ -21,15 +21,13 @@ public:
 		HDC hdc,
 		HGLRC hglrc);
 
-	void SetVideoIODevice(VideoIODevice* videoIO);
-
 	void VideoFrameArrived(const VideoIOFrame& inputFrame);
 	void PlayoutFrameCompleted(const VideoIOCompletion& completion);
 
 private:
 	void RecordFramePacing(VideoIOCompletionResult completionResult);
 
-	VideoIODevice* mVideoIO;
+	VideoIODevice& mVideoIO;
 	OpenGLRenderer& mRenderer;
 	OpenGLRenderPipeline& mRenderPipeline;
 	RuntimeHost& mRuntimeHost;