aiden/video-shader-toys
1
0
Fork 0
Code Issues Pull Requests Actions Releases 5 Wiki Activity

Revert "Decklink separation"
Some checks failed
CI / Windows Release Package (push) Has been cancelled
Details
CI / React UI Build (push) Has been cancelled
Details
CI / Native Windows Build And Tests (push) Has been cancelled
Details

Browse Source 
This reverts commit 46f2f1ece5.
This commit is contained in:
Aiden
2026-05-09 16:47:33 +10:00
parent 46f2f1ece5
commit 0c16665610
4 changed files with 5 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
apps/LoopThroughWithOpenGLCompositing/gl/OpenGLComposite.cpp
View File

@@ -83,7 +83,6 @@ bool OpenGLComposite::InitializeVideoIO()
}
const VideoIOConfiguration videoIOConfig = mRuntimeHost->GetVideoIOConfiguration();
const VideoIOBackendDescriptor* backendDescriptor = GetVideoIOBackendDescriptor(videoIOConfig.backendId);
mVideoIO = CreateVideoIODevice(videoIOConfig.backendId, initFailureReason);
if (!mVideoIO)
{
@@ -94,8 +93,8 @@ bool OpenGLComposite::InitializeVideoIO()
if (!mVideoIO->DiscoverDevicesAndModes(videoIOConfig, initFailureReason))
{
const char* title = IsVideoIOBackendUnavailableError(videoIOConfig.backendId, initFailureReason) && backendDescriptor != nullptr
? backendDescriptor->unavailableTitle
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";
MessageBoxA(NULL, initFailureReason.c_str(), title, MB_OK | MB_ICONERROR);
return false;

65
apps/LoopThroughWithOpenGLCompositing/videoio/VideoIOBackendFactory.cpp
View File

@@ -3,73 +3,14 @@
#include "DeckLinkSession.h"
#include "VideoIOTypes.h"
#include <array>
namespace
{
struct VideoIOBackendRegistration
{
VideoIOBackendDescriptor descriptor;
VideoIODeviceFactory factory;
};
const std::array<VideoIOBackendRegistration, 1>& RegisteredBackends()
{
static const std::array<VideoIOBackendRegistration, 1> backends = { {
{
{
VideoIOBackendId::DeckLink,
"decklink",
"Blackmagic DeckLink",
"Please install the Blackmagic DeckLink drivers to use the features of this application.",
"This application requires the selected video I/O drivers installed."
},
[]() { return std::make_unique<DeckLinkSession>(); }
}
} };
return backends;
}
}
const VideoIOBackendDescriptor* GetVideoIOBackendDescriptor(VideoIOBackendId backendId)
{
for (const VideoIOBackendRegistration& registration : RegisteredBackends())
{
if (registration.descriptor.backendId == backendId)
return &registration.descriptor;
}
return nullptr;
}
std::vector<VideoIOBackendDescriptor> ListVideoIOBackendDescriptors()
{
std::vector<VideoIOBackendDescriptor> descriptors;
descriptors.reserve(RegisteredBackends().size());
for (const VideoIOBackendRegistration& registration : RegisteredBackends())
descriptors.push_back(registration.descriptor);
return descriptors;
}
std::unique_ptr<VideoIODevice> CreateVideoIODevice(VideoIOBackendId backendId, std::string& error)
{
for (const VideoIOBackendRegistration& registration : RegisteredBackends())
switch (backendId)
{
if (registration.descriptor.backendId != backendId)
continue;
error.clear();
return registration.factory ? registration.factory() : nullptr;
case VideoIOBackendId::DeckLink:
return std::make_unique<DeckLinkSession>();
}
error = "Unsupported video I/O backend.";
return nullptr;
}
bool IsVideoIOBackendUnavailableError(VideoIOBackendId backendId, const std::string& error)
{
const VideoIOBackendDescriptor* descriptor = GetVideoIOBackendDescriptor(backendId);
return descriptor != nullptr &&
descriptor->unavailableMessage != nullptr &&
*descriptor->unavailableMessage != '\0' &&
error == descriptor->unavailableMessage;
}

16
apps/LoopThroughWithOpenGLCompositing/videoio/VideoIOBackendFactory.h
View File

@@ -2,25 +2,9 @@
#include "VideoIOConfig.h"
#include <functional>
#include <memory>
#include <string>
#include <vector>
class VideoIODevice;
struct VideoIOBackendDescriptor
{
VideoIOBackendId backendId = VideoIOBackendId::DeckLink;
const char* backendName = "decklink";
const char* displayName = "Blackmagic DeckLink";
const char* unavailableMessage = "";
const char* unavailableTitle = "Video I/O initialization failed";
};
using VideoIODeviceFactory = std::function<std::unique_ptr<VideoIODevice>()>;
const VideoIOBackendDescriptor* GetVideoIOBackendDescriptor(VideoIOBackendId backendId);
std::vector<VideoIOBackendDescriptor> ListVideoIOBackendDescriptors();
std::unique_ptr<VideoIODevice> CreateVideoIODevice(VideoIOBackendId backendId, std::string& error);
bool IsVideoIOBackendUnavailableError(VideoIOBackendId backendId, const std::string& error);