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>
160 lines
3.1 KiB
C++
160 lines
3.1 KiB
C++
#ifndef __APPLE__
|
|
#include <grabber/OsxFrameGrabberMock.h>
|
|
|
|
unsigned __osx_frame_counter = 0;
|
|
const int __screenWidth = 800;
|
|
const int __screenHeight = 600;
|
|
|
|
CGError CGGetActiveDisplayList(uint32_t maxDisplays, CGDirectDisplayID *activeDisplays, uint32_t *displayCount)
|
|
{
|
|
if (maxDisplays == 0 || activeDisplays == nullptr)
|
|
{
|
|
*displayCount = 2;
|
|
}
|
|
else
|
|
{
|
|
displayCount = &maxDisplays;
|
|
if (activeDisplays != nullptr)
|
|
{
|
|
for (CGDirectDisplayID i = 0; i < maxDisplays; ++i)
|
|
{
|
|
activeDisplays[i] = i;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
return kCGErrorFailure;
|
|
}
|
|
}
|
|
return kCGErrorSuccess;
|
|
}
|
|
|
|
CGImageRef CGDisplayCreateImage(CGDirectDisplayID display)
|
|
{
|
|
CGImageRef image = new CGImage(__screenWidth / (display+1), __screenHeight / (display+1));
|
|
|
|
return image;
|
|
}
|
|
|
|
void CGImageRelease(CGImageRef image)
|
|
{
|
|
delete image;
|
|
}
|
|
|
|
CGImageRef CGImageGetDataProvider(CGImageRef image)
|
|
{
|
|
__osx_frame_counter++;
|
|
if (__osx_frame_counter > 100)
|
|
{
|
|
__osx_frame_counter = 0;
|
|
}
|
|
|
|
ColorRgb color[4] = {ColorRgb::RED, ColorRgb::BLUE, ColorRgb::GREEN, ColorRgb::WHITE};
|
|
if (__osx_frame_counter < 25)
|
|
{
|
|
color[0] = ColorRgb::WHITE;
|
|
color[1] = ColorRgb::RED;
|
|
color[2] = ColorRgb::BLUE;
|
|
color[3] = ColorRgb::GREEN;
|
|
}
|
|
else if(__osx_frame_counter < 50)
|
|
{
|
|
color[1] = ColorRgb::WHITE;
|
|
color[2] = ColorRgb::RED;
|
|
color[3] = ColorRgb::BLUE;
|
|
color[0] = ColorRgb::GREEN;
|
|
}
|
|
else if(__osx_frame_counter < 75)
|
|
{
|
|
color[2] = ColorRgb::WHITE;
|
|
color[3] = ColorRgb::RED;
|
|
color[0] = ColorRgb::BLUE;
|
|
color[1] = ColorRgb::GREEN;
|
|
}
|
|
unsigned w = image->width();
|
|
unsigned h = image->height();
|
|
|
|
for (unsigned y=0; y<h; y++)
|
|
{
|
|
for (unsigned x=0; x<w; x++)
|
|
{
|
|
unsigned id = 0;
|
|
if (x < w/2 && y < h/2) id = 1;
|
|
if (x < w/2 && y >= h/2) id = 2;
|
|
if (x >= w/2 && y < h/2) id = 3;
|
|
|
|
image->memptr()[y*w + x] = color[id];
|
|
}
|
|
}
|
|
|
|
return image;
|
|
}
|
|
|
|
CFDataRef CGDataProviderCopyData(CGImageRef image)
|
|
{
|
|
const unsigned indexMax = image->width() * image->height() * CGImageGetBitsPerPixel(image);
|
|
CFDataRef data = new CFData[indexMax];
|
|
int lineLength = CGImageGetBytesPerRow(image);
|
|
|
|
for (unsigned y=0; y<image->height(); y++)
|
|
{
|
|
for (unsigned x=0; x<image->width(); x++)
|
|
{
|
|
int index = lineLength * y + x * CGImageGetBitsPerPixel(image);
|
|
|
|
data[index ] = (*image)(x,y).blue;
|
|
data[index+1] = (*image)(x,y).green;
|
|
data[index+2] = (*image)(x,y).red;
|
|
data[index+3] = 0;
|
|
}
|
|
}
|
|
return data;
|
|
}
|
|
|
|
unsigned char* CFDataGetBytePtr(CFDataRef imgData)
|
|
{
|
|
return imgData;
|
|
}
|
|
|
|
unsigned CGImageGetWidth(CGImageRef image)
|
|
{
|
|
return image->width();
|
|
}
|
|
|
|
unsigned CGImageGetHeight(CGImageRef image)
|
|
{
|
|
return image->height();
|
|
}
|
|
|
|
unsigned CGImageGetBytesPerRow(CGImageRef image)
|
|
{
|
|
return image->width()*CGImageGetBitsPerPixel(image);
|
|
}
|
|
|
|
unsigned CGImageGetBitsPerPixel(CGImageRef)
|
|
{
|
|
return 4;
|
|
}
|
|
|
|
void CFRelease(CFDataRef imgData)
|
|
{
|
|
delete imgData;
|
|
}
|
|
|
|
CGDisplayModeRef CGDisplayCopyDisplayMode(CGDirectDisplayID display)
|
|
{
|
|
return nullptr;
|
|
}
|
|
CGRect CGDisplayBounds(CGDirectDisplayID display)
|
|
{
|
|
CGRect rect;
|
|
rect.size.width = __screenWidth / (display+1);
|
|
rect.size.height = __screenHeight / (display+1);
|
|
return rect;
|
|
}
|
|
void CGDisplayModeRelease(CGDisplayModeRef mode)
|
|
{
|
|
}
|
|
|
|
#endif
|