mirror of
https://github.com/hyperion-project/hyperion.ng.git
synced 2023-10-10 13:36:59 +02:00
c135d91986
* - New Media Foundation grabber - JsonAPI available grabber fix - commented json config removed * Added libjpeg-turbo to dependencies * Fix OSX build Removed Azure Pipelines from build scripts * Remove Platform from Dashboard * Correct Grabber Namings * Grabber UI improvements, generic JSONEditor Selection Update * Active grabber fix * Stop Framebuffer grabber on failure * - Image format NV12 and I420 added - Flip mode - Scaling factor for MJPEG - VSCode (compile before run) - CI (push) dependency libjpeg-turbo added * Refactor MediaFoundation (Part 1) * Remove QDebug output * Added image flipping ability to MF Grabber * fix issue 1160 * -Reload MF Grabber only once per WebUI update - Cleanup * Improvements * - Set 'Software Frame Decimation' begin to 0 - Removed grabber specific device name from Log - Keep pixel format when switching resolution - Display 'Flip mode' correct in Log - BGR24 images always flipped * Refactor MediaFoundation (Part 2) * Refactor V4L2 grabber (part 1) (#62) * Media Foundation grabber adapted to V4L2 change * Enable Media Foundation grabber on windows * Have fps as int, fix height typo * Added video standards to JsonAPI output * Error handling in source reader improved * Fix "Frame to small" error * Discovery VideoSources and Dynamically Update Editor * Hide all element when no video grabber discovered, upate naming * Do not show unsupported grabbers * Copy Log to Clipboard * Update Grabber schema and Defaults * Update access levels and validate crop ranges * Height and width in Qt grabber corrected * Correct formatting * Untabify * Global component states across instances * Components divided on the dashboard * refactor * Fix Merge-issues * Database migration aligning with updated grabber model * Align Grabber.js with new utility functions * Allow editor-validation for enum-lists * Handle "Show Explainations scenario" correctly * Grabber - Ensure save is only possible on valid content * Dashboard update + fix GlobalSignal connection * Ensure default database is populated with current release * Correct grabber4L2 access level * Display Signal detection area in preview * Write Hyperion version into default config on compiling. * Create defaultconfig.json dynamically * WebUI changes * Correct grabber config look-ups * Refactor i18n language loading * Fix en.json * Split global capture from instance capture config * Update grabber default values * Standalone grabber: Add --debug switch * Enhance showInputOptionsForKey for multiple keys * Add grabber instance link to system grabber config * Only show signal detection area, if grabber is enabled * Always show Active element on grabber page * Remote control - Only display gabber status, if global grabber is enabled * WebUI optimization (thx to @mkcologne) Start Grabber only when global settings are enabled Fixed an issue in the WebUI preview * V4L2/MF changes * Jsoneditor, Correct translation for default values * Refactor LED-Device handling in UI and make element naming consistent * MF Discovery extended * Fix LGTM finding * Support Grabber Bri, Hue, Sat and Con in UI, plus their defaults * Concider Access level for item filtering * Concider Access level for item filtering * Revert "Concider Access level for item filtering" This reverts commit 5b0ce3c0f2de67e0c43788190cfff45614706129. * Disable fpsSoftwareDecimation for framegrabber, as not supported yet * JSON-Editor- Add updated schema for validation on dynamic elements * added V4L2 color IDs * LGTM findings fix * destroy SR callback only on exit * Grabber.js - Hide elements not supported by platform * Fixed freezing start effect * Grabber UI - Hardware controls - Show current values and allow to reset to defaults * Grabber - Discovery - Add current values to properties * Small things * Clean-up Effects and have ENDLESS consistently defined * Fix on/off/on priority during startup, by initializing _prevVisComp in line with background priority * Add missing translation mappings * DirectX Grabber reactivated/ QT Grabber size decimation fixed * typo in push-master workflow * Use PreciseTimer for Grabber to ensure stable FPS timing * Set default Screencapture rate consistently * Fix libjpeg-turbo download * Remove Zero character from file * docker-compile Add PLATFORM parameter, only copy output file after successful compile * Framebuffer, Dispmanx, OSX, AML Grabber discovery, various clean-up and consistencies across grabbers * Fix merge problem - on docker-compile Add PLATFORM parameter, only copy output file after successful compile * Fix definition * OSXFRameGrabber - Revert cast * Clean-ups nach Feedback * Disable certain libraries when building armlogic via standard stretch image as developer * Add CEC availability to ServerInfo to have it platform independent * Grabber UI - Fix problem that crop values are not populated when refining editor rage * Preserve value when updating json-editor range * LEDVisualisation - Clear image when source changes * Fix - Preserve value when updating json-editor range * LEDVisualisation - Clear image when no component is active * Allow to have password handled by Password-Manager (#1263) * Update default signal detection area to green assuming rainbow grabber * LED Visualisation - Handle empty priority update * Fix yuv420 in v4l2 grabber * V4L2-Grabber discovery - Only report grabbers with valid video input information * Grabber - Update static variables to have them working in release build * LED Visualisation - ClearImage when no priorities * LED Visualisation - Fix Logo resizing issue * LED Visualisation - Have nearly black background and negative logo Co-authored-by: LordGrey <lordgrey.emmel@gmail.com> Co-authored-by: LordGrey <48840279+Lord-Grey@users.noreply.github.com>
248 lines
5.7 KiB
C++
248 lines
5.7 KiB
C++
// Hyperion includes
|
|
#include <hyperion/GrabberWrapper.h>
|
|
#include <hyperion/Grabber.h>
|
|
#include <HyperionConfig.h>
|
|
|
|
// utils includes
|
|
#include <utils/GlobalSignals.h>
|
|
|
|
// qt
|
|
#include <QTimer>
|
|
|
|
GrabberWrapper* GrabberWrapper::instance = nullptr;
|
|
const int GrabberWrapper::DEFAULT_RATE_HZ = 10;
|
|
const int GrabberWrapper::DEFAULT_MIN_GRAB_RATE_HZ = 1;
|
|
const int GrabberWrapper::DEFAULT_MAX_GRAB_RATE_HZ = 30;
|
|
const int GrabberWrapper::DEFAULT_PIXELDECIMATION = 8;
|
|
|
|
/// Map of Hyperion instances with grabber name that requested screen capture
|
|
QMap<int, QString> GrabberWrapper::GRABBER_SYS_CLIENTS = QMap<int, QString>();
|
|
QMap<int, QString> GrabberWrapper::GRABBER_V4L_CLIENTS = QMap<int, QString>();
|
|
bool GrabberWrapper::GLOBAL_GRABBER_SYS_ENABLE = false;
|
|
bool GrabberWrapper::GLOBAL_GRABBER_V4L_ENABLE = false;
|
|
|
|
GrabberWrapper::GrabberWrapper(const QString& grabberName, Grabber * ggrabber, int updateRate_Hz)
|
|
: _grabberName(grabberName)
|
|
, _log(Logger::getInstance(grabberName.toUpper()))
|
|
, _timer(new QTimer(this))
|
|
, _updateInterval_ms(1000/updateRate_Hz)
|
|
, _ggrabber(ggrabber)
|
|
, _image(0,0)
|
|
{
|
|
GrabberWrapper::instance = this;
|
|
|
|
// Configure the timer to generate events every n milliseconds
|
|
_timer->setTimerType(Qt::PreciseTimer);
|
|
_timer->setInterval(_updateInterval_ms);
|
|
|
|
connect(_timer, &QTimer::timeout, this, &GrabberWrapper::action);
|
|
|
|
// connect the image forwarding
|
|
(_grabberName.startsWith("V4L"))
|
|
? connect(this, &GrabberWrapper::systemImage, GlobalSignals::getInstance(), &GlobalSignals::setV4lImage)
|
|
: connect(this, &GrabberWrapper::systemImage, GlobalSignals::getInstance(), &GlobalSignals::setSystemImage);
|
|
|
|
// listen for source requests
|
|
connect(GlobalSignals::getInstance(), &GlobalSignals::requestSource, this, &GrabberWrapper::handleSourceRequest);
|
|
}
|
|
|
|
GrabberWrapper::~GrabberWrapper()
|
|
{
|
|
Debug(_log,"Close grabber: %s", QSTRING_CSTR(_grabberName));
|
|
}
|
|
|
|
bool GrabberWrapper::start()
|
|
{
|
|
bool rc = false;
|
|
if ( open() )
|
|
{
|
|
if (!_timer->isActive())
|
|
{
|
|
// Start the timer with the pre configured interval
|
|
Debug(_log,"Grabber start()");
|
|
_timer->start();
|
|
}
|
|
|
|
rc = _timer->isActive();
|
|
}
|
|
return rc;
|
|
}
|
|
|
|
void GrabberWrapper::stop()
|
|
{
|
|
if (_timer->isActive())
|
|
{
|
|
// Stop the timer, effectively stopping the process
|
|
Debug(_log,"Grabber stop()");
|
|
_timer->stop();
|
|
}
|
|
}
|
|
|
|
bool GrabberWrapper::isActive() const
|
|
{
|
|
return _timer->isActive();
|
|
}
|
|
|
|
QStringList GrabberWrapper::getActive(int inst) const
|
|
{
|
|
QStringList result = QStringList();
|
|
|
|
if(GRABBER_V4L_CLIENTS.contains(inst))
|
|
result << GRABBER_V4L_CLIENTS.value(inst);
|
|
|
|
if(GRABBER_SYS_CLIENTS.contains(inst))
|
|
result << GRABBER_SYS_CLIENTS.value(inst);
|
|
|
|
return result;
|
|
}
|
|
|
|
QStringList GrabberWrapper::availableGrabbers()
|
|
{
|
|
QStringList grabbers;
|
|
|
|
#ifdef ENABLE_DISPMANX
|
|
grabbers << "dispmanx";
|
|
#endif
|
|
|
|
#if defined(ENABLE_V4L2) || defined(ENABLE_MF)
|
|
grabbers << "v4l2";
|
|
#endif
|
|
|
|
#ifdef ENABLE_FB
|
|
grabbers << "framebuffer";
|
|
#endif
|
|
|
|
#ifdef ENABLE_AMLOGIC
|
|
grabbers << "amlogic";
|
|
#endif
|
|
|
|
#ifdef ENABLE_OSX
|
|
grabbers << "osx";
|
|
#endif
|
|
|
|
#ifdef ENABLE_X11
|
|
grabbers << "x11";
|
|
#endif
|
|
|
|
#ifdef ENABLE_XCB
|
|
grabbers << "xcb";
|
|
#endif
|
|
|
|
#ifdef ENABLE_QT
|
|
grabbers << "qt";
|
|
#endif
|
|
|
|
#ifdef ENABLE_DX
|
|
grabbers << "dx";
|
|
#endif
|
|
|
|
return grabbers;
|
|
}
|
|
|
|
void GrabberWrapper::setVideoMode(VideoMode mode)
|
|
{
|
|
if (_ggrabber != nullptr)
|
|
{
|
|
Info(_log,"setVideoMode");
|
|
_ggrabber->setVideoMode(mode);
|
|
}
|
|
}
|
|
|
|
void GrabberWrapper::setFlipMode(const QString& flipMode)
|
|
{
|
|
_ggrabber->setFlipMode(parseFlipMode(flipMode));
|
|
}
|
|
|
|
void GrabberWrapper::setCropping(int cropLeft, int cropRight, int cropTop, int cropBottom)
|
|
{
|
|
_ggrabber->setCropping(cropLeft, cropRight, cropTop, cropBottom);
|
|
}
|
|
|
|
void GrabberWrapper::updateTimer(int interval)
|
|
{
|
|
if(_updateInterval_ms != interval)
|
|
{
|
|
_updateInterval_ms = interval;
|
|
|
|
const bool& timerWasActive = _timer->isActive();
|
|
_timer->stop();
|
|
_timer->setInterval(_updateInterval_ms);
|
|
|
|
if(timerWasActive)
|
|
_timer->start();
|
|
}
|
|
}
|
|
|
|
void GrabberWrapper::handleSettingsUpdate(settings::type type, const QJsonDocument& config)
|
|
{ if(type == settings::SYSTEMCAPTURE && !_grabberName.startsWith("V4L"))
|
|
{
|
|
// extract settings
|
|
const QJsonObject& obj = config.object();
|
|
|
|
// set global grabber state
|
|
setSysGrabberState(obj["enable"].toBool(false));
|
|
|
|
if (getSysGrabberState())
|
|
{
|
|
// width/height
|
|
_ggrabber->setWidthHeight(obj["width"].toInt(96), obj["height"].toInt(96));
|
|
|
|
// display index for MAC
|
|
_ggrabber->setDisplayIndex(obj["input"].toInt(0));
|
|
|
|
// pixel decimation for x11
|
|
_ggrabber->setPixelDecimation(obj["pixelDecimation"].toInt(DEFAULT_PIXELDECIMATION));
|
|
|
|
// crop for system capture
|
|
_ggrabber->setCropping(
|
|
obj["cropLeft"].toInt(0),
|
|
obj["cropRight"].toInt(0),
|
|
obj["cropTop"].toInt(0),
|
|
obj["cropBottom"].toInt(0));
|
|
|
|
_ggrabber->setFramerate(obj["fps"].toInt(DEFAULT_RATE_HZ));
|
|
// eval new update time
|
|
updateTimer(_ggrabber->getUpdateInterval());
|
|
}
|
|
else
|
|
{
|
|
stop();
|
|
}
|
|
}
|
|
}
|
|
|
|
void GrabberWrapper::handleSourceRequest(hyperion::Components component, int hyperionInd, bool listen)
|
|
{
|
|
if(component == hyperion::Components::COMP_GRABBER && !_grabberName.startsWith("V4L"))
|
|
{
|
|
if(listen)
|
|
GRABBER_SYS_CLIENTS.insert(hyperionInd, _grabberName);
|
|
else
|
|
GRABBER_SYS_CLIENTS.remove(hyperionInd);
|
|
|
|
if(GRABBER_SYS_CLIENTS.empty() || !getSysGrabberState())
|
|
stop();
|
|
else
|
|
start();
|
|
}
|
|
else if(component == hyperion::Components::COMP_V4L && _grabberName.startsWith("V4L"))
|
|
{
|
|
if(listen)
|
|
GRABBER_V4L_CLIENTS.insert(hyperionInd, _grabberName);
|
|
else
|
|
GRABBER_V4L_CLIENTS.remove(hyperionInd);
|
|
|
|
if(GRABBER_V4L_CLIENTS.empty() || !getV4lGrabberState())
|
|
stop();
|
|
else
|
|
start();
|
|
}
|
|
}
|
|
|
|
void GrabberWrapper::tryStart()
|
|
{
|
|
// verify start condition
|
|
if(!_grabberName.startsWith("V4L") && !GRABBER_SYS_CLIENTS.empty() && getSysGrabberState())
|
|
start();
|
|
}
|