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 5b0ce3c0f2
.
* 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>
156 lines
4.7 KiB
C++
156 lines
4.7 KiB
C++
#include <hyperion/CaptureCont.h>
|
|
|
|
// hyperion includes
|
|
#include <hyperion/Hyperion.h>
|
|
|
|
// utils includes
|
|
#include <utils/GlobalSignals.h>
|
|
|
|
// qt includes
|
|
#include <QTimer>
|
|
|
|
CaptureCont::CaptureCont(Hyperion* hyperion)
|
|
: QObject()
|
|
, _hyperion(hyperion)
|
|
, _systemCaptEnabled(false)
|
|
, _systemCaptPrio(0)
|
|
, _systemCaptName()
|
|
, _systemInactiveTimer(new QTimer(this))
|
|
, _v4lCaptEnabled(false)
|
|
, _v4lCaptPrio(0)
|
|
, _v4lCaptName()
|
|
, _v4lInactiveTimer(new QTimer(this))
|
|
{
|
|
// settings changes
|
|
connect(_hyperion, &Hyperion::settingsChanged, this, &CaptureCont::handleSettingsUpdate);
|
|
|
|
// comp changes
|
|
connect(_hyperion, &Hyperion::compStateChangeRequest, this, &CaptureCont::handleCompStateChangeRequest);
|
|
|
|
// inactive timer system
|
|
connect(_systemInactiveTimer, &QTimer::timeout, this, &CaptureCont::setSystemInactive);
|
|
_systemInactiveTimer->setSingleShot(true);
|
|
_systemInactiveTimer->setInterval(5000);
|
|
|
|
// inactive timer v4l
|
|
connect(_v4lInactiveTimer, &QTimer::timeout, this, &CaptureCont::setV4lInactive);
|
|
_v4lInactiveTimer->setSingleShot(true);
|
|
_v4lInactiveTimer->setInterval(1000);
|
|
|
|
// init
|
|
handleSettingsUpdate(settings::INSTCAPTURE, _hyperion->getSetting(settings::INSTCAPTURE));
|
|
}
|
|
|
|
void CaptureCont::handleV4lImage(const QString& name, const Image<ColorRgb> & image)
|
|
{
|
|
if(_v4lCaptName != name)
|
|
{
|
|
_hyperion->registerInput(_v4lCaptPrio, hyperion::COMP_V4L, "System", name);
|
|
_v4lCaptName = name;
|
|
emit GlobalSignals::getInstance()->requestSource(hyperion::COMP_V4L, int(_hyperion->getInstanceIndex()), _v4lCaptEnabled);
|
|
}
|
|
_v4lInactiveTimer->start();
|
|
_hyperion->setInputImage(_v4lCaptPrio, image);
|
|
}
|
|
|
|
void CaptureCont::handleSystemImage(const QString& name, const Image<ColorRgb>& image)
|
|
{
|
|
if(_systemCaptName != name)
|
|
{
|
|
_hyperion->registerInput(_systemCaptPrio, hyperion::COMP_GRABBER, "System", name);
|
|
_systemCaptName = name;
|
|
emit GlobalSignals::getInstance()->requestSource(hyperion::COMP_GRABBER, int(_hyperion->getInstanceIndex()), _systemCaptEnabled);
|
|
}
|
|
_systemInactiveTimer->start();
|
|
_hyperion->setInputImage(_systemCaptPrio, image);
|
|
}
|
|
|
|
void CaptureCont::setSystemCaptureEnable(bool enable)
|
|
{
|
|
if(_systemCaptEnabled != enable)
|
|
{
|
|
if(enable)
|
|
{
|
|
_hyperion->registerInput(_systemCaptPrio, hyperion::COMP_GRABBER);
|
|
connect(GlobalSignals::getInstance(), &GlobalSignals::setSystemImage, this, &CaptureCont::handleSystemImage);
|
|
connect(GlobalSignals::getInstance(), &GlobalSignals::setSystemImage, _hyperion, &Hyperion::forwardSystemProtoMessage);
|
|
}
|
|
else
|
|
{
|
|
disconnect(GlobalSignals::getInstance(), &GlobalSignals::setSystemImage, this, 0);
|
|
_hyperion->clear(_systemCaptPrio);
|
|
_systemInactiveTimer->stop();
|
|
_systemCaptName = "";
|
|
}
|
|
_systemCaptEnabled = enable;
|
|
_hyperion->setNewComponentState(hyperion::COMP_GRABBER, enable);
|
|
emit GlobalSignals::getInstance()->requestSource(hyperion::COMP_GRABBER, int(_hyperion->getInstanceIndex()), enable);
|
|
}
|
|
}
|
|
|
|
void CaptureCont::setV4LCaptureEnable(bool enable)
|
|
{
|
|
if(_v4lCaptEnabled != enable)
|
|
{
|
|
if(enable)
|
|
{
|
|
_hyperion->registerInput(_v4lCaptPrio, hyperion::COMP_V4L);
|
|
connect(GlobalSignals::getInstance(), &GlobalSignals::setV4lImage, this, &CaptureCont::handleV4lImage);
|
|
connect(GlobalSignals::getInstance(), &GlobalSignals::setV4lImage, _hyperion, &Hyperion::forwardV4lProtoMessage);
|
|
}
|
|
else
|
|
{
|
|
disconnect(GlobalSignals::getInstance(), &GlobalSignals::setV4lImage, this, 0);
|
|
_hyperion->clear(_v4lCaptPrio);
|
|
_v4lInactiveTimer->stop();
|
|
_v4lCaptName = "";
|
|
}
|
|
_v4lCaptEnabled = enable;
|
|
_hyperion->setNewComponentState(hyperion::COMP_V4L, enable);
|
|
emit GlobalSignals::getInstance()->requestSource(hyperion::COMP_V4L, int(_hyperion->getInstanceIndex()), enable);
|
|
}
|
|
}
|
|
|
|
void CaptureCont::handleSettingsUpdate(settings::type type, const QJsonDocument& config)
|
|
{
|
|
if(type == settings::INSTCAPTURE)
|
|
{
|
|
const QJsonObject& obj = config.object();
|
|
if(_v4lCaptPrio != obj["v4lPriority"].toInt(240))
|
|
{
|
|
setV4LCaptureEnable(false); // clear prio
|
|
_v4lCaptPrio = obj["v4lPriority"].toInt(240);
|
|
}
|
|
if(_systemCaptPrio != obj["systemPriority"].toInt(250))
|
|
{
|
|
setSystemCaptureEnable(false); // clear prio
|
|
_systemCaptPrio = obj["systemPriority"].toInt(250);
|
|
}
|
|
|
|
setV4LCaptureEnable(obj["v4lEnable"].toBool(false));
|
|
setSystemCaptureEnable(obj["systemEnable"].toBool(false));
|
|
}
|
|
}
|
|
|
|
void CaptureCont::handleCompStateChangeRequest(hyperion::Components component, bool enable)
|
|
{
|
|
if(component == hyperion::COMP_GRABBER)
|
|
{
|
|
setSystemCaptureEnable(enable);
|
|
}
|
|
else if(component == hyperion::COMP_V4L)
|
|
{
|
|
setV4LCaptureEnable(enable);
|
|
}
|
|
}
|
|
|
|
void CaptureCont::setV4lInactive()
|
|
{
|
|
_hyperion->setInputInactive(_v4lCaptPrio);
|
|
}
|
|
|
|
void CaptureCont::setSystemInactive()
|
|
{
|
|
_hyperion->setInputInactive(_systemCaptPrio);
|
|
}
|