mirror of
https://github.com/hyperion-project/hyperion.ng.git
synced 2023-10-10 13:36:59 +02:00
implement dispmanx forwarding a a separate dispmanx wrapper
implement forwarding for amlogic grabber Former-commit-id: 8a793d24bd083f9eca07c34ec3b222f0e54b4426
This commit is contained in:
parent
ec67caf24e
commit
6bef43887b
@ -68,6 +68,9 @@ public slots:
|
|||||||
///
|
///
|
||||||
void setVideoMode(const VideoMode videoMode);
|
void setVideoMode(const VideoMode videoMode);
|
||||||
|
|
||||||
|
signals:
|
||||||
|
void emitImage(int priority, const Image<ColorRgb> & image, const int timeout_ms);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
/// The update rate [Hz]
|
/// The update rate [Hz]
|
||||||
const int _updateInterval_ms;
|
const int _updateInterval_ms;
|
||||||
@ -91,4 +94,7 @@ private:
|
|||||||
|
|
||||||
/// Pointer to Hyperion for writing led values
|
/// Pointer to Hyperion for writing led values
|
||||||
Hyperion * _hyperion;
|
Hyperion * _hyperion;
|
||||||
|
|
||||||
|
// forwarding enabled
|
||||||
|
bool _forward;
|
||||||
};
|
};
|
||||||
|
@ -94,4 +94,7 @@ private:
|
|||||||
|
|
||||||
/// Pointer to Hyperion for writing led values
|
/// Pointer to Hyperion for writing led values
|
||||||
Hyperion * _hyperion;
|
Hyperion * _hyperion;
|
||||||
|
|
||||||
|
// forwarding enabled
|
||||||
|
bool _forward;
|
||||||
};
|
};
|
||||||
|
@ -26,6 +26,7 @@ AmlogicWrapper::AmlogicWrapper(const unsigned grabWidth, const unsigned grabHeig
|
|||||||
// Configure the timer to generate events every n milliseconds
|
// Configure the timer to generate events every n milliseconds
|
||||||
_timer.setInterval(_updateInterval_ms);
|
_timer.setInterval(_updateInterval_ms);
|
||||||
_timer.setSingleShot(false);
|
_timer.setSingleShot(false);
|
||||||
|
_forward = _hyperion->getForwarder()->protoForwardingEnabled();
|
||||||
|
|
||||||
_processor->setSize(grabWidth, grabHeight);
|
_processor->setSize(grabWidth, grabHeight);
|
||||||
|
|
||||||
@ -55,8 +56,14 @@ void AmlogicWrapper::action()
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
_processor->process(_image, _ledColors);
|
if ( _forward )
|
||||||
|
{
|
||||||
|
Image<ColorRgb> image_rgb;
|
||||||
|
_image.toRgb(image_rgb);
|
||||||
|
emit emitImage(_priority, image_rgb, _timeout_ms);
|
||||||
|
}
|
||||||
|
|
||||||
|
_processor->process(_image, _ledColors);
|
||||||
_hyperion->setColors(_priority, _ledColors, _timeout_ms);
|
_hyperion->setColors(_priority, _ledColors, _timeout_ms);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1,40 +1,41 @@
|
|||||||
|
|
||||||
# Find the BCM-package (VC control)
|
# Find the BCM-package (VC control)
|
||||||
find_package(BCM REQUIRED)
|
find_package(BCM REQUIRED)
|
||||||
include_directories(${BCM_INCLUDE_DIRS})
|
include_directories(${BCM_INCLUDE_DIRS})
|
||||||
|
|
||||||
# Define the current source locations
|
# Define the current source locations
|
||||||
SET(CURRENT_HEADER_DIR ${CMAKE_SOURCE_DIR}/include/grabber)
|
SET(CURRENT_HEADER_DIR ${CMAKE_SOURCE_DIR}/include/grabber)
|
||||||
SET(CURRENT_SOURCE_DIR ${CMAKE_SOURCE_DIR}/libsrc/grabber/dispmanx)
|
SET(CURRENT_SOURCE_DIR ${CMAKE_SOURCE_DIR}/libsrc/grabber/dispmanx)
|
||||||
|
|
||||||
# Group the headers that go through the MOC compiler
|
# Group the headers that go through the MOC compiler
|
||||||
SET(DispmanxGrabberQT_HEADERS
|
SET(DispmanxGrabberQT_HEADERS
|
||||||
${CURRENT_HEADER_DIR}/DispmanxWrapper.h
|
${CURRENT_HEADER_DIR}/DispmanxWrapper.h
|
||||||
)
|
)
|
||||||
|
|
||||||
SET(DispmanxGrabberHEADERS
|
SET(DispmanxGrabberHEADERS
|
||||||
${CURRENT_SOURCE_DIR}/DispmanxFrameGrabber.h
|
${CURRENT_HEADER_DIR}/DispmanxFrameGrabber.h
|
||||||
)
|
)
|
||||||
|
|
||||||
SET(DispmanxGrabberSOURCES
|
SET(DispmanxGrabberSOURCES
|
||||||
${CURRENT_SOURCE_DIR}/DispmanxWrapper.cpp
|
${CURRENT_SOURCE_DIR}/DispmanxWrapper.cpp
|
||||||
${CURRENT_SOURCE_DIR}/DispmanxFrameGrabber.cpp
|
${CURRENT_SOURCE_DIR}/DispmanxFrameGrabber.cpp
|
||||||
)
|
)
|
||||||
|
|
||||||
if(ENABLE_QT5)
|
if(ENABLE_QT5)
|
||||||
QT5_WRAP_CPP(DispmanxGrabberHEADERS_MOC ${DispmanxGrabberQT_HEADERS})
|
QT5_WRAP_CPP(DispmanxGrabberHEADERS_MOC ${DispmanxGrabberQT_HEADERS})
|
||||||
else(ENABLE_QT5)
|
else(ENABLE_QT5)
|
||||||
QT4_WRAP_CPP(DispmanxGrabberHEADERS_MOC ${DispmanxGrabberQT_HEADERS})
|
QT4_WRAP_CPP(DispmanxGrabberHEADERS_MOC ${DispmanxGrabberQT_HEADERS})
|
||||||
endif(ENABLE_QT5)
|
endif(ENABLE_QT5)
|
||||||
|
|
||||||
add_library(dispmanx-grabber
|
add_library(dispmanx-grabber
|
||||||
${DispmanxGrabberHEADERS}
|
${DispmanxGrabberHEADERS}
|
||||||
${DispmanxGrabberQT_HEADERS}
|
${DispmanxGrabberQT_HEADERS}
|
||||||
${DispmanxGrabberHEADERS_MOC}
|
${DispmanxGrabberHEADERS_MOC}
|
||||||
${DispmanxGrabberSOURCES}
|
${DispmanxGrabberSOURCES}
|
||||||
)
|
)
|
||||||
|
|
||||||
target_link_libraries(dispmanx-grabber
|
target_link_libraries(dispmanx-grabber
|
||||||
hyperion
|
hyperion
|
||||||
${QT_LIBRARIES}
|
${QT_LIBRARIES}
|
||||||
${BCM_LIBRARIES})
|
${BCM_LIBRARIES}
|
||||||
|
)
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
#include <iostream>
|
#include <iostream>
|
||||||
|
|
||||||
// Local includes
|
// Local includes
|
||||||
#include "DispmanxFrameGrabber.h"
|
#include "grabber/DispmanxFrameGrabber.h"
|
||||||
|
|
||||||
DispmanxFrameGrabber::DispmanxFrameGrabber(const unsigned width, const unsigned height) :
|
DispmanxFrameGrabber::DispmanxFrameGrabber(const unsigned width, const unsigned height) :
|
||||||
_vc_display(0),
|
_vc_display(0),
|
||||||
|
@ -9,7 +9,7 @@
|
|||||||
|
|
||||||
// Dispmanx grabber includes
|
// Dispmanx grabber includes
|
||||||
#include <grabber/DispmanxWrapper.h>
|
#include <grabber/DispmanxWrapper.h>
|
||||||
#include "DispmanxFrameGrabber.h"
|
#include <grabber/DispmanxFrameGrabber.h>
|
||||||
|
|
||||||
|
|
||||||
DispmanxWrapper::DispmanxWrapper(const unsigned grabWidth, const unsigned grabHeight, const unsigned updateRate_Hz, Hyperion * hyperion) :
|
DispmanxWrapper::DispmanxWrapper(const unsigned grabWidth, const unsigned grabHeight, const unsigned updateRate_Hz, Hyperion * hyperion) :
|
||||||
@ -28,6 +28,7 @@ DispmanxWrapper::DispmanxWrapper(const unsigned grabWidth, const unsigned grabHe
|
|||||||
_timer.setSingleShot(false);
|
_timer.setSingleShot(false);
|
||||||
|
|
||||||
_processor->setSize(grabWidth, grabHeight);
|
_processor->setSize(grabWidth, grabHeight);
|
||||||
|
_forward = _hyperion->getForwarder()->protoForwardingEnabled();
|
||||||
|
|
||||||
// Connect the QTimer to this
|
// Connect the QTimer to this
|
||||||
QObject::connect(&_timer, SIGNAL(timeout()), this, SLOT(action()));
|
QObject::connect(&_timer, SIGNAL(timeout()), this, SLOT(action()));
|
||||||
@ -51,7 +52,12 @@ void DispmanxWrapper::action()
|
|||||||
// Grab frame into the allocated image
|
// Grab frame into the allocated image
|
||||||
_frameGrabber->grabFrame(_image);
|
_frameGrabber->grabFrame(_image);
|
||||||
|
|
||||||
//emit emitImage(_priority, _image, _timeout_ms);
|
if ( _forward )
|
||||||
|
{
|
||||||
|
Image<ColorRgb> image_rgb;
|
||||||
|
_image.toRgb(image_rgb);
|
||||||
|
emit emitImage(_priority, image_rgb, _timeout_ms);
|
||||||
|
}
|
||||||
|
|
||||||
_processor->process(_image, _ledColors);
|
_processor->process(_image, _ledColors);
|
||||||
_hyperion->setColors(_priority, _ledColors, _timeout_ms);
|
_hyperion->setColors(_priority, _ledColors, _timeout_ms);
|
||||||
|
@ -15,4 +15,9 @@ if(ENABLE_PROTOBUF)
|
|||||||
if(ENABLE_X11)
|
if(ENABLE_X11)
|
||||||
add_subdirectory(hyperion-x11)
|
add_subdirectory(hyperion-x11)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
if(ENABLE_DISPMANX)
|
||||||
|
add_subdirectory(hyperion-dispmanx)
|
||||||
|
endif()
|
||||||
|
|
||||||
endif()
|
endif()
|
||||||
|
70
src/hyperion-dispmanx/CMakeLists.txt
Normal file
70
src/hyperion-dispmanx/CMakeLists.txt
Normal file
@ -0,0 +1,70 @@
|
|||||||
|
# Configure minimum CMAKE version
|
||||||
|
cmake_minimum_required(VERSION 2.8)
|
||||||
|
|
||||||
|
# Set the project name
|
||||||
|
project(hyperion-dispmanx)
|
||||||
|
|
||||||
|
if(ENABLE_QT5)
|
||||||
|
find_package(Qt5Widgets REQUIRED)
|
||||||
|
else(ENABLE_QT5)
|
||||||
|
# find Qt4
|
||||||
|
find_package(Qt4 REQUIRED QtCore QtGui QtNetwork )
|
||||||
|
endif(ENABLE_QT5)
|
||||||
|
|
||||||
|
# Find the BCM-package (VC control)
|
||||||
|
#find_package(BCM REQUIRED)
|
||||||
|
SET( BCM_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/dependencies/external/rapsi_vc )
|
||||||
|
SET( BCM_LIBRARIES "" )
|
||||||
|
ADD_DEFINITIONS ( -DDISPMANX_DUMMY )
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
include_directories(
|
||||||
|
${CMAKE_CURRENT_BINARY_DIR}/../../libsrc/protoserver
|
||||||
|
${QT_INCLUDES}
|
||||||
|
${BCM_INCLUDE_DIRS}
|
||||||
|
${PROTOBUF_INCLUDE_DIRS}
|
||||||
|
)
|
||||||
|
|
||||||
|
set(Hyperion_Dispmanx_QT_HEADERS
|
||||||
|
DispmanxWrapper.h)
|
||||||
|
|
||||||
|
set(Hyperion_Dispmanx_HEADERS
|
||||||
|
)
|
||||||
|
|
||||||
|
set(Hyperion_Dispmanx_SOURCES
|
||||||
|
hyperion-dispmanx.cpp
|
||||||
|
DispmanxWrapper.cpp
|
||||||
|
)
|
||||||
|
|
||||||
|
if(ENABLE_QT5)
|
||||||
|
QT5_WRAP_CPP(Hyperion_Dispmanx_HEADERS_MOC ${Hyperion_Dispmanx_QT_HEADERS})
|
||||||
|
else(ENABLE_QT5)
|
||||||
|
QT4_WRAP_CPP(Hyperion_Dispmanx_HEADERS_MOC ${Hyperion_Dispmanx_QT_HEADERS})
|
||||||
|
endif(ENABLE_QT5)
|
||||||
|
|
||||||
|
add_executable( ${PROJECT_NAME}
|
||||||
|
${Hyperion_Dispmanx_HEADERS}
|
||||||
|
${Hyperion_Dispmanx_SOURCES}
|
||||||
|
${Hyperion_Dispmanx_HEADERS_MOC}
|
||||||
|
)
|
||||||
|
|
||||||
|
target_link_libraries( ${PROJECT_NAME}
|
||||||
|
getoptPlusPlus
|
||||||
|
blackborder
|
||||||
|
hyperion-utils
|
||||||
|
protoserver
|
||||||
|
dispmanx-grabber
|
||||||
|
${Dispmanx_LIBRARIES}
|
||||||
|
pthread
|
||||||
|
)
|
||||||
|
|
||||||
|
if(ENABLE_QT5)
|
||||||
|
qt5_use_modules(hyperion-dispmanx Widgets Core Gui Network)
|
||||||
|
else(ENABLE_QT5)
|
||||||
|
qt4_use_modules(hyperion-dispmanx
|
||||||
|
Core
|
||||||
|
Gui
|
||||||
|
Network
|
||||||
|
)
|
||||||
|
endif(ENABLE_QT5)
|
38
src/hyperion-dispmanx/DispmanxWrapper.cpp
Normal file
38
src/hyperion-dispmanx/DispmanxWrapper.cpp
Normal file
@ -0,0 +1,38 @@
|
|||||||
|
|
||||||
|
// Hyperion-X11 includes
|
||||||
|
#include "DispmanxWrapper.h"
|
||||||
|
|
||||||
|
DispmanxWrapper::DispmanxWrapper(const unsigned grabWidth, const unsigned grabHeight, const unsigned updateRate_Hz) :
|
||||||
|
_timer(this),
|
||||||
|
_grabber(grabWidth, grabHeight)
|
||||||
|
{
|
||||||
|
_timer.setSingleShot(false);
|
||||||
|
_timer.setInterval(updateRate_Hz);
|
||||||
|
|
||||||
|
// Connect capturing to the timeout signal of the timer
|
||||||
|
connect(&_timer, SIGNAL(timeout()), this, SLOT(capture()));
|
||||||
|
}
|
||||||
|
|
||||||
|
const Image<ColorRgb> & DispmanxWrapper::getScreenshot()
|
||||||
|
{
|
||||||
|
capture();
|
||||||
|
return _screenshot_rgb;
|
||||||
|
}
|
||||||
|
|
||||||
|
void DispmanxWrapper::start()
|
||||||
|
{
|
||||||
|
_timer.start();
|
||||||
|
}
|
||||||
|
|
||||||
|
void DispmanxWrapper::stop()
|
||||||
|
{
|
||||||
|
_timer.stop();
|
||||||
|
}
|
||||||
|
|
||||||
|
void DispmanxWrapper::capture()
|
||||||
|
{
|
||||||
|
_grabber.grabFrame(_screenshot);
|
||||||
|
_screenshot.toRgb(_screenshot_rgb);
|
||||||
|
|
||||||
|
emit sig_screenshot(_screenshot_rgb);
|
||||||
|
}
|
42
src/hyperion-dispmanx/DispmanxWrapper.h
Normal file
42
src/hyperion-dispmanx/DispmanxWrapper.h
Normal file
@ -0,0 +1,42 @@
|
|||||||
|
|
||||||
|
// QT includes
|
||||||
|
#include <QTimer>
|
||||||
|
|
||||||
|
// Hyperion-Dispmanx includes
|
||||||
|
#include <grabber/DispmanxFrameGrabber.h>
|
||||||
|
|
||||||
|
class DispmanxWrapper : public QObject
|
||||||
|
{
|
||||||
|
Q_OBJECT
|
||||||
|
public:
|
||||||
|
DispmanxWrapper(const unsigned grabWidth, const unsigned grabHeight, const unsigned updateRate_Hz);
|
||||||
|
|
||||||
|
const Image<ColorRgb> & getScreenshot();
|
||||||
|
|
||||||
|
///
|
||||||
|
/// Starts the timed capturing of screenshots
|
||||||
|
///
|
||||||
|
void start();
|
||||||
|
|
||||||
|
void stop();
|
||||||
|
|
||||||
|
signals:
|
||||||
|
void sig_screenshot(const Image<ColorRgb> & screenshot);
|
||||||
|
|
||||||
|
private slots:
|
||||||
|
///
|
||||||
|
/// Performs a single screenshot capture and publishes the capture screenshot on the screenshot
|
||||||
|
/// signal.
|
||||||
|
///
|
||||||
|
void capture();
|
||||||
|
|
||||||
|
private:
|
||||||
|
/// The QT timer to generate capture-publish events
|
||||||
|
QTimer _timer;
|
||||||
|
|
||||||
|
/// The grabber for creating screenshots
|
||||||
|
DispmanxFrameGrabber _grabber;
|
||||||
|
Image<ColorRgb> _screenshot_rgb;
|
||||||
|
Image<ColorRgba> _screenshot;
|
||||||
|
|
||||||
|
};
|
92
src/hyperion-dispmanx/hyperion-dispmanx.cpp
Normal file
92
src/hyperion-dispmanx/hyperion-dispmanx.cpp
Normal file
@ -0,0 +1,92 @@
|
|||||||
|
|
||||||
|
// QT includes
|
||||||
|
#include <QCoreApplication>
|
||||||
|
#include <QImage>
|
||||||
|
|
||||||
|
// getoptPlusPLus includes
|
||||||
|
#include <getoptPlusPlus/getoptpp.h>
|
||||||
|
|
||||||
|
#include "protoserver/ProtoConnectionWrapper.h"
|
||||||
|
#include "DispmanxWrapper.h"
|
||||||
|
|
||||||
|
using namespace vlofgren;
|
||||||
|
|
||||||
|
// save the image as screenshot
|
||||||
|
void saveScreenshot(const char * 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)
|
||||||
|
{
|
||||||
|
QCoreApplication app(argc, argv);
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
// create the option parser and initialize all parameters
|
||||||
|
OptionsParser optionParser("Dispmanx capture application for Hyperion");
|
||||||
|
ParameterSet & parameters = optionParser.getParameters();
|
||||||
|
|
||||||
|
IntParameter & argFps = parameters.add<IntParameter> ('f', "framerate", "Capture frame rate [default=10]");
|
||||||
|
IntParameter & argWidth = parameters.add<IntParameter> (0x0, "width", "The width of the grabbed frames [pixels]");
|
||||||
|
IntParameter & argHeight = parameters.add<IntParameter> (0x0, "height", "The height of the grabbed frames");
|
||||||
|
|
||||||
|
SwitchParameter<> & argScreenshot = parameters.add<SwitchParameter<>> (0x0, "screenshot", "Take a single screenshot, save it to file and quit");
|
||||||
|
StringParameter & argAddress = parameters.add<StringParameter> ('a', "address", "Set the address of the hyperion server [default: 127.0.0.1:19445]");
|
||||||
|
IntParameter & argPriority = parameters.add<IntParameter> ('p', "priority", "Use the provided priority channel (the lower the number, the higher the priority) [default: 800]");
|
||||||
|
SwitchParameter<> & argSkipReply = parameters.add<SwitchParameter<>> (0x0, "skip-reply", "Do not receive and check reply messages from Hyperion");
|
||||||
|
SwitchParameter<> & argHelp = parameters.add<SwitchParameter<>> ('h', "help", "Show this help message and exit");
|
||||||
|
|
||||||
|
// set defaults
|
||||||
|
argFps.setDefault(10);
|
||||||
|
argWidth.setDefault(64);
|
||||||
|
argHeight.setDefault(64);
|
||||||
|
argAddress.setDefault("127.0.0.1:19445");
|
||||||
|
argPriority.setDefault(800);
|
||||||
|
|
||||||
|
// parse all options
|
||||||
|
optionParser.parse(argc, const_cast<const char **>(argv));
|
||||||
|
|
||||||
|
// check if we need to display the usage. exit if we do.
|
||||||
|
if (argHelp.isSet())
|
||||||
|
{
|
||||||
|
optionParser.usage();
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Create the dispmanx grabbing stuff
|
||||||
|
int grabInterval = 1000 / argFps.getValue();
|
||||||
|
DispmanxWrapper dispmanxWrapper(argWidth.getValue(),argHeight.getValue(),grabInterval);
|
||||||
|
|
||||||
|
if (argScreenshot.isSet())
|
||||||
|
{
|
||||||
|
// Capture a single screenshot and finish
|
||||||
|
const Image<ColorRgb> & screenshot = dispmanxWrapper.getScreenshot();
|
||||||
|
saveScreenshot("screenshot.png", screenshot);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
// Create the Proto-connection with hyperiond
|
||||||
|
ProtoConnectionWrapper protoWrapper(argAddress.getValue(), argPriority.getValue(), 1000, argSkipReply.isSet());
|
||||||
|
|
||||||
|
// Connect the screen capturing to the proto processing
|
||||||
|
QObject::connect(&dispmanxWrapper, SIGNAL(sig_screenshot(const Image<ColorRgb> &)), &protoWrapper, SLOT(receiveImage(Image<ColorRgb>)));
|
||||||
|
|
||||||
|
// Start the capturing
|
||||||
|
dispmanxWrapper.start();
|
||||||
|
|
||||||
|
// Start the application
|
||||||
|
app.exec();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (const std::runtime_error & e)
|
||||||
|
{
|
||||||
|
// An error occured. Display error and quit
|
||||||
|
std::cerr << e.what() << std::endl;
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user