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

fix amlogic logic leads to crash

Browse Source 
... most of the format strings had wrong types
This commit is contained in:
redPanther
2016-07-24 19:56:41 +02:00
committed by GitHub
parent 30b9c20611
commit d551739903
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,7 +3,7 @@
#include <algorithm> #include <algorithm>
#include <cassert> #include <cassert>
#include <iostream> #include <iostream>
#include <utils/Logger.h>
// Linux includes // Linux includes
#include <errno.h> #include <errno.h>
#include <fcntl.h> #include <fcntl.h>
@@ -13,6 +13,7 @@
#include <sys/types.h> #include <sys/types.h>
// Local includes // Local includes
#include <utils/Logger.h>
#include <grabber/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
@@ -24,13 +25,12 @@
#define AMSTREAM_IOC_MAGIC 'S' #define AMSTREAM_IOC_MAGIC 'S'
#define AMSTREAM_IOC_GET_VIDEO_DISABLE _IOR(AMSTREAM_IOC_MAGIC, 0x48, unsigned long) #define AMSTREAM_IOC_GET_VIDEO_DISABLE _IOR(AMSTREAM_IOC_MAGIC, 0x48, unsigned long)
AmlogicGrabber::AmlogicGrabber(const unsigned width, const unsigned height) : AmlogicGrabber::AmlogicGrabber(const unsigned width, const unsigned height)
// Minimum required width or height is 160 : _width(std::max(160u, width)) // Minimum required width or height is 160
_width(std::max(160u, width)), , _height(std::max(160u, height))
_height(std::max(160u, height)), , _amlogicCaptureDev(-1)
_amlogicCaptureDev(-1)
{ {
Info(_log, "[%s] constructed(%s x %s)",__PRETTY_FUNCTION__,_width,_height); Debug(_log, "constructed(%d x %d)",_width,_height);
} }
AmlogicGrabber::~AmlogicGrabber() AmlogicGrabber::~AmlogicGrabber()
@@ -39,7 +39,7 @@ AmlogicGrabber::~AmlogicGrabber()
{ {
if (close(_amlogicCaptureDev) == -1) if (close(_amlogicCaptureDev) == -1)
{ {
Error(_log, "[%s] Failed to close device (%s)",__PRETTY_FUNCTION__,errno); Error(_log, "Failed to close device (%d - %s)", errno, strerror(errno));
} }
_amlogicCaptureDev = -1; _amlogicCaptureDev = -1;
} }
@@ -69,7 +69,7 @@ bool AmlogicGrabber::isVideoPlaying()
int video_fd = open(videoDevice.c_str(), O_RDONLY); int video_fd = open(videoDevice.c_str(), O_RDONLY);
if (video_fd < 0) if (video_fd < 0)
{ {
Error(_log, "Failed to open video device(%s): %s",videoDevice.c_str(),strerror(errno)); Error(_log, "Failed to open video device(%s): %d - %s", videoDevice.c_str(), errno, strerror(errno));
return false; return false;
} }
@@ -77,7 +77,7 @@ bool AmlogicGrabber::isVideoPlaying()
int videoDisabled; int videoDisabled;
if (ioctl(video_fd, AMSTREAM_IOC_GET_VIDEO_DISABLE, &videoDisabled) == -1) if (ioctl(video_fd, AMSTREAM_IOC_GET_VIDEO_DISABLE, &videoDisabled) == -1)
{ {
Error(_log, "Failed to retrieve video state from device: %s",strerror(errno)); Error(_log, "Failed to retrieve video state from device: %d - %s", errno, strerror(errno));
close(video_fd); close(video_fd);
return false; return false;
} }
@@ -111,7 +111,7 @@ int AmlogicGrabber::grabFrame(Image<ColorBgr> & image)
// If the device is still not open, there is something wrong // If the device is still not open, there is something wrong
if (_amlogicCaptureDev == -1) if (_amlogicCaptureDev == -1)
{ {
Error(_log,"[%s] Failed to open the AMLOGIC device ():",__PRETTY_FUNCTION__,errno,strerror(errno)); Error(_log,"Failed to open the AMLOGIC device (%d - %s):", errno, strerror(errno));
return -1; return -1;
} }
} }
@@ -121,7 +121,7 @@ int AmlogicGrabber::grabFrame(Image<ColorBgr> & image)
ioctl(_amlogicCaptureDev, AMVIDEOCAP_IOW_SET_WANTFRAME_HEIGHT, _height) == -1) ioctl(_amlogicCaptureDev, AMVIDEOCAP_IOW_SET_WANTFRAME_HEIGHT, _height) == -1)
{ {
// Failed to configure frame width // Failed to configure frame width
Error(_log,"[%s] Failed to configure capture size (%s)",__PRETTY_FUNCTION__,errno,strerror(errno)); Error(_log,"Failed to configure capture size (%d - %s)", errno, strerror(errno));
close(_amlogicCaptureDev); close(_amlogicCaptureDev);
_amlogicCaptureDev = -1; _amlogicCaptureDev = -1;
return -1; return -1;
@@ -134,7 +134,7 @@ int AmlogicGrabber::grabFrame(Image<ColorBgr> & image)
const ssize_t bytesRead = pread(_amlogicCaptureDev, image_ptr, bytesToRead, 0); const ssize_t bytesRead = pread(_amlogicCaptureDev, image_ptr, bytesToRead, 0);
if (bytesRead == -1) if (bytesRead == -1)
{ {
Error(_log,"[%s] Read of device failed (erno=%s): %s",__PRETTY_FUNCTION__,errno,strerror(errno)); Error(_log,"Read of device failed: %d - %s", errno, strerror(errno));
close(_amlogicCaptureDev); close(_amlogicCaptureDev);
_amlogicCaptureDev = -1; _amlogicCaptureDev = -1;
return -1; return -1;
@@ -142,7 +142,7 @@ int AmlogicGrabber::grabFrame(Image<ColorBgr> & image)
else if (bytesToRead != bytesRead) else if (bytesToRead != bytesRead)
{ {
// Read of snapshot failed // Read of snapshot failed
Error(_log,"[%s] Capture failed to grab entire image [bytesToRead(%s) != bytesRead(%s)]",__PRETTY_FUNCTION__,bytesToRead,bytesRead); Error(_log,"Capture failed to grab entire image [bytesToRead(%d) != bytesRead(%d)]", bytesToRead, bytesRead);
close(_amlogicCaptureDev); close(_amlogicCaptureDev);
_amlogicCaptureDev = -1; _amlogicCaptureDev = -1;
return -1; return -1;