opensourcemirror
/
hyperion.ng
mirror of https://github.com/hyperion-project/hyperion.ng.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix #1714 (#1717)

This commit is contained in:
LordGrey 2024-03-15 20:23:53 +01:00 committed by GitHub
parent fedb409157
commit 806206ec01
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
9 changed files with 36 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/grabber/amlogic/AmlogicWrapper.h
View File

@ -18,12 +18,11 @@ public:
///
/// Constructs the Amlogic frame grabber
///
/// @param[in] grabWidth The width of the grabbed image [pixels]
/// @param[in] grabHeight The height of the grabbed images [pixels]
/// @param[in] pixelDecimation Decimation factor for image [pixels]
/// @param[in] updateRate_Hz The image grab rate [Hz]
/// @param[in] pixelDecimation Decimation factor for image [pixels]///
///
AmlogicWrapper(int pixelDecimation=GrabberWrapper::DEFAULT_PIXELDECIMATION,
int updateRate_Hz=GrabberWrapper::DEFAULT_RATE_HZ);
AmlogicWrapper(int updateRate_Hz=GrabberWrapper::DEFAULT_RATE_HZ,
int pixelDecimation=GrabberWrapper::DEFAULT_PIXELDECIMATION);
///
/// Constructs the Amlogic frame grabber from configuration settings

7
libsrc/grabber/amlogic/AmlogicWrapper.cpp
View File

@ -1,14 +1,15 @@
#include <grabber/amlogic/AmlogicWrapper.h>
AmlogicWrapper::AmlogicWrapper(int pixelDecimation, int updateRate_Hz)
AmlogicWrapper::AmlogicWrapper(int updateRate_Hz, int pixelDecimation)
: GrabberWrapper(GRABBERTYPE, &_grabber, updateRate_Hz)
, _grabber()
, _grabber()
{
_grabber.setPixelDecimation(pixelDecimation);
}
AmlogicWrapper::AmlogicWrapper(const QJsonDocument& grabberConfig)
: GrabberWrapper(GRABBERTYPE, &_grabber)
: AmlogicWrapper(GrabberWrapper::DEFAULT_RATE_HZ,
GrabberWrapper::DEFAULT_PIXELDECIMATION)
{
this->handleSettingsUpdate(settings::SYSTEMCAPTURE, grabberConfig);
}

7
libsrc/grabber/directx/DirectXWrapper.cpp
View File

@ -6,14 +6,17 @@ DirectXWrapper::DirectXWrapper( int updateRate_Hz,
int cropLeft, int cropRight, int cropTop, int cropBottom
)
: GrabberWrapper(GRABBERTYPE, &_grabber, updateRate_Hz)
, _grabber(display, cropLeft, cropRight, cropTop, cropBottom)
, _grabber(display, cropLeft, cropRight, cropTop, cropBottom)
{
_grabber.setPixelDecimation(pixelDecimation);
}
DirectXWrapper::DirectXWrapper(const QJsonDocument& grabberConfig)
: GrabberWrapper(GRABBERTYPE, &_grabber)
: DirectXWrapper(GrabberWrapper::DEFAULT_RATE_HZ,
0,
GrabberWrapper::DEFAULT_PIXELDECIMATION,
0,0,0,0)
{
this->handleSettingsUpdate(settings::SYSTEMCAPTURE, grabberConfig);
}

3
libsrc/grabber/dispmanx/DispmanxWrapper.cpp
View File

@ -12,7 +12,8 @@ DispmanxWrapper::DispmanxWrapper( int updateRate_Hz,
}
DispmanxWrapper::DispmanxWrapper(const QJsonDocument& grabberConfig)
: GrabberWrapper(GRABBERTYPE, &_grabber)
: DispmanxWrapper(GrabberWrapper::DEFAULT_RATE_HZ,
GrabberWrapper::DEFAULT_PIXELDECIMATION)
{
this->handleSettingsUpdate(settings::SYSTEMCAPTURE, grabberConfig);
}

6
libsrc/grabber/framebuffer/FramebufferWrapper.cpp
View File

