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>
149 lines
5.5 KiB
C++
149 lines
5.5 KiB
C++
|
|
// QT includes
|
|
#include <QCoreApplication>
|
|
#include <QImage>
|
|
|
|
#include <flatbufserver/FlatBufferConnection.h>
|
|
#include "DispmanxWrapper.h"
|
|
#include <hyperion/GrabberWrapper.h>
|
|
|
|
#include "HyperionConfig.h"
|
|
#include <commandline/Parser.h>
|
|
|
|
// ssdp discover
|
|
#include <ssdp/SSDPDiscover.h>
|
|
|
|
#include <utils/DefaultSignalHandler.h>
|
|
|
|
using namespace commandline;
|
|
|
|
// save the image as screenshot
|
|
void saveScreenshot(QString filename, const Image<ColorRgb> & image)
|
|
{
|
|
// store as PNG
|
|
QImage pngImage((const uint8_t *) image.memptr(), image.width(), image.height(), 3*image.width(), QImage::Format_RGB888);
|
|
pngImage.save(filename);
|
|
}
|
|
|
|
int main(int argc, char ** argv)
|
|
{
|
|
Logger *log = Logger::getInstance("DISPMANX");
|
|
Logger::setLogLevel(Logger::INFO);
|
|
|
|
std::cout
|
|
<< "hyperion-dispmanx:" << std::endl
|
|
<< "\tVersion : " << HYPERION_VERSION << " (" << HYPERION_BUILD_ID << ")" << std::endl
|
|
<< "\tbuild time: " << __DATE__ << " " << __TIME__ << std::endl;
|
|
|
|
DefaultSignalHandler::install();
|
|
|
|
QCoreApplication app(argc, argv);
|
|
|
|
try
|
|
{
|
|
// create the option parser and initialize all parameters
|
|
Parser parser("Dispmanx capture application for Hyperion. Will automatically search a Hyperion server if -a option isn't used. Please note that if you have more than one server running it's more or less random which one will be used.");
|
|
|
|
IntOption & argFps = parser.add<IntOption> ('f', "framerate", "Capture frame rate [default: %1]", QString::number(GrabberWrapper::DEFAULT_RATE_HZ), GrabberWrapper::DEFAULT_MIN_GRAB_RATE_HZ, GrabberWrapper::DEFAULT_MAX_GRAB_RATE_HZ);
|
|
IntOption & argSizeDecimation = parser.add<IntOption> ('s', "size-decimator", "Decimation factor for the output image size [default=%1]", QString::number(GrabberWrapper::DEFAULT_PIXELDECIMATION), 1);
|
|
|
|
IntOption & argCropLeft = parser.add<IntOption> (0x0, "crop-left", "Number of pixels to crop from the left of the picture before decimation");
|
|
IntOption & argCropRight = parser.add<IntOption> (0x0, "crop-right", "Number of pixels to crop from the right of the picture before decimation");
|
|
IntOption & argCropTop = parser.add<IntOption> (0x0, "crop-top", "Number of pixels to crop from the top of the picture before decimation");
|
|
IntOption & argCropBottom = parser.add<IntOption> (0x0, "crop-bottom", "Number of pixels to crop from the bottom of the picture before decimation");
|
|
BooleanOption & arg3DSBS = parser.add<BooleanOption>(0x0, "3DSBS", "Interpret the incoming video stream as 3D side-by-side");
|
|
BooleanOption & arg3DTAB = parser.add<BooleanOption>(0x0, "3DTAB", "Interpret the incoming video stream as 3D top-and-bottom");
|
|
|
|
Option & argAddress = parser.add<Option> ('a', "address", "Set the address of the hyperion server [default: %1]", "127.0.0.1:19400");
|
|
IntOption & argPriority = parser.add<IntOption> ('p', "priority", "Use the provided priority channel (suggested 100-199) [default: %1]", "150");
|
|
BooleanOption & argSkipReply = parser.add<BooleanOption>(0x0, "skip-reply", "Do not receive and check reply messages from Hyperion");
|
|
|
|
BooleanOption & argScreenshot = parser.add<BooleanOption>(0x0, "screenshot", "Take a single screenshot, save it to file and quit");
|
|
|
|
BooleanOption & argDebug = parser.add<BooleanOption>(0x0, "debug", "Enable debug logging");
|
|
BooleanOption & argHelp = parser.add<BooleanOption>('h', "help", "Show this help message and exit");
|
|
|
|
// parse all options
|
|
parser.process(app);
|
|
|
|
// check if debug logging is required
|
|
if (parser.isSet(argDebug))
|
|
{
|
|
Logger::setLogLevel(Logger::DEBUG);
|
|
}
|
|
|
|
|
|
// check if we need to display the usage. exit if we do.
|
|
if (parser.isSet(argHelp))
|
|
{
|
|
parser.showHelp(1);
|
|
}
|
|
|
|
// Create the dispmanx grabbing stuff
|
|
DispmanxWrapper dispmanxWrapper(
|
|
argFps.getInt(parser),
|
|
argSizeDecimation.getInt(parser),
|
|
argCropLeft.getInt(parser),
|
|
argCropRight.getInt(parser),
|
|
argCropTop.getInt(parser),
|
|
argCropBottom.getInt(parser)
|
|
);
|
|
|
|
if (!dispmanxWrapper.screenInit())
|
|
{
|
|
Error(log, "Failed to initialise the screen/display for this grabber");
|
|
return -1;
|
|
}
|
|
|
|
// set 3D mode if applicable
|
|
if (parser.isSet(arg3DSBS))
|
|
{
|
|
dispmanxWrapper.setVideoMode(VideoMode::VIDEO_3DSBS);
|
|
}
|
|
else if (parser.isSet(arg3DTAB))
|
|
{
|
|
dispmanxWrapper.setVideoMode(VideoMode::VIDEO_3DTAB);
|
|
}
|
|
|
|
if (parser.isSet(argScreenshot))
|
|
{
|
|
// Capture a single screenshot and finish
|
|
const Image<ColorRgb> & screenshot = dispmanxWrapper.getScreenshot();
|
|
saveScreenshot("screenshot.png", screenshot);
|
|
}
|
|
else
|
|
{
|
|
// server searching by ssdp
|
|
QString address = argAddress.value(parser);
|
|
if(argAddress.value(parser) == "127.0.0.1:19400")
|
|
{
|
|
SSDPDiscover discover;
|
|
address = discover.getFirstService(searchType::STY_FLATBUFSERVER);
|
|
if(address.isEmpty())
|
|
{
|
|
address = argAddress.value(parser);
|
|
}
|
|
}
|
|
// Create the Flabuf-connection
|
|
FlatBufferConnection flatbuf("Dispmanx Standalone", address, argPriority.getInt(parser), parser.isSet(argSkipReply));
|
|
|
|
// Connect the screen capturing to flatbuf connection processing
|
|
QObject::connect(&dispmanxWrapper, SIGNAL(sig_screenshot(const Image<ColorRgb> &)), &flatbuf, SLOT(setImage(Image<ColorRgb>)));
|
|
|
|
// Start the capturing
|
|
dispmanxWrapper.start();
|
|
|
|
// Start the application
|
|
app.exec();
|
|
}
|
|
}
|
|
catch (const std::runtime_error & e)
|
|
{
|
|
// An error occurred. Display error and quit
|
|
Error(log, "%s", e.what());
|
|
return -1;
|
|
}
|
|
|
|
return 0;
|
|
}
|