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>
172 lines
4.0 KiB
C++
172 lines
4.0 KiB
C++
#include <hyperion/Grabber.h>
|
|
#include <hyperion/GrabberWrapper.h>
|
|
|
|
Grabber::Grabber(const QString& grabberName, int cropLeft, int cropRight, int cropTop, int cropBottom)
|
|
: _grabberName(grabberName)
|
|
, _log(Logger::getInstance(_grabberName.toUpper()))
|
|
, _useImageResampler(true)
|
|
, _videoMode(VideoMode::VIDEO_2D)
|
|
, _videoStandard(VideoStandard::NO_CHANGE)
|
|
, _pixelDecimation(GrabberWrapper::DEFAULT_PIXELDECIMATION)
|
|
, _flipMode(FlipMode::NO_CHANGE)
|
|
, _width(0)
|
|
, _height(0)
|
|
, _fps(GrabberWrapper::DEFAULT_RATE_HZ)
|
|
, _fpsSoftwareDecimation(0)
|
|
, _input(-1)
|
|
, _cropLeft(0)
|
|
, _cropRight(0)
|
|
, _cropTop(0)
|
|
, _cropBottom(0)
|
|
, _isEnabled(true)
|
|
, _isDeviceInError(false)
|
|
{
|
|
Grabber::setCropping(cropLeft, cropRight, cropTop, cropBottom);
|
|
}
|
|
|
|
void Grabber::setEnabled(bool enable)
|
|
{
|
|
Info(_log,"Capture interface is now %s", enable ? "enabled" : "disabled");
|
|
_isEnabled = enable;
|
|
}
|
|
|
|
void Grabber::setInError(const QString& errorMsg)
|
|
{
|
|
_isDeviceInError = true;
|
|
_isEnabled = false;
|
|
|
|
Error(_log, "Grabber disabled, device '%s' signals error: '%s'", QSTRING_CSTR(_grabberName), QSTRING_CSTR(errorMsg));
|
|
}
|
|
|
|
void Grabber::setVideoMode(VideoMode mode)
|
|
{
|
|
Info(_log,"Set videomode to %s", QSTRING_CSTR(videoMode2String(mode)));
|
|
_videoMode = mode;
|
|
if ( _useImageResampler )
|
|
{
|
|
_imageResampler.setVideoMode(_videoMode);
|
|
}
|
|
}
|
|
|
|
void Grabber::setVideoStandard(VideoStandard videoStandard)
|
|
{
|
|
if (_videoStandard != videoStandard) {
|
|
_videoStandard = videoStandard;
|
|
}
|
|
}
|
|
|
|
bool Grabber::setPixelDecimation(int pixelDecimation)
|
|
{
|
|
if (_pixelDecimation != pixelDecimation)
|
|
{
|
|
Info(_log,"Set image size decimation to %d", pixelDecimation);
|
|
_pixelDecimation = pixelDecimation;
|
|
if ( _useImageResampler )
|
|
{
|
|
_imageResampler.setHorizontalPixelDecimation(pixelDecimation);
|
|
_imageResampler.setVerticalPixelDecimation(pixelDecimation);
|
|
}
|
|
|
|
return true;
|
|
}
|
|
|
|
return false;
|
|
}
|
|
|
|
void Grabber::setFlipMode(FlipMode mode)
|
|
{
|
|
Info(_log,"Set flipmode to %s", QSTRING_CSTR(flipModeToString(mode)));
|
|
_flipMode = mode;
|
|
if ( _useImageResampler )
|
|
{
|
|
_imageResampler.setFlipMode(_flipMode);
|
|
}
|
|
}
|
|
|
|
void Grabber::setCropping(int cropLeft, int cropRight, int cropTop, int cropBottom)
|
|
{
|
|
if (_width>0 && _height>0)
|
|
{
|
|
if (cropLeft + cropRight >= _width || cropTop + cropBottom >= _height)
|
|
{
|
|
Error(_log, "Rejecting invalid crop values: left: %d, right: %d, top: %d, bottom: %d, higher than height/width %d/%d", cropLeft, cropRight, cropTop, cropBottom, _height, _width);
|
|
return;
|
|
}
|
|
}
|
|
|
|
_cropLeft = cropLeft;
|
|
_cropRight = cropRight;
|
|
_cropTop = cropTop;
|
|
_cropBottom = cropBottom;
|
|
|
|
if ( _useImageResampler )
|
|
{
|
|
_imageResampler.setCropping(cropLeft, cropRight, cropTop, cropBottom);
|
|
}
|
|
else
|
|
{
|
|
_imageResampler.setCropping(0, 0, 0, 0);
|
|
}
|
|
|
|
if (cropLeft > 0 || cropRight > 0 || cropTop > 0 || cropBottom > 0)
|
|
{
|
|
Info(_log, "Cropping image: width=%d height=%d; crop: left=%d right=%d top=%d bottom=%d ", _width, _height, cropLeft, cropRight, cropTop, cropBottom);
|
|
}
|
|
}
|
|
|
|
bool Grabber::setInput(int input)
|
|
{
|
|
if((input >= 0) && (_input != input))
|
|
{
|
|
_input = input;
|
|
return true;
|
|
}
|
|
|
|
return false;
|
|
}
|
|
|
|
bool Grabber::setWidthHeight(int width, int height)
|
|
{
|
|
bool rc (false);
|
|
// eval changes with crop
|
|
if ( (width>0 && height>0) && (_width != width || _height != height) )
|
|
{
|
|
if (_cropLeft + _cropRight >= width || _cropTop + _cropBottom >= height)
|
|
{
|
|
Error(_log, "Rejecting invalid width/height values as it collides with image cropping: width: %d, height: %d", width, height);
|
|
rc = false;
|
|
}
|
|
else
|
|
{
|
|
Debug(_log, "Set new width: %d, height: %d for capture", width, height);
|
|
_width = width;
|
|
_height = height;
|
|
rc = true;
|
|
}
|
|
}
|
|
return rc;
|
|
}
|
|
|
|
bool Grabber::setFramerate(int fps)
|
|
{
|
|
if((fps > 0) && (_fps != fps))
|
|
{
|
|
Info(_log,"Set new frames per second to: %i fps", fps);
|
|
_fps = fps;
|
|
return true;
|
|
}
|
|
|
|
return false;
|
|
}
|
|
|
|
void Grabber::setFpsSoftwareDecimation(int decimation)
|
|
{
|
|
if((_fpsSoftwareDecimation != decimation))
|
|
{
|
|
_fpsSoftwareDecimation = decimation;
|
|
if(decimation > 0){
|
|
Debug(_log,"Skip %i frame per second", decimation);
|
|
}
|
|
}
|
|
}
|