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>
177 lines
3.6 KiB
C++
177 lines
3.6 KiB
C++
#pragma once
|
|
|
|
// Qt includes
|
|
#include <QThread>
|
|
|
|
// util includes
|
|
#include <utils/PixelFormat.h>
|
|
#include <utils/ImageResampler.h>
|
|
|
|
// Determine the cmake options
|
|
#include <HyperionConfig.h>
|
|
|
|
// Turbo JPEG decoder
|
|
#ifdef HAVE_TURBO_JPEG
|
|
#include <turbojpeg.h>
|
|
#endif
|
|
|
|
/// Encoder thread for USB devices
|
|
class EncoderThread : public QObject
|
|
{
|
|
Q_OBJECT
|
|
public:
|
|
explicit EncoderThread();
|
|
~EncoderThread();
|
|
|
|
void setup(
|
|
PixelFormat pixelFormat, uint8_t* sharedData,
|
|
int size, int width, int height, int lineLength,
|
|
unsigned cropLeft, unsigned cropTop, unsigned cropBottom, unsigned cropRight,
|
|
VideoMode videoMode, FlipMode flipMode, int pixelDecimation);
|
|
|
|
void process();
|
|
|
|
bool isBusy() { return _busy; }
|
|
QAtomicInt _busy = false;
|
|
|
|
signals:
|
|
void newFrame(const Image<ColorRgb>& data);
|
|
|
|
private:
|
|
PixelFormat _pixelFormat;
|
|
uint8_t* _localData,
|
|
*_flipBuffer;
|
|
int _scalingFactorsCount,
|
|
_width,
|
|
_height,
|
|
_lineLength,
|
|
_currentFrame,
|
|
_pixelDecimation;
|
|
unsigned long _size;
|
|
unsigned _cropLeft,
|
|
_cropTop,
|
|
_cropBottom,
|
|
_cropRight;
|
|
FlipMode _flipMode;
|
|
ImageResampler _imageResampler;
|
|
|
|
#ifdef HAVE_TURBO_JPEG
|
|
tjhandle _transform, _decompress;
|
|
tjscalingfactor* _scalingFactors;
|
|
tjtransform* _xform;
|
|
|
|
void processImageMjpeg();
|
|
#endif
|
|
};
|
|
|
|
template <typename TThread> class Thread : public QThread
|
|
{
|
|
public:
|
|
TThread *_thread;
|
|
explicit Thread(TThread *thread, QObject *parent = nullptr)
|
|
: QThread(parent)
|
|
, _thread(thread)
|
|
{
|
|
_thread->moveToThread(this);
|
|
start();
|
|
}
|
|
|
|
~Thread()
|
|
{
|
|
quit();
|
|
wait();
|
|
}
|
|
|
|
EncoderThread* thread() const { return qobject_cast<EncoderThread*>(_thread); }
|
|
|
|
void setup(
|
|
PixelFormat pixelFormat, uint8_t* sharedData,
|
|
int size, int width, int height, int lineLength,
|
|
unsigned cropLeft, unsigned cropTop, unsigned cropBottom, unsigned cropRight,
|
|
VideoMode videoMode, FlipMode flipMode, int pixelDecimation)
|
|
{
|
|
auto encThread = qobject_cast<EncoderThread*>(_thread);
|
|
if (encThread != nullptr)
|
|
encThread->setup(pixelFormat, sharedData,
|
|
size, width, height, lineLength,
|
|
cropLeft, cropTop, cropBottom, cropRight,
|
|
videoMode, flipMode, pixelDecimation);
|
|
}
|
|
|
|
bool isBusy()
|
|
{
|
|
auto encThread = qobject_cast<EncoderThread*>(_thread);
|
|
if (encThread != nullptr)
|
|
return encThread->isBusy();
|
|
|
|
return true;
|
|
}
|
|
|
|
void process()
|
|
{
|
|
auto encThread = qobject_cast<EncoderThread*>(_thread);
|
|
if (encThread != nullptr)
|
|
encThread->process();
|
|
}
|
|
|
|
protected:
|
|
void run() override
|
|
{
|
|
QThread::run();
|
|
delete _thread;
|
|
}
|
|
};
|
|
|
|
class EncoderThreadManager : public QObject
|
|
{
|
|
Q_OBJECT
|
|
public:
|
|
explicit EncoderThreadManager(QObject *parent = nullptr)
|
|
: QObject(parent)
|
|
, _threadCount(qMax(QThread::idealThreadCount(), 1))
|
|
, _threads(nullptr)
|
|
{
|
|
_threads = new Thread<EncoderThread>*[_threadCount];
|
|
for (int i = 0; i < _threadCount; i++)
|
|
{
|
|
_threads[i] = new Thread<EncoderThread>(new EncoderThread, this);
|
|
_threads[i]->setObjectName("Encoder " + i);
|
|
}
|
|
}
|
|
|
|
~EncoderThreadManager()
|
|
{
|
|
if (_threads != nullptr)
|
|
{
|
|
for(int i = 0; i < _threadCount; i++)
|
|
{
|
|
_threads[i]->deleteLater();
|
|
_threads[i] = nullptr;
|
|
}
|
|
|
|
delete[] _threads;
|
|
_threads = nullptr;
|
|
}
|
|
}
|
|
|
|
void start()
|
|
{
|
|
if (_threads != nullptr)
|
|
for (int i = 0; i < _threadCount; i++)
|
|
connect(_threads[i]->thread(), &EncoderThread::newFrame, this, &EncoderThreadManager::newFrame);
|
|
}
|
|
|
|
void stop()
|
|
{
|
|
if (_threads != nullptr)
|
|
for(int i = 0; i < _threadCount; i++)
|
|
disconnect(_threads[i]->thread(), nullptr, nullptr, nullptr);
|
|
}
|
|
|
|
int _threadCount;
|
|
Thread<EncoderThread>** _threads;
|
|
|
|
signals:
|
|
void newFrame(const Image<ColorRgb>& data);
|
|
};
|