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>
398 lines
11 KiB
C++
398 lines
11 KiB
C++
// STL includes
|
|
#include <algorithm>
|
|
#include <limits>
|
|
|
|
// qt incl
|
|
#include <QDateTime>
|
|
#include <QTimer>
|
|
|
|
// Hyperion includes
|
|
#include <hyperion/PriorityMuxer.h>
|
|
|
|
// utils
|
|
#include <utils/Logger.h>
|
|
|
|
const int PriorityMuxer::FG_PRIORITY = 1;
|
|
const int PriorityMuxer::BG_PRIORITY = 254;
|
|
const int PriorityMuxer::MANUAL_SELECTED_PRIORITY = 256;
|
|
const int PriorityMuxer::LOWEST_PRIORITY = std::numeric_limits<uint8_t>::max();
|
|
const int PriorityMuxer::TIMEOUT_NOT_ACTIVE_PRIO = -100;
|
|
|
|
PriorityMuxer::PriorityMuxer(int ledCount, QObject * parent)
|
|
: QObject(parent)
|
|
, _log(Logger::getInstance("HYPERION"))
|
|
, _currentPriority(PriorityMuxer::LOWEST_PRIORITY)
|
|
, _previousPriority(_currentPriority)
|
|
, _manualSelectedPriority(MANUAL_SELECTED_PRIORITY)
|
|
, _prevVisComp (hyperion::Components::COMP_COLOR)
|
|
, _activeInputs()
|
|
, _lowestPriorityInfo()
|
|
, _sourceAutoSelectEnabled(true)
|
|
, _updateTimer(new QTimer(this))
|
|
, _timer(new QTimer(this))
|
|
, _blockTimer(new QTimer(this))
|
|
{
|
|
// init lowest priority info
|
|
_lowestPriorityInfo.priority = PriorityMuxer::LOWEST_PRIORITY;
|
|
_lowestPriorityInfo.timeoutTime_ms = -1;
|
|
_lowestPriorityInfo.ledColors = std::vector<ColorRgb>(ledCount, {0, 0, 0});
|
|
_lowestPriorityInfo.componentId = hyperion::COMP_COLOR;
|
|
_lowestPriorityInfo.origin = "System";
|
|
_lowestPriorityInfo.owner = "";
|
|
|
|
_activeInputs[PriorityMuxer::LOWEST_PRIORITY] = _lowestPriorityInfo;
|
|
|
|
// adapt to 1s interval for COLOR and EFFECT timeouts > -1
|
|
connect(_timer, &QTimer::timeout, this, &PriorityMuxer::timeTrigger);
|
|
_timer->setSingleShot(true);
|
|
_blockTimer->setSingleShot(true);
|
|
// forward timeRunner signal to prioritiesChanged signal & threading workaround
|
|
connect(this, &PriorityMuxer::timeRunner, this, &PriorityMuxer::prioritiesChanged);
|
|
connect(this, &PriorityMuxer::signalTimeTrigger, this, &PriorityMuxer::timeTrigger);
|
|
|
|
// start muxer timer
|
|
connect(_updateTimer, &QTimer::timeout, this, &PriorityMuxer::setCurrentTime);
|
|
_updateTimer->setInterval(250);
|
|
_updateTimer->start();
|
|
}
|
|
|
|
PriorityMuxer::~PriorityMuxer()
|
|
{
|
|
}
|
|
|
|
void PriorityMuxer::setEnable(bool enable)
|
|
{
|
|
enable ? _updateTimer->start() : _updateTimer->stop();
|
|
}
|
|
|
|
bool PriorityMuxer::setSourceAutoSelectEnabled(bool enable, bool update)
|
|
{
|
|
if(_sourceAutoSelectEnabled != enable)
|
|
{
|
|
// on disable we need to make sure the last priority call to setPriority is still valid
|
|
if(!enable && !_activeInputs.contains(_manualSelectedPriority))
|
|
{
|
|
Warning(_log, "Can't disable auto selection, as the last manual selected priority (%d) is no longer available", _manualSelectedPriority);
|
|
return false;
|
|
}
|
|
|
|
_sourceAutoSelectEnabled = enable;
|
|
Debug(_log, "Source auto select is now %s", enable ? "enabled" : "disabled");
|
|
|
|
// update _currentPriority if called from external
|
|
if(update)
|
|
setCurrentTime();
|
|
|
|
return true;
|
|
}
|
|
return false;
|
|
}
|
|
|
|
bool PriorityMuxer::setPriority(int priority)
|
|
{
|
|
if(_activeInputs.contains(priority))
|
|
{
|
|
_manualSelectedPriority = priority;
|
|
// update auto select state -> update _currentPriority
|
|
setSourceAutoSelectEnabled(false);
|
|
return true;
|
|
}
|
|
return false;
|
|
}
|
|
|
|
void PriorityMuxer::updateLedColorsLength(int ledCount)
|
|
{
|
|
for (auto infoIt = _activeInputs.begin(); infoIt != _activeInputs.end();)
|
|
{
|
|
if (!infoIt->ledColors.empty())
|
|
{
|
|
infoIt->ledColors.resize(ledCount, infoIt->ledColors.at(0));
|
|
}
|
|
++infoIt;
|
|
}
|
|
}
|
|
|
|
QList<int> PriorityMuxer::getPriorities() const
|
|
{
|
|
return _activeInputs.keys();
|
|
}
|
|
|
|
bool PriorityMuxer::hasPriority(int priority) const
|
|
{
|
|
return (priority == PriorityMuxer::LOWEST_PRIORITY) ? true : _activeInputs.contains(priority);
|
|
}
|
|
|
|
PriorityMuxer::InputInfo PriorityMuxer::getInputInfo(int priority) const
|
|
{
|
|
auto elemIt = _activeInputs.find(priority);
|
|
if (elemIt == _activeInputs.end())
|
|
{
|
|
elemIt = _activeInputs.find(PriorityMuxer::LOWEST_PRIORITY);
|
|
if (elemIt == _activeInputs.end())
|
|
{
|
|
// fallback
|
|
return _lowestPriorityInfo;
|
|
}
|
|
}
|
|
return elemIt.value();
|
|
}
|
|
|
|
hyperion::Components PriorityMuxer::getComponentOfPriority(int priority) const
|
|
{
|
|
return _activeInputs[priority].componentId;
|
|
}
|
|
|
|
void PriorityMuxer::registerInput(int priority, hyperion::Components component, const QString& origin, const QString& owner, unsigned smooth_cfg)
|
|
{
|
|
// detect new registers
|
|
bool newInput = false;
|
|
bool reusedInput = false;
|
|
if (!_activeInputs.contains(priority))
|
|
newInput = true;
|
|
else if(_prevVisComp == component || _activeInputs[priority].componentId == component)
|
|
reusedInput = true;
|
|
|
|
InputInfo& input = _activeInputs[priority];
|
|
input.priority = priority;
|
|
input.timeoutTime_ms = newInput ? TIMEOUT_NOT_ACTIVE_PRIO : input.timeoutTime_ms;
|
|
input.componentId = component;
|
|
input.origin = origin;
|
|
input.smooth_cfg = smooth_cfg;
|
|
input.owner = owner;
|
|
|
|
if (newInput)
|
|
{
|
|
Debug(_log,"Register new input '%s/%s' with priority %d as inactive", QSTRING_CSTR(origin), hyperion::componentToIdString(component), priority);
|
|
// emit 'prioritiesChanged' only if _sourceAutoSelectEnabled is false
|
|
if (!_sourceAutoSelectEnabled)
|
|
{
|
|
emit prioritiesChanged();
|
|
}
|
|
return;
|
|
}
|
|
|
|
if (reusedInput)
|
|
{
|
|
emit timeRunner();
|
|
}
|
|
}
|
|
|
|
bool PriorityMuxer::setInput(int priority, const std::vector<ColorRgb>& ledColors, int64_t timeout_ms)
|
|
{
|
|
if(!_activeInputs.contains(priority))
|
|
{
|
|
Error(_log,"setInput() used without registerInput() for priority '%d', probably the priority reached timeout",priority);
|
|
return false;
|
|
}
|
|
|
|
InputInfo& input = _activeInputs[priority];
|
|
// detect active <-> inactive changes
|
|
bool activeChange = false;
|
|
bool active = true;
|
|
|
|
// calculate final timeout
|
|
if (timeout_ms >= 0)
|
|
{
|
|
timeout_ms = QDateTime::currentMSecsSinceEpoch() + timeout_ms;
|
|
}
|
|
else if (input.timeoutTime_ms >= 0)
|
|
{
|
|
timeout_ms = QDateTime::currentMSecsSinceEpoch();
|
|
}
|
|
|
|
if(input.timeoutTime_ms == TIMEOUT_NOT_ACTIVE_PRIO && timeout_ms != TIMEOUT_NOT_ACTIVE_PRIO)
|
|
{
|
|
activeChange = true;
|
|
}
|
|
else if(timeout_ms == TIMEOUT_NOT_ACTIVE_PRIO && input.timeoutTime_ms != TIMEOUT_NOT_ACTIVE_PRIO)
|
|
{
|
|
active = false;
|
|
activeChange = true;
|
|
}
|
|
// update input
|
|
input.timeoutTime_ms = timeout_ms;
|
|
input.ledColors = ledColors;
|
|
input.image.clear();
|
|
|
|
// emit active change
|
|
if(activeChange)
|
|
{
|
|
Debug(_log, "Priority %d is now %s", priority, active ? "active" : "inactive");
|
|
if (_currentPriority < priority)
|
|
{
|
|
emit prioritiesChanged();
|
|
}
|
|
setCurrentTime();
|
|
}
|
|
|
|
return true;
|
|
}
|
|
|
|
bool PriorityMuxer::setInputImage(int priority, const Image<ColorRgb>& image, int64_t timeout_ms)
|
|
{
|
|
if(!_activeInputs.contains(priority))
|
|
{
|
|
Error(_log,"setInputImage() used without registerInput() for priority '%d', probably the priority reached timeout",priority);
|
|
return false;
|
|
}
|
|
|
|
InputInfo& input = _activeInputs[priority];
|
|
// detect active <-> inactive changes
|
|
bool activeChange = false;
|
|
bool active = true;
|
|
|
|
// calculate final timeout
|
|
if (timeout_ms >= 0)
|
|
{
|
|
timeout_ms = QDateTime::currentMSecsSinceEpoch() + timeout_ms;
|
|
}
|
|
else if (input.timeoutTime_ms >= 0)
|
|
{
|
|
timeout_ms = QDateTime::currentMSecsSinceEpoch();
|
|
}
|
|
|
|
if(input.timeoutTime_ms == TIMEOUT_NOT_ACTIVE_PRIO && timeout_ms != TIMEOUT_NOT_ACTIVE_PRIO)
|
|
{
|
|
activeChange = true;
|
|
}
|
|
else if(timeout_ms == TIMEOUT_NOT_ACTIVE_PRIO && input.timeoutTime_ms != TIMEOUT_NOT_ACTIVE_PRIO)
|
|
{
|
|
active = false;
|
|
activeChange = true;
|
|
}
|
|
// update input
|
|
input.timeoutTime_ms = timeout_ms;
|
|
input.image = image;
|
|
input.ledColors.clear();
|
|
|
|
// emit active change
|
|
if(activeChange)
|
|
{
|
|
Debug(_log, "Priority %d is now %s", priority, active ? "active" : "inactive");
|
|
if (_currentPriority < priority)
|
|
{
|
|
emit prioritiesChanged();
|
|
}
|
|
setCurrentTime();
|
|
}
|
|
|
|
return true;
|
|
}
|
|
|
|
bool PriorityMuxer::setInputInactive(int priority)
|
|
{
|
|
Image<ColorRgb> image;
|
|
return setInputImage(priority, image, TIMEOUT_NOT_ACTIVE_PRIO);
|
|
}
|
|
|
|
bool PriorityMuxer::clearInput(int priority)
|
|
{
|
|
if (priority < PriorityMuxer::LOWEST_PRIORITY && (_activeInputs.remove(priority) > 0))
|
|
{
|
|
Debug(_log,"Removed source priority %d",priority);
|
|
// on clear success update _currentPriority
|
|
setCurrentTime();
|
|
// emit 'prioritiesChanged' only if _sourceAutoSelectEnabled is false
|
|
if ((!_sourceAutoSelectEnabled && (_currentPriority < priority)) || _currentPriority == BG_PRIORITY)
|
|
emit prioritiesChanged();
|
|
return true;
|
|
}
|
|
return false;
|
|
}
|
|
|
|
void PriorityMuxer::clearAll(bool forceClearAll)
|
|
{
|
|
if (forceClearAll)
|
|
{
|
|
_previousPriority = _currentPriority;
|
|
_activeInputs.clear();
|
|
_currentPriority = PriorityMuxer::LOWEST_PRIORITY;
|
|
_activeInputs[_currentPriority] = _lowestPriorityInfo;
|
|
}
|
|
else
|
|
{
|
|
for(auto key : _activeInputs.keys())
|
|
{
|
|
const InputInfo info = getInputInfo(key);
|
|
if ((info.componentId == hyperion::COMP_COLOR || info.componentId == hyperion::COMP_EFFECT || info.componentId == hyperion::COMP_IMAGE) && key < PriorityMuxer::LOWEST_PRIORITY-1)
|
|
{
|
|
clearInput(key);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
void PriorityMuxer::setCurrentTime()
|
|
{
|
|
const int64_t now = QDateTime::currentMSecsSinceEpoch();
|
|
int newPriority;
|
|
_activeInputs.contains(0) ? newPriority = 0 : newPriority = PriorityMuxer::LOWEST_PRIORITY;
|
|
|
|
for (auto infoIt = _activeInputs.begin(); infoIt != _activeInputs.end();)
|
|
{
|
|
if (infoIt->timeoutTime_ms > 0 && infoIt->timeoutTime_ms <= now)
|
|
{
|
|
int tPrio = infoIt->priority;
|
|
infoIt = _activeInputs.erase(infoIt);
|
|
Debug(_log,"Timeout clear for priority %d",tPrio);
|
|
emit prioritiesChanged();
|
|
}
|
|
else
|
|
{
|
|
// timeoutTime of TIMEOUT_NOT_ACTIVE_PRIO is awaiting data (inactive); skip
|
|
if(infoIt->timeoutTime_ms > TIMEOUT_NOT_ACTIVE_PRIO)
|
|
newPriority = qMin(newPriority, infoIt->priority);
|
|
|
|
// call timeTrigger when effect or color is running with timeout > 0, blacklist prio 255
|
|
if (infoIt->priority < BG_PRIORITY && infoIt->timeoutTime_ms > 0 && (infoIt->componentId == hyperion::COMP_EFFECT || infoIt->componentId == hyperion::COMP_COLOR || infoIt->componentId == hyperion::COMP_IMAGE))
|
|
{
|
|
emit signalTimeTrigger(); // as signal to prevent Threading issues
|
|
}
|
|
++infoIt;
|
|
}
|
|
}
|
|
// evaluate, if manual selected priority is still available
|
|
if(!_sourceAutoSelectEnabled)
|
|
{
|
|
if(_activeInputs.contains(_manualSelectedPriority))
|
|
{
|
|
newPriority = _manualSelectedPriority;
|
|
}
|
|
else
|
|
{
|
|
Debug(_log, "The manual selected priority '%d' is no longer available, switching to auto selection", _manualSelectedPriority);
|
|
// update state, but no _currentPriority re-eval
|
|
setSourceAutoSelectEnabled(true, false);
|
|
}
|
|
}
|
|
// apply & emit on change (after apply!)
|
|
hyperion::Components comp = getComponentOfPriority(newPriority);
|
|
if (_currentPriority != newPriority || comp != _prevVisComp)
|
|
{
|
|
_previousPriority = _currentPriority;
|
|
_currentPriority = newPriority;
|
|
Debug(_log, "Set visible priority to %d", newPriority);
|
|
emit visiblePriorityChanged(newPriority);
|
|
// check for visible comp change
|
|
if (comp != _prevVisComp)
|
|
{
|
|
_prevVisComp = comp;
|
|
emit visibleComponentChanged(comp);
|
|
}
|
|
emit prioritiesChanged();
|
|
}
|
|
}
|
|
|
|
void PriorityMuxer::timeTrigger()
|
|
{
|
|
if(_blockTimer->isActive())
|
|
{
|
|
_timer->start(500);
|
|
}
|
|
else
|
|
{
|
|
emit timeRunner();
|
|
_blockTimer->start(1000);
|
|
}
|
|
}
|