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>
201 lines
5.1 KiB
C++
201 lines
5.1 KiB
C++
#pragma once
|
|
|
|
#include <QApplication>
|
|
#include <QObject>
|
|
#include <QJsonObject>
|
|
|
|
#ifdef ENABLE_DISPMANX
|
|
#include <grabber/DispmanxWrapper.h>
|
|
#else
|
|
typedef QObject DispmanxWrapper;
|
|
#endif
|
|
|
|
#if defined(ENABLE_V4L2) || defined(ENABLE_MF)
|
|
#include <grabber/VideoWrapper.h>
|
|
#else
|
|
typedef QObject VideoWrapper;
|
|
#endif
|
|
|
|
#ifdef ENABLE_FB
|
|
#include <grabber/FramebufferWrapper.h>
|
|
#else
|
|
typedef QObject FramebufferWrapper;
|
|
#endif
|
|
|
|
#ifdef ENABLE_AMLOGIC
|
|
#include <grabber/AmlogicWrapper.h>
|
|
#else
|
|
typedef QObject AmlogicWrapper;
|
|
#endif
|
|
|
|
#ifdef ENABLE_OSX
|
|
#include <grabber/OsxWrapper.h>
|
|
#else
|
|
typedef QObject OsxWrapper;
|
|
#endif
|
|
|
|
#ifdef ENABLE_X11
|
|
#include <grabber/X11Wrapper.h>
|
|
#else
|
|
typedef QObject X11Wrapper;
|
|
#endif
|
|
|
|
#ifdef ENABLE_XCB
|
|
#include <grabber/XcbWrapper.h>
|
|
#else
|
|
typedef QObject XcbWrapper;
|
|
#endif
|
|
|
|
#ifdef ENABLE_QT
|
|
#include <grabber/QtWrapper.h>
|
|
#else
|
|
typedef QObject QtWrapper;
|
|
#endif
|
|
|
|
#ifdef ENABLE_DX
|
|
#include <grabber/DirectXWrapper.h>
|
|
#else
|
|
typedef QObject DirectXWrapper;
|
|
#endif
|
|
|
|
#include <utils/Logger.h>
|
|
#include <utils/VideoMode.h>
|
|
|
|
// settings management
|
|
#include <utils/settings.h>
|
|
#include <utils/Components.h>
|
|
|
|
class HyperionIManager;
|
|
class SysTray;
|
|
class JsonServer;
|
|
class BonjourBrowserWrapper;
|
|
class WebServer;
|
|
class SettingsManager;
|
|
class PythonInit;
|
|
class SSDPHandler;
|
|
class FlatBufferServer;
|
|
class ProtoServer;
|
|
class AuthManager;
|
|
class NetOrigin;
|
|
class CECHandler;
|
|
|
|
class HyperionDaemon : public QObject
|
|
{
|
|
Q_OBJECT
|
|
|
|
friend SysTray;
|
|
|
|
public:
|
|
HyperionDaemon(const QString& rootPath, QObject *parent, bool logLvlOverwrite, bool readonlyMode = false);
|
|
~HyperionDaemon();
|
|
|
|
///
|
|
/// @brief Get webserver pointer (systray)
|
|
///
|
|
WebServer *getWebServerInstance() { return _webserver; }
|
|
|
|
///
|
|
/// @brief Get the current videoMode
|
|
///
|
|
VideoMode getVideoMode() const { return _currVideoMode; }
|
|
|
|
///
|
|
/// @brief get the settings
|
|
///
|
|
QJsonDocument getSetting(settings::type type) const;
|
|
|
|
void startNetworkServices();
|
|
|
|
static HyperionDaemon* getInstance() { return daemon; }
|
|
static HyperionDaemon* daemon;
|
|
|
|
public slots:
|
|
void freeObjects();
|
|
|
|
signals:
|
|
///////////////////////////////////////
|
|
/// FROM HYPERIONDAEMON TO HYPERION ///
|
|
///////////////////////////////////////
|
|
|
|
///
|
|
/// @brief After eval of setVideoMode this signal emits with a new one on change
|
|
///
|
|
void videoMode(VideoMode mode);
|
|
|
|
///////////////////////////////////////
|
|
/// FROM HYPERION TO HYPERIONDAEMON ///
|
|
///////////////////////////////////////
|
|
|
|
///
|
|
/// @brief PIPE settings events from Hyperion class to HyperionDaemon components
|
|
///
|
|
void settingsChanged(settings::type type, const QJsonDocument& data);
|
|
|
|
///
|
|
/// @brief PIPE component state changes events from Hyperion class to HyperionDaemon components
|
|
///
|
|
void compStateChangeRequest(hyperion::Components component, bool enable);
|
|
|
|
private slots:
|
|
///
|
|
/// @brief Handle settings update from Hyperion Settingsmanager emit or this constructor
|
|
/// @param type settingyType from enum
|
|
/// @param config configuration object
|
|
///
|
|
void handleSettingsUpdate(settings::type type, const QJsonDocument& config);
|
|
|
|
///
|
|
/// @brief Listen for videoMode changes and emit videoMode in case of a change, update _currVideoMode
|
|
/// @param mode The requested video mode
|
|
///
|
|
void setVideoMode(VideoMode mode);
|
|
|
|
private:
|
|
void createGrabberDispmanx(const QJsonObject & grabberConfig);
|
|
void createGrabberAmlogic(const QJsonObject & grabberConfig);
|
|
void createGrabberFramebuffer(const QJsonObject & grabberConfig);
|
|
void createGrabberOsx(const QJsonObject & grabberConfig);
|
|
void createGrabberX11(const QJsonObject & grabberConfig);
|
|
void createGrabberXcb(const QJsonObject & grabberConfig);
|
|
void createGrabberQt(const QJsonObject & grabberConfig);
|
|
void createCecHandler();
|
|
void createGrabberDx(const QJsonObject & grabberConfig);
|
|
|
|
Logger* _log;
|
|
HyperionIManager* _instanceManager;
|
|
AuthManager* _authManager;
|
|
BonjourBrowserWrapper* _bonjourBrowserWrapper;
|
|
NetOrigin* _netOrigin;
|
|
PythonInit* _pyInit;
|
|
WebServer* _webserver;
|
|
WebServer* _sslWebserver;
|
|
JsonServer* _jsonServer;
|
|
VideoWrapper* _videoGrabber;
|
|
DispmanxWrapper* _dispmanx;
|
|
X11Wrapper* _x11Grabber;
|
|
XcbWrapper* _xcbGrabber;
|
|
AmlogicWrapper* _amlGrabber;
|
|
FramebufferWrapper* _fbGrabber;
|
|
OsxWrapper* _osxGrabber;
|
|
QtWrapper* _qtGrabber;
|
|
DirectXWrapper* _dxGrabber;
|
|
SSDPHandler* _ssdp;
|
|
CECHandler* _cecHandler;
|
|
FlatBufferServer* _flatBufferServer;
|
|
ProtoServer* _protoServer;
|
|
|
|
int _grabber_width;
|
|
int _grabber_height;
|
|
int _grabber_pixelDecimation;
|
|
int _grabber_frequency;
|
|
int _grabber_cropLeft;
|
|
int _grabber_cropRight;
|
|
int _grabber_cropTop;
|
|
int _grabber_cropBottom;
|
|
|
|
QString _prevType;
|
|
|
|
VideoMode _currVideoMode;
|
|
SettingsManager* _settingsManager;
|
|
};
|