@ -4,13 +4,15 @@ FramebufferWrapper::FramebufferWrapper( int updateRate_Hz,
int deviceIdx,
int pixelDecimation)
: GrabberWrapper(GRABBERTYPE, &_grabber, updateRate_Hz)
, _grabber(deviceIdx)
, _grabber(deviceIdx)
{
_grabber.setPixelDecimation(pixelDecimation);
}
FramebufferWrapper::FramebufferWrapper(const QJsonDocument& grabberConfig)
: GrabberWrapper(GRABBERTYPE, &_grabber)
: FramebufferWrapper(GrabberWrapper::DEFAULT_RATE_HZ,
0,
GrabberWrapper::DEFAULT_PIXELDECIMATION)
{
this->handleSettingsUpdate(settings::SYSTEMCAPTURE, grabberConfig);
}

6
libsrc/grabber/osx/OsxWrapper.cpp
View File

@ -5,13 +5,15 @@ OsxWrapper::OsxWrapper( int updateRate_Hz,
int pixelDecimation
)
: GrabberWrapper(GRABBERTYPE, &_grabber, updateRate_Hz)
, _grabber(display)
, _grabber(display)
{
_grabber.setPixelDecimation(pixelDecimation);
}
OsxWrapper::OsxWrapper(const QJsonDocument& grabberConfig)
: GrabberWrapper(GRABBERTYPE, &_grabber)
: OsxWrapper(GrabberWrapper::DEFAULT_RATE_HZ,
kCGDirectMainDisplay,
GrabberWrapper::DEFAULT_PIXELDECIMATION)
{
this->handleSettingsUpdate(settings::SYSTEMCAPTURE, grabberConfig);
}

7
libsrc/grabber/qt/QtWrapper.cpp
View File

@ -6,13 +6,16 @@ QtWrapper::QtWrapper( int updateRate_Hz,
int cropLeft, int cropRight, int cropTop, int cropBottom
)
: GrabberWrapper(GRABBERTYPE, &_grabber, updateRate_Hz)
, _grabber(display, cropLeft, cropRight, cropTop, cropBottom)
, _grabber(display, cropLeft, cropRight, cropTop, cropBottom)
{
_grabber.setPixelDecimation(pixelDecimation);
}
QtWrapper::QtWrapper(const QJsonDocument& grabberConfig)
: GrabberWrapper(GRABBERTYPE, &_grabber)
: QtWrapper(GrabberWrapper::DEFAULT_RATE_HZ,
0,
GrabberWrapper::DEFAULT_PIXELDECIMATION,
0,0,0,0)
{
this->handleSettingsUpdate(settings::SYSTEMCAPTURE, grabberConfig);
}

8
libsrc/grabber/x11/X11Wrapper.cpp
View File

@ -4,14 +4,16 @@ X11Wrapper::X11Wrapper( int updateRate_Hz,
int pixelDecimation,
int cropLeft, int cropRight, int cropTop, int cropBottom)
: GrabberWrapper(GRABBERTYPE, &_grabber, updateRate_Hz)
, _grabber(cropLeft, cropRight, cropTop, cropBottom)
, _init(false)
, _grabber(cropLeft, cropRight, cropTop, cropBottom)
, _init(false)
{
_grabber.setPixelDecimation(pixelDecimation);
}
X11Wrapper::X11Wrapper(const QJsonDocument& grabberConfig)
: GrabberWrapper(GRABBERTYPE, &_grabber)
: X11Wrapper(GrabberWrapper::DEFAULT_RATE_HZ,
GrabberWrapper::DEFAULT_PIXELDECIMATION,
0,0,0,0)
{
this->handleSettingsUpdate(settings::SYSTEMCAPTURE, grabberConfig);
}

4
libsrc/grabber/xcb/XcbWrapper.cpp
View File

@ -11,7 +11,9 @@ XcbWrapper::XcbWrapper( int updateRate_Hz,
}
XcbWrapper::XcbWrapper(const QJsonDocument& grabberConfig)
: GrabberWrapper(GRABBERTYPE, &_grabber)
: XcbWrapper(GrabberWrapper::DEFAULT_RATE_HZ,
GrabberWrapper::DEFAULT_PIXELDECIMATION,
0,0,0,0)
{
this->handleSettingsUpdate(settings::SYSTEMCAPTURE, grabberConfig);
}