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 5b0ce3c0f2
.
* 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>
119 lines
2.9 KiB
C++
119 lines
2.9 KiB
C++
// Qt includes
|
|
#include <QDateTime>
|
|
#include <QFile>
|
|
#include <QResource>
|
|
|
|
// effect engin eincludes
|
|
#include <effectengine/Effect.h>
|
|
#include <effectengine/EffectModule.h>
|
|
#include <utils/Logger.h>
|
|
#include <hyperion/Hyperion.h>
|
|
|
|
// python utils
|
|
#include <python/PythonProgram.h>
|
|
|
|
const int Effect::ENDLESS = -1;
|
|
|
|
Effect::Effect(Hyperion *hyperion, int priority, int timeout, const QString &script, const QString &name, const QJsonObject &args, const QString &imageData)
|
|
: QThread()
|
|
, _hyperion(hyperion)
|
|
, _priority(priority)
|
|
, _timeout(timeout)
|
|
, _isEndless(timeout <= ENDLESS)
|
|
, _script(script)
|
|
, _name(name)
|
|
, _args(args)
|
|
, _imageData(imageData)
|
|
, _endTime(-1)
|
|
, _interupt(false)
|
|
, _imageSize(hyperion->getLedGridSize())
|
|
, _image(_imageSize,QImage::Format_ARGB32_Premultiplied)
|
|
{
|
|
_colors.resize(_hyperion->getLedCount());
|
|
_colors.fill(ColorRgb::BLACK);
|
|
|
|
_log = Logger::getInstance("EFFECTENGINE");
|
|
|
|
// init effect image for image based effects, size is based on led layout
|
|
_image.fill(Qt::black);
|
|
_painter = new QPainter(&_image);
|
|
|
|
Q_INIT_RESOURCE(EffectEngine);
|
|
}
|
|
|
|
Effect::~Effect()
|
|
{
|
|
requestInterruption();
|
|
wait();
|
|
|
|
delete _painter;
|
|
_imageStack.clear();
|
|
}
|
|
|
|
bool Effect::isInterruptionRequested()
|
|
{
|
|
return _interupt || (!_isEndless && getRemaining() <= 0);
|
|
}
|
|
|
|
int Effect::getRemaining() const
|
|
{
|
|
// determine the timeout
|
|
int timeout = _timeout;
|
|
|
|
if (timeout >= 0)
|
|
{
|
|
timeout = static_cast<int>( _endTime - QDateTime::currentMSecsSinceEpoch());
|
|
}
|
|
return timeout;
|
|
}
|
|
|
|
void Effect::setModuleParameters()
|
|
{
|
|
// import the buildtin Hyperion module
|
|
PyObject * module = PyImport_ImportModule("hyperion");
|
|
|
|
// add a capsule containing 'this' to the module to be able to retrieve the effect from the callback function
|
|
PyModule_AddObject(module, "__effectObj", PyCapsule_New((void*)this, "hyperion.__effectObj", nullptr));
|
|
|
|
// add ledCount variable to the interpreter
|
|
int ledCount = 0;
|
|
QMetaObject::invokeMethod(_hyperion, "getLedCount", Qt::BlockingQueuedConnection, Q_RETURN_ARG(int, ledCount));
|
|
PyObject_SetAttrString(module, "ledCount", Py_BuildValue("i", ledCount));
|
|
|
|
// add minimumWriteTime variable to the interpreter
|
|
int latchTime = 0;
|
|
QMetaObject::invokeMethod(_hyperion, "getLatchTime", Qt::BlockingQueuedConnection, Q_RETURN_ARG(int, latchTime));
|
|
PyObject_SetAttrString(module, "latchTime", Py_BuildValue("i", latchTime));
|
|
|
|
// add a args variable to the interpreter
|
|
PyObject_SetAttrString(module, "args", EffectModule::json2python(_args));
|
|
|
|
// decref the module
|
|
Py_XDECREF(module);
|
|
}
|
|
|
|
void Effect::run()
|
|
{
|
|
PythonProgram program(_name, _log);
|
|
|
|
setModuleParameters();
|
|
|
|
// Set the end time if applicable
|
|
if (_timeout > 0)
|
|
{
|
|
_endTime = QDateTime::currentMSecsSinceEpoch() + _timeout;
|
|
}
|
|
|
|
// Run the effect script
|
|
QFile file (_script);
|
|
if (file.open(QIODevice::ReadOnly))
|
|
{
|
|
program.execute(file.readAll());
|
|
}
|
|
else
|
|
{
|
|
Error(_log, "Unable to open script file %s.", QSTRING_CSTR(_script));
|
|
}
|
|
file.close();
|
|
}
|