frodovdr/hyperion.ng
1
0
Fork 0
mirror of https://github.com/hyperion-project/hyperion.ng.git synced 2023-10-10 13:36:59 +02:00
Code Issues Releases Wiki Activity

prepare standalone amlogic grabber

Browse Source 
activate internal amlogic grabber forwarding


Former-commit-id: 21dabf759935836eef556baeb8a27e362e95ae96
This commit is contained in:
redpanther 2016-02-24 14:42:25 +01:00
parent 6bef43887b
commit 8fdf97e693
6 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
libsrc/grabber/amlogic/AmlogicGrabber.h → include/grabber/AmlogicGrabber.h
View File

2
libsrc/grabber/amlogic/AmlogicGrabber.cpp
View File

@ -13,7 +13,7 @@
#include <sys/types.h> #include <sys/types.h>
// Local includes // Local includes
#include "AmlogicGrabber.h" #include <grabber/AmlogicGrabber.h>
// Flags copied from 'include/linux/amlogic/amports/amvideocap.h' at https://github.com/codesnake/linux-amlogic // Flags copied from 'include/linux/amlogic/amports/amvideocap.h' at https://github.com/codesnake/linux-amlogic
#define AMVIDEOCAP_IOC_MAGIC 'V' #define AMVIDEOCAP_IOC_MAGIC 'V'

2
libsrc/grabber/amlogic/AmlogicWrapper.cpp
View File

@ -9,7 +9,7 @@
// Amlogic grabber includes // Amlogic grabber includes
#include <grabber/AmlogicWrapper.h> #include <grabber/AmlogicWrapper.h>
#include "AmlogicGrabber.h" #include <grabber/AmlogicGrabber.h>
AmlogicWrapper::AmlogicWrapper(const unsigned grabWidth, const unsigned grabHeight, const unsigned updateRate_Hz, Hyperion * hyperion) : AmlogicWrapper::AmlogicWrapper(const unsigned grabWidth, const unsigned grabHeight, const unsigned updateRate_Hz, Hyperion * hyperion) :

2
libsrc/grabber/amlogic/CMakeLists.txt
View File

@ -7,7 +7,7 @@ SET(CURRENT_SOURCE_DIR ${CMAKE_SOURCE_DIR}/libsrc/grabber/amlogic)
SET(AmlogicQT_HEADERS ${CURRENT_HEADER_DIR}/AmlogicWrapper.h) SET(AmlogicQT_HEADERS ${CURRENT_HEADER_DIR}/AmlogicWrapper.h)
SET(AmlogicHEADERS SET(AmlogicHEADERS
${CURRENT_SOURCE_DIR}/AmlogicGrabber.h ${CURRENT_HEADER_DIR}/AmlogicGrabber.h
) )
SET(AmlogicSOURCES SET(AmlogicSOURCES

2
src/hyperion-aml/hyperion-aml.cpp
View File

@ -7,7 +7,7 @@
// getoptPlusPLus includes // getoptPlusPLus includes
#include <getoptPlusPlus/getoptpp.h> #include <getoptPlusPlus/getoptpp.h>
#include "../../libsrc/grabber/amlogic/AmlogicGrabber.h" #include <grabber/AmlogicGrabber.h>
using namespace vlofgren; using namespace vlofgren;

4
src/hyperiond/hyperiond.cpp
View File

@ -316,6 +316,10 @@ int main(int argc, char** argv)
QObject::connect(xbmcVideoChecker, SIGNAL(videoMode(VideoMode)), amlGrabber, SLOT(setVideoMode(VideoMode))); QObject::connect(xbmcVideoChecker, SIGNAL(videoMode(VideoMode)), amlGrabber, SLOT(setVideoMode(VideoMode)));
} }
#ifdef ENABLE_PROTOBUF
QObject::connect(amlGrabber, SIGNAL(emitImage(int, const Image<ColorRgb>&, const int)), protoServer, SLOT(sendImageToProtoSlaves(int, const Image<ColorRgb>&, const int)) );
#endif
amlGrabber->start(); amlGrabber->start();
std::cout << "AMLOGIC grabber created and started" << std::endl; std::cout << "AMLOGIC grabber created and started" << std::endl;
} }