Amlogic box uses aml and fb buffer (#141)

* v4l: fix auto mode opens usable device twice

* on amlogic system, start framegrabber and amlogic grabber

* tune code formating

* make aml grabber always one prio below fb

* hyperiond refactoring

* refactor hyperiond grabber donfig code
add json clinet view of active and inactive input sources
This commit is contained in:
redPanther
2016-07-27 22:52:59 +02:00
committed by GitHub
parent b7d1fbf378
commit f1a4672a93
4 changed files with 60 additions and 57 deletions

View File

@@ -65,8 +65,8 @@ public:
void createSystemFrameGrabber();
private:
void createGrabberDispmanx(const Json::Value & grabberConfig);
void createGrabberAmlogic(const Json::Value & grabberConfig);
void createGrabberDispmanx();
void createGrabberAmlogic();
void createGrabberFramebuffer(const Json::Value & grabberConfig);
void createGrabberOsx(const Json::Value & grabberConfig);
void createGrabberX11(const Json::Value & grabberConfig);
@@ -86,4 +86,13 @@ private:
OsxWrapper* _osxGrabber;
WebConfig* _webConfig;
Hyperion* _hyperion;
unsigned _grabber_width;
unsigned _grabber_height;
unsigned _grabber_frequency;
int _grabber_priority;
unsigned _grabber_cropLeft;
unsigned _grabber_cropRight;
unsigned _grabber_cropTop;
unsigned _grabber_cropBottom;
};