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>
168 lines
4.6 KiB
C++
168 lines
4.6 KiB
C++
#include "utils/ImageResampler.h"
|
|
#include <utils/ColorSys.h>
|
|
#include <utils/Logger.h>
|
|
|
|
ImageResampler::ImageResampler()
|
|
: _horizontalDecimation(8)
|
|
, _verticalDecimation(8)
|
|
, _cropLeft(0)
|
|
, _cropRight(0)
|
|
, _cropTop(0)
|
|
, _cropBottom(0)
|
|
, _videoMode(VideoMode::VIDEO_2D)
|
|
, _flipMode(FlipMode::NO_CHANGE)
|
|
{
|
|
}
|
|
|
|
void ImageResampler::setCropping(int cropLeft, int cropRight, int cropTop, int cropBottom)
|
|
{
|
|
_cropLeft = cropLeft;
|
|
_cropRight = cropRight;
|
|
_cropTop = cropTop;
|
|
_cropBottom = cropBottom;
|
|
}
|
|
|
|
void ImageResampler::processImage(const uint8_t * data, int width, int height, int lineLength, PixelFormat pixelFormat, Image<ColorRgb> &outputImage) const
|
|
{
|
|
int cropRight = _cropRight;
|
|
int cropBottom = _cropBottom;
|
|
int xDestFlip = 0, yDestFlip = 0;
|
|
int uOffset = 0, vOffset = 0;
|
|
|
|
// handle 3D mode
|
|
switch (_videoMode)
|
|
{
|
|
case VideoMode::VIDEO_3DSBS:
|
|
cropRight = width >> 1;
|
|
break;
|
|
case VideoMode::VIDEO_3DTAB:
|
|
cropBottom = height >> 1;
|
|
break;
|
|
default:
|
|
break;
|
|
}
|
|
|
|
// calculate the output size
|
|
int outputWidth = (width - _cropLeft - cropRight - (_horizontalDecimation >> 1) + _horizontalDecimation - 1) / _horizontalDecimation;
|
|
int outputHeight = (height - _cropTop - cropBottom - (_verticalDecimation >> 1) + _verticalDecimation - 1) / _verticalDecimation;
|
|
|
|
outputImage.resize(outputWidth, outputHeight);
|
|
|
|
for (int yDest = 0, ySource = _cropTop + (_verticalDecimation >> 1); yDest < outputHeight; ySource += _verticalDecimation, ++yDest)
|
|
{
|
|
int yOffset = lineLength * ySource;
|
|
if (pixelFormat == PixelFormat::NV12)
|
|
{
|
|
uOffset = (height + ySource / 2) * lineLength;
|
|
}
|
|
else if (pixelFormat == PixelFormat::I420)
|
|
{
|
|
uOffset = width * height + (ySource/2) * width/2;
|
|
vOffset = width * height * 1.25 + (ySource/2) * width/2;
|
|
}
|
|
|
|
for (int xDest = 0, xSource = _cropLeft + (_horizontalDecimation >> 1); xDest < outputWidth; xSource += _horizontalDecimation, ++xDest)
|
|
{
|
|
switch (_flipMode)
|
|
{
|
|
case FlipMode::HORIZONTAL:
|
|
|
|
xDestFlip = xDest;
|
|
yDestFlip = outputHeight-yDest-1;
|
|
break;
|
|
case FlipMode::VERTICAL:
|
|
xDestFlip = outputWidth-xDest-1;
|
|
yDestFlip = yDest;
|
|
break;
|
|
case FlipMode::BOTH:
|
|
xDestFlip = outputWidth-xDest-1;
|
|
yDestFlip = outputHeight-yDest-1;
|
|
break;
|
|
case FlipMode::NO_CHANGE:
|
|
xDestFlip = xDest;
|
|
yDestFlip = yDest;
|
|
break;
|
|
}
|
|
|
|
ColorRgb &rgb = outputImage(xDestFlip, yDestFlip);
|
|
switch (pixelFormat)
|
|
{
|
|
case PixelFormat::UYVY:
|
|
{
|
|
int index = yOffset + (xSource << 1);
|
|
uint8_t y = data[index+1];
|
|
uint8_t u = ((xSource&1) == 0) ? data[index ] : data[index-2];
|
|
uint8_t v = ((xSource&1) == 0) ? data[index+2] : data[index ];
|
|
ColorSys::yuv2rgb(y, u, v, rgb.red, rgb.green, rgb.blue);
|
|
}
|
|
break;
|
|
case PixelFormat::YUYV:
|
|
{
|
|
int index = yOffset + (xSource << 1);
|
|
uint8_t y = data[index];
|
|
uint8_t u = ((xSource&1) == 0) ? data[index+1] : data[index-1];
|
|
uint8_t v = ((xSource&1) == 0) ? data[index+3] : data[index+1];
|
|
ColorSys::yuv2rgb(y, u, v, rgb.red, rgb.green, rgb.blue);
|
|
}
|
|
break;
|
|
case PixelFormat::BGR16:
|
|
{
|
|
int index = yOffset + (xSource << 1);
|
|
rgb.blue = (data[index] & 0x1f) << 3;
|
|
rgb.green = (((data[index+1] & 0x7) << 3) | (data[index] & 0xE0) >> 5) << 2;
|
|
rgb.red = (data[index+1] & 0xF8);
|
|
}
|
|
break;
|
|
case PixelFormat::BGR24:
|
|
{
|
|
int index = yOffset + (xSource << 1) + xSource;
|
|
rgb.blue = data[index ];
|
|
rgb.green = data[index+1];
|
|
rgb.red = data[index+2];
|
|
}
|
|
break;
|
|
case PixelFormat::RGB32:
|
|
{
|
|
int index = yOffset + (xSource << 2);
|
|
rgb.red = data[index ];
|
|
rgb.green = data[index+1];
|
|
rgb.blue = data[index+2];
|
|
}
|
|
break;
|
|
case PixelFormat::BGR32:
|
|
{
|
|
int index = yOffset + (xSource << 2);
|
|
rgb.blue = data[index ];
|
|
rgb.green = data[index+1];
|
|
rgb.red = data[index+2];
|
|
}
|
|
break;
|
|
case PixelFormat::NV12:
|
|
{
|
|
uint8_t y = data[yOffset + xSource];
|
|
uint8_t u = data[uOffset + ((xSource >> 1) << 1)];
|
|
uint8_t v = data[uOffset + ((xSource >> 1) << 1) + 1];
|
|
ColorSys::yuv2rgb(y, u, v, rgb.red, rgb.green, rgb.blue);
|
|
}
|
|
break;
|
|
case PixelFormat::I420:
|
|
{
|
|
int y = data[yOffset + xSource];
|
|
int u = data[uOffset + (xSource >> 1)];
|
|
int v = data[vOffset + (xSource >> 1)];
|
|
ColorSys::yuv2rgb(y, u, v, rgb.red, rgb.green, rgb.blue);
|
|
break;
|
|
}
|
|
break;
|
|
#ifdef HAVE_TURBO_JPEG
|
|
case PixelFormat::MJPEG:
|
|
break;
|
|
#endif
|
|
case PixelFormat::NO_CHANGE:
|
|
Error(Logger::getInstance("ImageResampler"), "Invalid pixel format given");
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
}
|