frodovdr/hyperion.ng
1
0
Fork 0
mirror of https://github.com/hyperion-project/hyperion.ng.git synced 2025-03-01 10:33:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

DirectX9 Grabber (#1039)

Browse Source
This commit is contained in:
Paulchen Panther
2020-10-26 21:13:13 +01:00
committed by GitHub
parent 65a036dfc0
commit 1d35338b83
15 changed files with 474 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/hyperiond/CMakeLists.txt
View File

@@ -103,6 +103,11 @@ if (ENABLE_QT)
target_link_libraries(hyperiond qt-grabber)
endif ()
if (ENABLE_DX)
include_directories(${DIRECTX9_INCLUDE_DIRS})
target_link_libraries(hyperiond directx-grabber)
endif ()
if (ENABLE_CEC)
target_link_libraries(hyperiond cechandler)
endif ()

40
src/hyperiond/hyperiond.cpp
View File

@@ -81,6 +81,7 @@ HyperionDaemon::HyperionDaemon(const QString rootPath, QObject *parent, bool log
, _fbGrabber(nullptr)
, _osxGrabber(nullptr)
, _qtGrabber(nullptr)
, _dxGrabber(nullptr)
, _ssdp(nullptr)
, _cecHandler(nullptr)
, _currVideoMode(VideoMode::VIDEO_2D)
@@ -135,7 +136,7 @@ HyperionDaemon::HyperionDaemon(const QString rootPath, QObject *parent, bool log
connect(this, &HyperionDaemon::videoMode, _instanceManager, &HyperionIManager::newVideoMode);
// ---- grabber -----
#if !defined(ENABLE_DISPMANX) && !defined(ENABLE_OSX) && !defined(ENABLE_FB) && !defined(ENABLE_X11) && !defined(ENABLE_XCB) && !defined(ENABLE_AMLOGIC) && !defined(ENABLE_QT)
#if !defined(ENABLE_DISPMANX) && !defined(ENABLE_OSX) && !defined(ENABLE_FB) && !defined(ENABLE_X11) && !defined(ENABLE_XCB) && !defined(ENABLE_AMLOGIC) && !defined(ENABLE_QT) && !defined(ENABLE_DX)
Warning(_log, "No platform capture can be instantiated, because all grabbers have been left out from the build");
#endif
@@ -244,6 +245,7 @@ void HyperionDaemon::freeObjects()
delete _fbGrabber;
delete _osxGrabber;
delete _qtGrabber;
delete _dxGrabber;
delete _v4l2Grabber;
_v4l2Grabber = nullptr;
@@ -253,6 +255,7 @@ void HyperionDaemon::freeObjects()
_fbGrabber = nullptr;
_osxGrabber = nullptr;
_qtGrabber = nullptr;
_dxGrabber = nullptr;
}
void HyperionDaemon::startNetworkServices()
@@ -458,6 +461,14 @@ void HyperionDaemon::handleSettingsUpdate(settings::type settingsType, const QJs
_qtGrabber = nullptr;
}
#endif
#ifdef ENABLE_DX
if(_dxGrabber != nullptr)
{
_dxGrabber->stop();
delete _dxGrabber;
_dxGrabber = nullptr;
}
#endif
// create/start capture interface
if (type == "framebuffer")
@@ -516,6 +527,14 @@ void HyperionDaemon::handleSettingsUpdate(settings::type settingsType, const QJs
_qtGrabber->tryStart();
#endif
}
else if (type == "dx")
{
if (_dxGrabber == nullptr)
createGrabberDx(grabberConfig);
#ifdef ENABLE_DX
_dxGrabber->tryStart();
#endif
}
else
{
Error(_log, "Unknown platform capture type: %s", QSTRING_CSTR(type));
@@ -670,6 +689,25 @@ void HyperionDaemon::createGrabberQt(const QJsonObject &grabberConfig)
#endif
}
void HyperionDaemon::createGrabberDx(const QJsonObject &grabberConfig)
{
#ifdef ENABLE_DX
_dxGrabber = new DirectXWrapper(
_grabber_cropLeft, _grabber_cropRight, _grabber_cropTop, _grabber_cropBottom,
grabberConfig["pixelDecimation"].toInt(8),
grabberConfig["display"].toInt(0),
_grabber_frequency);
// connect to HyperionDaemon signal
connect(this, &HyperionDaemon::videoMode, _dxGrabber, &DirectXWrapper::setVideoMode);
connect(this, &HyperionDaemon::settingsChanged, _dxGrabber, &DirectXWrapper::handleSettingsUpdate);
Info(_log, "DirectX grabber created");
#else
Error(_log, "The DirectX grabber can not be instantiated, because it has been left out from the build");
#endif
}
void HyperionDaemon::createGrabberFramebuffer(const QJsonObject &grabberConfig)
{
#ifdef ENABLE_FB

8
src/hyperiond/hyperiond.h
View File

@@ -52,6 +52,12 @@
typedef QObject QtWrapper;
#endif
#ifdef ENABLE_DX
#include <grabber/DirectXWrapper.h>
#else
typedef QObject DirectXWrapper;
#endif
#include <utils/Logger.h>
#include <utils/VideoMode.h>
@@ -153,6 +159,7 @@ private:
void createGrabberXcb(const QJsonObject & grabberConfig);
void createGrabberQt(const QJsonObject & grabberConfig);
void createCecHandler();
void createGrabberDx(const QJsonObject & grabberConfig);
Logger* _log;
HyperionIManager* _instanceManager;
@@ -171,6 +178,7 @@ private:
FramebufferWrapper* _fbGrabber;
OsxWrapper* _osxGrabber;
QtWrapper* _qtGrabber;
DirectXWrapper* _dxGrabber;
SSDPHandler* _ssdp;
CECHandler* _cecHandler;
FlatBufferServer* _flatBufferServer;