mirror of
https://github.com/hyperion-project/hyperion.ng.git
synced 2023-10-10 13:36:59 +02:00
* - 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>
204 lines
5.0 KiB
C++
204 lines
5.0 KiB
C++
#include "grabber/EncoderThread.h"
|
|
|
|
EncoderThread::EncoderThread()
|
|
: _localData(nullptr)
|
|
, _scalingFactorsCount(0)
|
|
, _imageResampler()
|
|
#ifdef HAVE_TURBO_JPEG
|
|
, _transform(nullptr)
|
|
, _decompress(nullptr)
|
|
, _scalingFactors(nullptr)
|
|
, _xform(nullptr)
|
|
#endif
|
|
{}
|
|
|
|
EncoderThread::~EncoderThread()
|
|
{
|
|
#ifdef HAVE_TURBO_JPEG
|
|
if (_transform)
|
|
tjDestroy(_transform);
|
|
|
|
if (_decompress)
|
|
tjDestroy(_decompress);
|
|
#endif
|
|
|
|
if (_localData)
|
|
#ifdef HAVE_TURBO_JPEG
|
|
tjFree(_localData);
|
|
#else
|
|
delete[] _localData;
|
|
#endif
|
|
}
|
|
|
|
void EncoderThread::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)
|
|
{
|
|
_lineLength = lineLength;
|
|
_pixelFormat = pixelFormat;
|
|
_size = (unsigned long) size;
|
|
_width = width;
|
|
_height = height;
|
|
_cropLeft = cropLeft;
|
|
_cropTop = cropTop;
|
|
_cropBottom = cropBottom;
|
|
_cropRight = cropRight;
|
|
_flipMode = flipMode;
|
|
_pixelDecimation = pixelDecimation;
|
|
|
|
_imageResampler.setVideoMode(videoMode);
|
|
_imageResampler.setFlipMode(_flipMode);
|
|
_imageResampler.setCropping(cropLeft, cropRight, cropTop, cropBottom);
|
|
_imageResampler.setHorizontalPixelDecimation(_pixelDecimation);
|
|
_imageResampler.setVerticalPixelDecimation(_pixelDecimation);
|
|
|
|
#ifdef HAVE_TURBO_JPEG
|
|
if (_localData)
|
|
tjFree(_localData);
|
|
|
|
_localData = (uint8_t*)tjAlloc(size + 1);
|
|
#else
|
|
delete[] _localData;
|
|
_localData = nullptr;
|
|
_localData = new uint8_t(size + 1);
|
|
#endif
|
|
|
|
memcpy(_localData, sharedData, size);
|
|
}
|
|
|
|
void EncoderThread::process()
|
|
{
|
|
_busy = true;
|
|
if (_width > 0 && _height > 0)
|
|
{
|
|
#ifdef HAVE_TURBO_JPEG
|
|
if (_pixelFormat == PixelFormat::MJPEG)
|
|
{
|
|
processImageMjpeg();
|
|
}
|
|
else
|
|
#endif
|
|
{
|
|
if (_pixelFormat == PixelFormat::BGR24)
|
|
{
|
|
if (_flipMode == FlipMode::NO_CHANGE)
|
|
_imageResampler.setFlipMode(FlipMode::HORIZONTAL);
|
|
else if (_flipMode == FlipMode::HORIZONTAL)
|
|
_imageResampler.setFlipMode(FlipMode::NO_CHANGE);
|
|
else if (_flipMode == FlipMode::VERTICAL)
|
|
_imageResampler.setFlipMode(FlipMode::BOTH);
|
|
else if (_flipMode == FlipMode::BOTH)
|
|
_imageResampler.setFlipMode(FlipMode::VERTICAL);
|
|
}
|
|
|
|
Image<ColorRgb> image = Image<ColorRgb>();
|
|
_imageResampler.processImage(
|
|
_localData,
|
|
_width,
|
|
_height,
|
|
_lineLength,
|
|
#if defined(ENABLE_V4L2)
|
|
_pixelFormat,
|
|
#else
|
|
PixelFormat::BGR24,
|
|
#endif
|
|
image
|
|
);
|
|
|
|
emit newFrame(image);
|
|
}
|
|
}
|
|
_busy = false;
|
|
}
|
|
|
|
#ifdef HAVE_TURBO_JPEG
|
|
void EncoderThread::processImageMjpeg()
|
|
{
|
|
if (!_transform && _flipMode != FlipMode::NO_CHANGE)
|
|
{
|
|
_transform = tjInitTransform();
|
|
_xform = new tjtransform();
|
|
}
|
|
|
|
if (_flipMode == FlipMode::BOTH || _flipMode == FlipMode::HORIZONTAL)
|
|
{
|
|
_xform->op = TJXOP_HFLIP;
|
|
tjTransform(_transform, _localData, _size, 1, &_localData, &_size, _xform, TJFLAG_FASTDCT | TJFLAG_FASTUPSAMPLE);
|
|
}
|
|
|
|
if (_flipMode == FlipMode::BOTH || _flipMode == FlipMode::VERTICAL)
|
|
{
|
|
_xform->op = TJXOP_VFLIP;
|
|
tjTransform(_transform, _localData, _size, 1, &_localData, &_size, _xform, TJFLAG_FASTDCT | TJFLAG_FASTUPSAMPLE);
|
|
}
|
|
|
|
if (!_decompress)
|
|
{
|
|
_decompress = tjInitDecompress();
|
|
_scalingFactors = tjGetScalingFactors(&_scalingFactorsCount);
|
|
}
|
|
|
|
int subsamp = 0;
|
|
if (tjDecompressHeader2(_decompress, _localData, _size, &_width, &_height, &subsamp) != 0)
|
|
return;
|
|
|
|
int scaledWidth = _width, scaledHeight = _height;
|
|
if(_scalingFactors != nullptr && _pixelDecimation > 1)
|
|
{
|
|
for (int i = 0; i < _scalingFactorsCount ; i++)
|
|
{
|
|
const int tempWidth = TJSCALED(_width, _scalingFactors[i]);
|
|
const int tempHeight = TJSCALED(_height, _scalingFactors[i]);
|
|
if (tempWidth <= _width/_pixelDecimation && tempHeight <= _height/_pixelDecimation)
|
|
{
|
|
scaledWidth = tempWidth;
|
|
scaledHeight = tempHeight;
|
|
break;
|
|
}
|
|
}
|
|
|
|
if (scaledWidth == _width && scaledHeight == _height)
|
|
{
|
|
scaledWidth = TJSCALED(_width, _scalingFactors[_scalingFactorsCount-1]);
|
|
scaledHeight = TJSCALED(_height, _scalingFactors[_scalingFactorsCount-1]);
|
|
}
|
|
}
|
|
|
|
Image<ColorRgb> srcImage(scaledWidth, scaledHeight);
|
|
|
|
if (tjDecompress2(_decompress, _localData , _size, (unsigned char*)srcImage.memptr(), scaledWidth, 0, scaledHeight, TJPF_RGB, TJFLAG_FASTDCT | TJFLAG_FASTUPSAMPLE) != 0)
|
|
return;
|
|
|
|
// got image, process it
|
|
if (!(_cropLeft > 0 || _cropTop > 0 || _cropBottom > 0 || _cropRight > 0))
|
|
emit newFrame(srcImage);
|
|
else
|
|
{
|
|
// calculate the output size
|
|
int outputWidth = (_width - _cropLeft - _cropRight);
|
|
int outputHeight = (_height - _cropTop - _cropBottom);
|
|
|
|
if (outputWidth <= 0 || outputHeight <= 0)
|
|
return;
|
|
|
|
Image<ColorRgb> destImage(outputWidth, outputHeight);
|
|
|
|
for (unsigned int y = 0; y < destImage.height(); y++)
|
|
{
|
|
unsigned char* source = (unsigned char*)srcImage.memptr() + (y + _cropTop)*srcImage.width()*3 + _cropLeft*3;
|
|
unsigned char* dest = (unsigned char*)destImage.memptr() + y*destImage.width()*3;
|
|
memcpy(dest, source, destImage.width()*3);
|
|
free(source);
|
|
source = nullptr;
|
|
free(dest);
|
|
dest = nullptr;
|
|
}
|
|
|
|
// emit
|
|
emit newFrame(destImage);
|
|
}
|
|
}
|
|
#endif
|