frodovdr/hyperion.ng
1
0
Fork 0
mirror of https://github.com/hyperion-project/hyperion.ng.git synced 2025-03-01 10:33:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Moved open and close of display to the 'grab' method, solving resolution switches.

Browse Source 
Added doxygen comments to the dispmanx header.
This commit is contained in:
T. van der Zwan
2013-08-21 14:37:00 +00:00
parent 240b118ce9
commit f8c8fa6c74
2 changed files with 58 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,41 +2,47 @@
#include "DispmanxFrameGrabber.h"
DispmanxFrameGrabber::DispmanxFrameGrabber(const unsigned width, const unsigned height) :
_display(0),
_resource(0),
_vc_display(0),
_vc_resource(0),
_width(width),
_height(height)
{
// Initiase BCM
bcm_host_init();
// Open the connection to the display
_display = vc_dispmanx_display_open(0);
int ret = vc_dispmanx_display_get_info(_display, &_info);
// Make the compiler (in release mode) happy by 'using' ret
(void)ret;
assert(ret == 0);
{
// Check if the display can be opened and display the current resolution
// Open the connection to the display
_vc_display = vc_dispmanx_display_open(0);
assert(_vc_display > 0);
// Obtain the display information
DISPMANX_MODEINFO_T vc_info;
int result = vc_dispmanx_display_get_info(_vc_display, &vc_info);
assert(result == 0);
std::cout << "Display opened with resolution: " << vc_info.width << "x" << vc_info.height << std::endl;
// Close the displaye
vc_dispmanx_display_close(_vc_display);
}
// Create the resources for capturing image
_resource = vc_dispmanx_resource_create(
uint32_t vc_nativeImageHandle;
_vc_resource = vc_dispmanx_resource_create(
VC_IMAGE_RGB888,
width,
height,
&_vc_image_ptr);
assert(_resource);
&vc_nativeImageHandle);
assert(_vc_resource);
// Define the capture rectangle with the same size
vc_dispmanx_rect_set(&_rectangle, 0, 0, width, height);
_pitch = width * 3;
}
DispmanxFrameGrabber::~DispmanxFrameGrabber()
{
// Clean up resources
vc_dispmanx_resource_delete(_resource);
// Close the displaye
vc_dispmanx_display_close(_display);
vc_dispmanx_resource_delete(_vc_resource);
// De-init BCM
bcm_host_deinit();
@@ -47,10 +53,17 @@ void DispmanxFrameGrabber::grabFrame(RgbImage& image)
// Sanity check of the given image size
assert(image.width() == _width && image.height() == _height);
void* image_ptr = image.memptr();
// Open the connection to the display
_vc_display = vc_dispmanx_display_open(0);
// Create the snapshot
vc_dispmanx_snapshot(_display, _resource, VC_IMAGE_ROT0);
// Read the snapshot into the memory (incl down-scaling)
vc_dispmanx_resource_read_data(_resource, &_rectangle, image_ptr, _pitch);
// Create the snapshot (incl down-scaling)
vc_dispmanx_snapshot(_vc_display, _vc_resource, VC_IMAGE_ROT0);
// Read the snapshot into the memory
void* image_ptr = image.memptr();
const unsigned destPitch = _width * 3;
vc_dispmanx_resource_read_data(_vc_resource, &_rectangle, image_ptr, destPitch);
// Close the displaye
vc_dispmanx_display_close(_vc_display);
}