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

enabled grabbing flags

Browse Source 
Former-commit-id: 9bb8d3a417bb6edc37ce4f1751e32d35b1c85cab
This commit is contained in:
johan 2013-10-14 18:25:54 +02:00
parent bb620f6408
commit e2983283cb
2 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libsrc/dispmanx-grabber/DispmanxFrameGrabber.cpp
View File

@ -1,18 +1,6 @@
#include "DispmanxFrameGrabber.h" #include "DispmanxFrameGrabber.h"
// Because the shapshot function is incompatible between versions (use of different enum as
// third argument) and no proper version number is available as preprocessor define we cast the
// function to the same function with the third argument as 'int'.
// This way we can call the function in both versions of the VideoCore library without
// switching.
static int my_vc_dispmanx_snapshot(DISPMANX_DISPLAY_HANDLE_T display, DISPMANX_RESOURCE_HANDLE_T snapshot_resource, int transform)
{
typedef int (*SnapshotFunctionPtr)(DISPMANX_DISPLAY_HANDLE_T, DISPMANX_RESOURCE_HANDLE_T, int);
SnapshotFunctionPtr snapshot = (SnapshotFunctionPtr) &vc_dispmanx_snapshot;
return (*snapshot)(display, snapshot_resource, transform);
}
DispmanxFrameGrabber::DispmanxFrameGrabber(const unsigned width, const unsigned height) : DispmanxFrameGrabber::DispmanxFrameGrabber(const unsigned width, const unsigned height) :
_vc_display(0), _vc_display(0),
_vc_resource(0), _vc_resource(0),
@ -77,7 +65,7 @@ void DispmanxFrameGrabber::grabFrame(RgbImage& image)
_vc_display = vc_dispmanx_display_open(0); _vc_display = vc_dispmanx_display_open(0);
// Create the snapshot (incl down-scaling) // Create the snapshot (incl down-scaling)
my_vc_dispmanx_snapshot(_vc_display, _vc_resource, _vc_flags); vc_dispmanx_snapshot(_vc_display, _vc_resource, (DISPMANX_TRANSFORM_T) _vc_flags);
// Read the snapshot into the memory // Read the snapshot into the memory
void* image_ptr = image.memptr(); void* image_ptr = image.memptr();

3
libsrc/dispmanx-grabber/DispmanxWrapper.cpp
View File

@ -66,8 +66,7 @@ void DispmanxWrapper::setGrabbingMode(const GrabbingMode mode)
switch (mode) switch (mode)
{ {
case GRABBINGMODE_VIDEO: case GRABBINGMODE_VIDEO:
_frameGrabber->setFlags(0); _frameGrabber->setFlags(DISPMANX_SNAPSHOT_NO_RGB|DISPMANX_SNAPSHOT_FILL);
//_frameGrabber->setFlags(DISPMANX_SNAPSHOT_NO_RGB|DISPMANX_SNAPSHOT_FILL);
start(); start();
case GRABBINGMODE_AUDIO: case GRABBINGMODE_AUDIO:
case GRABBINGMODE_PHOTO: case GRABBINGMODE_PHOTO: