From 161ba28427cfc4951d493685aac53b05d2bcc95a Mon Sep 17 00:00:00 2001 From: Jacek Jendrzej Date: Thu, 22 Mar 2018 13:38:29 +0100 Subject: [PATCH] fix commit 6d8a853e823d46f8b8ebbfc15fab938a6fde5e75 Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/d3201d6c49b2cc024610e38bf36c4be7fa98393d Author: Jacek Jendrzej Date: 2018-03-22 (Thu, 22 Mar 2018) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- libarmbox/video.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/libarmbox/video.cpp b/libarmbox/video.cpp index b582b29..a9f6bda 100644 --- a/libarmbox/video.cpp +++ b/libarmbox/video.cpp @@ -845,17 +845,21 @@ void cVideo::SetColorFormat(COLOR_FORMAT color_format) { bool getvideo2(unsigned char *video, int xres, int yres) { + bool ret = false; if(video == NULL) - return false; + return ret; char videosnapshot[] = "/dev/dvb/adapter0/video0"; int fd_video = open(videosnapshot, O_RDONLY); if (fd_video < 0) { perror(videosnapshot); - return false; + return ret; + } + ssize_t r = read(fd_video, video, xres * yres * 3); + if(r){ + ret = true; } - //ssize_t r = read(fd_video, video, xres * yres * 3); close(fd_video); - return true; + return ret; } static bool swscale(unsigned char *src, unsigned char *dst, int sw, int sh, int dw, int dh, AVPixelFormat sfmt) {