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>
150 lines
3.9 KiB
C++
150 lines
3.9 KiB
C++
#include <QMetaType>
|
|
|
|
#include <grabber/VideoWrapper.h>
|
|
|
|
// qt includes
|
|
#include <QTimer>
|
|
|
|
VideoWrapper::VideoWrapper()
|
|
#if defined(ENABLE_V4L2)
|
|
: GrabberWrapper("V4L2", &_grabber)
|
|
#elif defined(ENABLE_MF)
|
|
: GrabberWrapper("V4L2:MEDIA_FOUNDATION", &_grabber)
|
|
#endif
|
|
, _grabber()
|
|
{
|
|
// register the image type
|
|
qRegisterMetaType<Image<ColorRgb>>("Image<ColorRgb>");
|
|
|
|
// Handle the image in the captured thread (Media Foundation/V4L2) using a direct connection
|
|
connect(&_grabber, SIGNAL(newFrame(const Image<ColorRgb>&)), this, SLOT(newFrame(const Image<ColorRgb>&)), Qt::DirectConnection);
|
|
connect(&_grabber, SIGNAL(readError(const char*)), this, SLOT(readError(const char*)), Qt::DirectConnection);
|
|
}
|
|
|
|
VideoWrapper::~VideoWrapper()
|
|
{
|
|
stop();
|
|
}
|
|
|
|
bool VideoWrapper::start()
|
|
{
|
|
return (_grabber.prepare() && _grabber.start() && GrabberWrapper::start());
|
|
}
|
|
|
|
void VideoWrapper::stop()
|
|
{
|
|
_grabber.stop();
|
|
GrabberWrapper::stop();
|
|
}
|
|
|
|
#if defined(ENABLE_CEC) && !defined(ENABLE_MF)
|
|
|
|
void VideoWrapper::handleCecEvent(CECEvent event)
|
|
{
|
|
_grabber.handleCecEvent(event);
|
|
}
|
|
|
|
#endif
|
|
|
|
void VideoWrapper::handleSettingsUpdate(settings::type type, const QJsonDocument& config)
|
|
{
|
|
if(type == settings::V4L2 && _grabberName.startsWith("V4L2"))
|
|
{
|
|
// extract settings
|
|
const QJsonObject& obj = config.object();
|
|
|
|
// set global grabber state
|
|
setV4lGrabberState(obj["enable"].toBool(false));
|
|
|
|
if (getV4lGrabberState())
|
|
{
|
|
#if defined(ENABLE_MF)
|
|
// Device path
|
|
_grabber.setDevice(obj["device"].toString("none"));
|
|
#endif
|
|
|
|
#if defined(ENABLE_V4L2)
|
|
// Device path and name
|
|
_grabber.setDevice(obj["device"].toString("none"), obj["available_devices"].toString("none"));
|
|
#endif
|
|
|
|
// Device input
|
|
_grabber.setInput(obj["input"].toInt(0));
|
|
|
|
// Device resolution
|
|
_grabber.setWidthHeight(obj["width"].toInt(0), obj["height"].toInt(0));
|
|
|
|
// Device framerate
|
|
_grabber.setFramerate(obj["fps"].toInt(15));
|
|
|
|
// Device encoding format
|
|
_grabber.setEncoding(obj["encoding"].toString("NO_CHANGE"));
|
|
|
|
// Video standard
|
|
_grabber.setVideoStandard(parseVideoStandard(obj["standard"].toString("NO_CHANGE")));
|
|
|
|
// Image size decimation
|
|
_grabber.setPixelDecimation(obj["sizeDecimation"].toInt(8));
|
|
|
|
// Flip mode
|
|
_grabber.setFlipMode(parseFlipMode(obj["flip"].toString("NO_CHANGE")));
|
|
|
|
// Image cropping
|
|
_grabber.setCropping(
|
|
obj["cropLeft"].toInt(0),
|
|
obj["cropRight"].toInt(0),
|
|
obj["cropTop"].toInt(0),
|
|
obj["cropBottom"].toInt(0));
|
|
|
|
// Brightness, Contrast, Saturation, Hue
|
|
_grabber.setBrightnessContrastSaturationHue(
|
|
obj["hardware_brightness"].toInt(0),
|
|
obj["hardware_contrast"].toInt(0),
|
|
obj["hardware_saturation"].toInt(0),
|
|
obj["hardware_hue"].toInt(0));
|
|
|
|
#if defined(ENABLE_CEC) && defined(ENABLE_V4L2)
|
|
// CEC Standby
|
|
_grabber.setCecDetectionEnable(obj["cecDetection"].toBool(true));
|
|
#endif
|
|
|
|
// Software frame skipping
|
|
_grabber.setFpsSoftwareDecimation(obj["fpsSoftwareDecimation"].toInt(1));
|
|
|
|
// Signal detection
|
|
_grabber.setSignalDetectionEnable(obj["signalDetection"].toBool(true));
|
|
_grabber.setSignalDetectionOffset(
|
|
obj["sDHOffsetMin"].toDouble(0.25),
|
|
obj["sDVOffsetMin"].toDouble(0.25),
|
|
obj["sDHOffsetMax"].toDouble(0.75),
|
|
obj["sDVOffsetMax"].toDouble(0.75));
|
|
_grabber.setSignalThreshold(
|
|
obj["redSignalThreshold"].toDouble(0.0)/100.0,
|
|
obj["greenSignalThreshold"].toDouble(0.0)/100.0,
|
|
obj["blueSignalThreshold"].toDouble(0.0)/100.0,
|
|
obj["noSignalCounterThreshold"].toInt(50));
|
|
|
|
// Reload the Grabber if any settings have been changed that require it
|
|
_grabber.reload(getV4lGrabberState());
|
|
}
|
|
else
|
|
stop();
|
|
}
|
|
}
|
|
|
|
void VideoWrapper::newFrame(const Image<ColorRgb> &image)
|
|
{
|
|
emit systemImage(_grabberName, image);
|
|
}
|
|
|
|
void VideoWrapper::readError(const char* err)
|
|
{
|
|
Error(_log, "Stop grabber, because reading device failed. (%s)", err);
|
|
stop();
|
|
}
|
|
|
|
void VideoWrapper::action()
|
|
{
|
|
// dummy as v4l get notifications from stream
|
|
}
|