From 450907edebd609c756bf2cb28c5ed2e048b43337 Mon Sep 17 00:00:00 2001 From: max_10 Date: Tue, 7 Mar 2023 19:22:54 +0100 Subject: [PATCH] cosmetic Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/86ce05d4f1a71e39d16dd4eaaeba0dc5bdb83ca7 Author: max_10 Date: 2023-03-07 (Tue, 07 Mar 2023) Origin message was: ------------------ - cosmetic ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- libarmbox/record.cpp | 4 ++-- libarmbox/record_lib.h | 8 ++++---- libgeneric-pc/dmx.cpp | 7 ++++--- libgeneric-pc/video_lib.h | 2 +- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/libarmbox/record.cpp b/libarmbox/record.cpp index 321d830..6163a4e 100644 --- a/libarmbox/record.cpp +++ b/libarmbox/record.cpp @@ -14,6 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ + #include #include #include @@ -286,8 +287,7 @@ void cRecord::RecordThread() if (toread > readsize) toread = readsize; ssize_t s = dmx->Read(buf + buf_pos, toread, 50); - hal_debug("%s: buf_pos %6d s %6d / %6d\n", - __func__, buf_pos, (int)s, bufsize - buf_pos); + hal_debug("%s: buf_pos %6d s %6d / %6d\n", __func__, buf_pos, (int)s, bufsize - buf_pos); if (s < 0) { if (errno != EAGAIN && (errno != EOVERFLOW || !overflow)) diff --git a/libarmbox/record_lib.h b/libarmbox/record_lib.h index a5325ee..c7c5d54 100644 --- a/libarmbox/record_lib.h +++ b/libarmbox/record_lib.h @@ -13,10 +13,10 @@ typedef enum { RECORD_RUNNING, RECORD_STOPPED, - RECORD_FAILED_READ, /* failed to read from DMX */ - RECORD_FAILED_OVERFLOW, /* cannot write fast enough */ - RECORD_FAILED_FILE, /* cannot write to file */ - RECORD_FAILED_MEMORY /* out of memory */ + RECORD_FAILED_READ, /* failed to read from DMX */ + RECORD_FAILED_OVERFLOW, /* cannot write fast enough */ + RECORD_FAILED_FILE, /* cannot write to file */ + RECORD_FAILED_MEMORY /* out of memory */ } record_state_t; class cRecord diff --git a/libgeneric-pc/dmx.cpp b/libgeneric-pc/dmx.cpp index 5b55cb8..cd7abfe 100644 --- a/libgeneric-pc/dmx.cpp +++ b/libgeneric-pc/dmx.cpp @@ -17,18 +17,18 @@ * along with this program. If not, see . */ -#include "config.h" +#include #include #include #include #include #include #include +#include #include #include #include -#include #include #include "dmx_hal.h" #include "hal_debug.h" @@ -147,6 +147,7 @@ void cDemux::Close(void) hal_info("%s #%d: not open!\n", __FUNCTION__, num); return; } + pesfds.clear(); ioctl(fd, DMX_STOP); close(fd); @@ -264,9 +265,9 @@ bool cDemux::sectionFilter(unsigned short _pid, const unsigned char *const filte hal_info("%s #%d: len too long: %d, DMX_FILTER_SIZE %d\n", __func__, num, len, DMX_FILTER_SIZE); len = DMX_FILTER_SIZE; } + flt = filter[0]; s_flt.pid = pid; s_flt.timeout = timeout; - flt = filter[0]; memcpy(s_flt.filter.filter, filter, len); memcpy(s_flt.filter.mask, mask, len); if (negmask != NULL) diff --git a/libgeneric-pc/video_lib.h b/libgeneric-pc/video_lib.h index 39821cf..178d334 100644 --- a/libgeneric-pc/video_lib.h +++ b/libgeneric-pc/video_lib.h @@ -184,8 +184,8 @@ class cVideo : public OpenThreads::Thread /* aspect ratio */ int getAspectRatio(void); - int setAspectRatio(int aspect, int mode); void getPictureInfo(int &width, int &height, int &rate); + int setAspectRatio(int aspect, int mode); /* cropping mode */ int setCroppingMode(int x = 0 /*vidDispMode_t x = VID_DISPMODE_NORM*/);