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>
255 lines
9.7 KiB
C++
255 lines
9.7 KiB
C++
#pragma once
|
|
|
|
#include <sstream>
|
|
|
|
#include <hyperion/ColorAdjustment.h>
|
|
#include <hyperion/MultiColorAdjustment.h>
|
|
#include <hyperion/LedString.h>
|
|
// fg effect
|
|
#include <hyperion/Hyperion.h>
|
|
#include <hyperion/PriorityMuxer.h>
|
|
#include <effectengine/Effect.h>
|
|
|
|
///
|
|
/// @brief Provide utility methods for Hyperion class
|
|
///
|
|
namespace hyperion {
|
|
|
|
void handleInitialEffect(Hyperion* hyperion, const QJsonObject& FGEffectConfig)
|
|
{
|
|
#define FGCONFIG_ARRAY fgColorConfig.toArray()
|
|
|
|
// initial foreground effect/color
|
|
if (FGEffectConfig["enable"].toBool(true))
|
|
{
|
|
const QString fgTypeConfig = FGEffectConfig["type"].toString("effect");
|
|
const QString fgEffectConfig = FGEffectConfig["effect"].toString("Rainbow swirl fast");
|
|
const QJsonValue fgColorConfig = FGEffectConfig["color"];
|
|
int default_fg_duration_ms = 3000;
|
|
int fg_duration_ms = FGEffectConfig["duration_ms"].toInt(default_fg_duration_ms);
|
|
if (fg_duration_ms <= Effect::ENDLESS)
|
|
{
|
|
fg_duration_ms = default_fg_duration_ms;
|
|
Warning(Logger::getInstance("HYPERION"), "foreground effect duration 'infinity' is forbidden, set to default value %d ms",default_fg_duration_ms);
|
|
}
|
|
if ( fgTypeConfig.contains("color") )
|
|
{
|
|
std::vector<ColorRgb> fg_color = {
|
|
ColorRgb {
|
|
static_cast<uint8_t>(FGCONFIG_ARRAY.at(0).toInt(0)),
|
|
static_cast<uint8_t>(FGCONFIG_ARRAY.at(1).toInt(0)),
|
|
static_cast<uint8_t>(FGCONFIG_ARRAY.at(2).toInt(0))
|
|
}
|
|
};
|
|
hyperion->setColor(PriorityMuxer::FG_PRIORITY, fg_color, fg_duration_ms);
|
|
Info(Logger::getInstance("HYPERION"),"Initial foreground color set (%d %d %d)",fg_color.at(0).red,fg_color.at(0).green,fg_color.at(0).blue);
|
|
}
|
|
else
|
|
{
|
|
int result = hyperion->setEffect(fgEffectConfig, PriorityMuxer::FG_PRIORITY, fg_duration_ms);
|
|
Info(Logger::getInstance("HYPERION"),"Initial foreground effect '%s' %s", QSTRING_CSTR(fgEffectConfig), ((result == 0) ? "started" : "failed"));
|
|
}
|
|
}
|
|
#undef FGCONFIG_ARRAY
|
|
}
|
|
|
|
ColorOrder createColorOrder(const QJsonObject &deviceConfig)
|
|
{
|
|
return stringToColorOrder(deviceConfig["colorOrder"].toString("rgb"));
|
|
}
|
|
|
|
RgbTransform createRgbTransform(const QJsonObject& colorConfig)
|
|
{
|
|
const double backlightThreshold = colorConfig["backlightThreshold"].toDouble(0.0);
|
|
const bool backlightColored = colorConfig["backlightColored"].toBool(false);
|
|
const int brightness = colorConfig["brightness"].toInt(100);
|
|
const int brightnessComp = colorConfig["brightnessCompensation"].toInt(100);
|
|
const double gammaR = colorConfig["gammaRed"].toDouble(1.0);
|
|
const double gammaG = colorConfig["gammaGreen"].toDouble(1.0);
|
|
const double gammaB = colorConfig["gammaBlue"].toDouble(1.0);
|
|
|
|
return RgbTransform(gammaR, gammaG, gammaB, backlightThreshold, backlightColored, static_cast<uint8_t>(brightness), static_cast<uint8_t>(brightnessComp));
|
|
}
|
|
|
|
RgbChannelAdjustment createRgbChannelAdjustment(const QJsonObject& colorConfig, const QString& channelName, int defaultR, int defaultG, int defaultB)
|
|
{
|
|
const QJsonArray& channelConfig = colorConfig[channelName].toArray();
|
|
return RgbChannelAdjustment(
|
|
static_cast<uint8_t>(channelConfig[0].toInt(defaultR)),
|
|
static_cast<uint8_t>(channelConfig[1].toInt(defaultG)),
|
|
static_cast<uint8_t>(channelConfig[2].toInt(defaultB)),
|
|
"ChannelAdjust_" + channelName.toUpper()
|
|
);
|
|
}
|
|
|
|
ColorAdjustment* createColorAdjustment(const QJsonObject & adjustmentConfig)
|
|
{
|
|
const QString id = adjustmentConfig["id"].toString("default");
|
|
|
|
ColorAdjustment * adjustment = new ColorAdjustment();
|
|
adjustment->_id = id;
|
|
adjustment->_rgbBlackAdjustment = createRgbChannelAdjustment(adjustmentConfig, "black" , 0, 0, 0);
|
|
adjustment->_rgbWhiteAdjustment = createRgbChannelAdjustment(adjustmentConfig, "white" , 255,255,255);
|
|
adjustment->_rgbRedAdjustment = createRgbChannelAdjustment(adjustmentConfig, "red" , 255, 0, 0);
|
|
adjustment->_rgbGreenAdjustment = createRgbChannelAdjustment(adjustmentConfig, "green" , 0,255, 0);
|
|
adjustment->_rgbBlueAdjustment = createRgbChannelAdjustment(adjustmentConfig, "blue" , 0, 0,255);
|
|
adjustment->_rgbCyanAdjustment = createRgbChannelAdjustment(adjustmentConfig, "cyan" , 0,255,255);
|
|
adjustment->_rgbMagentaAdjustment = createRgbChannelAdjustment(adjustmentConfig, "magenta", 255, 0,255);
|
|
adjustment->_rgbYellowAdjustment = createRgbChannelAdjustment(adjustmentConfig, "yellow" , 255,255, 0);
|
|
adjustment->_rgbTransform = createRgbTransform(adjustmentConfig);
|
|
|
|
return adjustment;
|
|
}
|
|
|
|
MultiColorAdjustment * createLedColorsAdjustment(int ledCnt, const QJsonObject & colorConfig)
|
|
{
|
|
// Create the result, the transforms are added to this
|
|
MultiColorAdjustment * adjustment = new MultiColorAdjustment(ledCnt);
|
|
|
|
const QJsonValue adjustmentConfig = colorConfig["channelAdjustment"];
|
|
const QRegExp overallExp("([0-9]+(\\-[0-9]+)?)(,[ ]*([0-9]+(\\-[0-9]+)?))*");
|
|
|
|
const QJsonArray & adjustmentConfigArray = adjustmentConfig.toArray();
|
|
for (signed i = 0; i < adjustmentConfigArray.size(); ++i)
|
|
{
|
|
const QJsonObject & config = adjustmentConfigArray.at(i).toObject();
|
|
ColorAdjustment * colorAdjustment = createColorAdjustment(config);
|
|
adjustment->addAdjustment(colorAdjustment);
|
|
|
|
const QString ledIndicesStr = config["leds"].toString("").trimmed();
|
|
if (ledIndicesStr.compare("*") == 0)
|
|
{
|
|
// Special case for indices '*' => all leds
|
|
adjustment->setAdjustmentForLed(colorAdjustment->_id, 0, ledCnt-1);
|
|
//Info(Logger::getInstance("HYPERION"), "ColorAdjustment '%s' => [0-%d]", QSTRING_CSTR(colorAdjustment->_id), ledCnt-1);
|
|
continue;
|
|
}
|
|
|
|
if (!overallExp.exactMatch(ledIndicesStr))
|
|
{
|
|
//Error(Logger::getInstance("HYPERION"), "Given led indices %d not correct format: %s", i, QSTRING_CSTR(ledIndicesStr));
|
|
continue;
|
|
}
|
|
|
|
std::stringstream ss;
|
|
const QStringList ledIndexList = ledIndicesStr.split(",");
|
|
for (int i=0; i<ledIndexList.size(); ++i) {
|
|
if (i > 0)
|
|
{
|
|
ss << ", ";
|
|
}
|
|
if (ledIndexList[i].contains("-"))
|
|
{
|
|
QStringList ledIndices = ledIndexList[i].split("-");
|
|
int startInd = ledIndices[0].toInt();
|
|
int endInd = ledIndices[1].toInt();
|
|
|
|
adjustment->setAdjustmentForLed(colorAdjustment->_id, startInd, endInd);
|
|
ss << startInd << "-" << endInd;
|
|
}
|
|
else
|
|
{
|
|
int index = ledIndexList[i].toInt();
|
|
adjustment->setAdjustmentForLed(colorAdjustment->_id, index, index);
|
|
ss << index;
|
|
}
|
|
}
|
|
//Info(Logger::getInstance("HYPERION"), "ColorAdjustment '%s' => [%s]", QSTRING_CSTR(colorAdjustment->_id), ss.str().c_str());
|
|
}
|
|
|
|
return adjustment;
|
|
}
|
|
|
|
/**
|
|
* Construct the 'led-string' with the integration area definition per led and the color
|
|
* ordering of the RGB channels
|
|
* @param ledsConfig The configuration of the led areas
|
|
* @param deviceOrder The default RGB channel ordering
|
|
* @return The constructed ledstring
|
|
*/
|
|
LedString createLedString(const QJsonArray& ledConfigArray, const ColorOrder deviceOrder)
|
|
{
|
|
LedString ledString;
|
|
const QString deviceOrderStr = colorOrderToString(deviceOrder);
|
|
|
|
for (signed i = 0; i < ledConfigArray.size(); ++i)
|
|
{
|
|
const QJsonObject& ledConfig = ledConfigArray[i].toObject();
|
|
Led led;
|
|
|
|
led.minX_frac = qMax(0.0, qMin(1.0, ledConfig["hmin"].toDouble()));
|
|
led.maxX_frac = qMax(0.0, qMin(1.0, ledConfig["hmax"].toDouble()));
|
|
led.minY_frac = qMax(0.0, qMin(1.0, ledConfig["vmin"].toDouble()));
|
|
led.maxY_frac = qMax(0.0, qMin(1.0, ledConfig["vmax"].toDouble()));
|
|
// Fix if the user swapped min and max
|
|
if (led.minX_frac > led.maxX_frac)
|
|
{
|
|
std::swap(led.minX_frac, led.maxX_frac);
|
|
}
|
|
if (led.minY_frac > led.maxY_frac)
|
|
{
|
|
std::swap(led.minY_frac, led.maxY_frac);
|
|
}
|
|
|
|
// Get the order of the rgb channels for this led (default is device order)
|
|
led.colorOrder = stringToColorOrder(ledConfig["colorOrder"].toString(deviceOrderStr));
|
|
ledString.leds().push_back(led);
|
|
}
|
|
return ledString;
|
|
}
|
|
|
|
QSize getLedLayoutGridSize(const QJsonArray& ledConfigArray)
|
|
{
|
|
std::vector<int> midPointsX;
|
|
std::vector<int> midPointsY;
|
|
|
|
for (signed i = 0; i < ledConfigArray.size(); ++i)
|
|
{
|
|
const QJsonObject& ledConfig = ledConfigArray[i].toObject();
|
|
|
|
double minX_frac = qMax(0.0, qMin(1.0, ledConfig["hmin"].toDouble()));
|
|
double maxX_frac = qMax(0.0, qMin(1.0, ledConfig["hmax"].toDouble()));
|
|
double minY_frac = qMax(0.0, qMin(1.0, ledConfig["vmin"].toDouble()));
|
|
double maxY_frac = qMax(0.0, qMin(1.0, ledConfig["vmax"].toDouble()));
|
|
// Fix if the user swapped min and max
|
|
if (minX_frac > maxX_frac)
|
|
{
|
|
std::swap(minX_frac, maxX_frac);
|
|
}
|
|
if (minY_frac > maxY_frac)
|
|
{
|
|
std::swap(minY_frac, maxY_frac);
|
|
}
|
|
|
|
// calculate mid point and make grid calculation
|
|
midPointsX.push_back( int(1000.0*(minX_frac + maxX_frac) / 2.0) );
|
|
midPointsY.push_back( int(1000.0*(minY_frac + maxY_frac) / 2.0) );
|
|
|
|
}
|
|
|
|
// remove duplicates
|
|
std::sort(midPointsX.begin(), midPointsX.end());
|
|
midPointsX.erase(std::unique(midPointsX.begin(), midPointsX.end()), midPointsX.end());
|
|
std::sort(midPointsY.begin(), midPointsY.end());
|
|
midPointsY.erase(std::unique(midPointsY.begin(), midPointsY.end()), midPointsY.end());
|
|
|
|
QSize gridSize( static_cast<int>(midPointsX.size()), static_cast<int>(midPointsY.size()) );
|
|
|
|
// Correct the grid in case it is malformed in width vs height
|
|
// Expected is at least 50% of width <-> height
|
|
if((gridSize.width() / gridSize.height()) > 2)
|
|
gridSize.setHeight(qMax(1,gridSize.width()/2));
|
|
else if((gridSize.width() / gridSize.height()) < 0.5)
|
|
gridSize.setWidth(qMax(1,gridSize.height()/2));
|
|
|
|
// Limit to 80px for performance reasons
|
|
const int pl = 80;
|
|
if(gridSize.width() > pl || gridSize.height() > pl)
|
|
{
|
|
gridSize.scale(pl, pl, Qt::KeepAspectRatio);
|
|
}
|
|
|
|
return gridSize;
|
|
}
|
|
};
|