vdr

vdr@linuxtv.org

2 participants
6731 discussions

[PATCH] Use unique recording ids for LSTR/DELR/MOVR
by glenvt18 14 Mar '17

14 Mar '17

the way it was done with timers in 2.3.1. Using cRecordings list index as a recording id is a bad idea. If a recording is deleted between LSTR and DELR, the id passed to DELR might not be valid anymore. In VDR-2.3.2 (and, probably, in 2.3.1 too) even each subsequent DELR command in a series might invalidate the ids. For example: # echo lstr | nc 172.17.0.1 6419 220 004f7f2b0687 SVDRP VideoDiskRecorder 2.3.2; Tue Mar 7 06:25:10 2017; UTF-8 250-1 07.03.17 02:00 0:00* TEST2 250-2 07.03.17 01:00 0:00* TEST1 250-3 07.03.17 04:00 0:00* TEST4 250 4 07.03.17 03:00 0:00* TEST3 # printf "delr 2\ndelr 3\nquit\n" | nc 172.17.0.1 6419 220 004f7f2b0687 SVDRP VideoDiskRecorder 2.3.2; Tue Mar 7 06:25:51 2017; UTF-8 250 Recording "2" deleted 250 Recording "3" deleted 221 004f7f2b0687 closing connection # echo lstr | nc 172.17.0.1 6419 220 004f7f2b0687 SVDRP VideoDiskRecorder 2.3.2; Tue Mar 7 06:25:55 2017; UTF-8 250-1 07.03.17 02:00 0:00* TEST2 250 2 07.03.17 04:00 0:00* TEST4 Recording #4 (TEST3) was deleted instead of #3 (TEST4). VDR-2.2.0 handles it as expected (as 'help DELR' says): # echo lstr | nc 172.17.0.1 6419 220 004f7f2b0687 SVDRP VideoDiskRecorder 2.2.0; Tue Mar 7 06:35:13 2017; UTF-8 250-1 07.03.17 02:00 0:00* TEST2 250-2 07.03.17 01:00 0:00* TEST1 250-3 07.03.17 04:00 0:00* TEST4 250 4 07.03.17 03:00 0:00* TEST3 # printf "delr 2\ndelr 3\nquit\n" | nc 172.17.0.1 6419 220 004f7f2b0687 SVDRP VideoDiskRecorder 2.2.0; Tue Mar 7 06:35:30 2017; UTF-8 250 Recording "2" deleted 250 Recording "3" deleted 221 004f7f2b0687 closing connection # echo lstr | nc 172.17.0.1 6419 220 004f7f2b0687 SVDRP VideoDiskRecorder 2.2.0; Tue Mar 7 06:35:34 2017; UTF-8 250-1 07.03.17 02:00 0:00* TEST2 250 2 07.03.17 03:00 0:00* TEST3 Those unique ids are not persistent and don't survive VDR restarts. The same is true about timers. --- recording.c | 21 +++++++++++++++++++++ recording.h | 8 ++++++++ svdrp.c | 8 ++++---- 3 files changed, 33 insertions(+), 4 deletions(-) diff --git a/recording.c b/recording.c index 5293459..e51b82e 100644 --- a/recording.c +++ b/recording.c @@ -753,6 +753,7 @@ char *LimitNameLengths(char *s, int PathMax, int NameMax) cRecording::cRecording(cTimer *Timer, const cEvent *Event) { + id = 0; resume = RESUME_NOT_INITIALIZED; titleBuffer = NULL; sortBufferName = sortBufferTime = NULL; @@ -808,6 +809,7 @@ cRecording::cRecording(cTimer *Timer, const cEvent *Event) cRecording::cRecording(const char *FileName) { + id = 0; resume = RESUME_NOT_INITIALIZED; fileSizeMB = -1; // unknown channel = -1; @@ -1463,6 +1465,8 @@ time_t cRecordings::lastUpdate = 0; cRecordings::cRecordings(bool Deleted) :cList<cRecording>(Deleted ? "DelRecs" : "Recordings") { + setRecordingId = !Deleted; + lastRecordingId = 0; } cRecordings::~cRecordings() @@ -1507,6 +1511,15 @@ void cRecordings::Update(bool Wait) } } +const cRecording *cRecordings::GetById(int Id) const +{ + for (const cRecording *r = First(); r; r = Next(r)) { + if (r->Id() == Id) + return r; + } + return NULL; +} + const cRecording *cRecordings::GetByName(const char *FileName) const { if (FileName) { @@ -1518,6 +1531,14 @@ const cRecording *cRecordings::GetByName(const char *FileName) const return NULL; } +void cRecordings::Add(cRecording *Recording) +{ + if (setRecordingId) + // no need for locking, the caller must have a lock on the Recordigs list + Recording->SetId(++lastRecordingId); + cList<cRecording>::Add(Recording); +} + void cRecordings::AddByName(const char *FileName, bool TriggerUpdate) { if (!GetByName(FileName)) { diff --git a/recording.h b/recording.h index b649f6f..689f5de 100644 --- a/recording.h +++ b/recording.h @@ -97,6 +97,7 @@ public: class cRecording : public cListObject { friend class cRecordings; private: + int id; mutable int resume; mutable char *titleBuffer; mutable char *sortBufferName; @@ -116,6 +117,7 @@ private: static char *StripEpisodeName(char *s, bool Strip); char *SortName(void) const; void ClearSortName(void); + void SetId(int Id) { id = Id; } // should only be set by cRecordings time_t start; int priority; int lifetime; @@ -124,6 +126,7 @@ public: cRecording(cTimer *Timer, const cEvent *Event); cRecording(const char *FileName); virtual ~cRecording(); + int Id(void) const { return id; } time_t Start(void) const { return start; } int Priority(void) const { return priority; } int Lifetime(void) const { return lifetime; } @@ -220,6 +223,8 @@ class cVideoDirectoryScannerThread; class cRecordings : public cList<cRecording> { private: + bool setRecordingId; + int lastRecordingId; static cRecordings recordings; static cRecordings deletedRecordings; static char *updateFileName; @@ -254,8 +259,11 @@ public: static bool NeedsUpdate(void); void ResetResume(const char *ResumeFileName = NULL); void ClearSortNames(void); + const cRecording *GetById(int Id) const; + cRecording *GetById(int Id) { return const_cast<cRecording *>(static_cast<const cRecordings *>(this)->GetById(Id)); }; const cRecording *GetByName(const char *FileName) const; cRecording *GetByName(const char *FileName) { return const_cast<cRecording *>(static_cast<const cRecordings *>(this)->GetByName(FileName)); } + void Add(cRecording *Recording); void AddByName(const char *FileName, bool TriggerUpdate = true); void DelByName(const char *FileName); void UpdateByName(const char *FileName); diff --git a/svdrp.c b/svdrp.c index 1697cc6..607201c 100644 --- a/svdrp.c +++ b/svdrp.c @@ -1280,7 +1280,7 @@ void cSVDRPServer::CmdDELR(const char *Option) if (isnumber(Option)) { LOCK_RECORDINGS_WRITE; Recordings->SetExplicitModify(); - if (cRecording *Recording = Recordings->Get(strtol(Option, NULL, 10) - 1)) { + if (cRecording *Recording = Recordings->GetById(strtol(Option, NULL, 10))) { if (int RecordingInUse = Recording->IsInUse()) Reply(550, "%s", *RecordingInUseMessage(RecordingInUse, Option, Recording)); else { @@ -1707,7 +1707,7 @@ void cSVDRPServer::CmdLSTR(const char *Option) p = strtok_r(NULL, delim, &strtok_next); } if (Number) { - if (const cRecording *Recording = Recordings->Get(strtol(Option, NULL, 10) - 1)) { + if (const cRecording *Recording = Recordings->GetById(strtol(Option, NULL, 10))) { FILE *f = fdopen(file, "w"); if (f) { if (Path) @@ -1729,7 +1729,7 @@ void cSVDRPServer::CmdLSTR(const char *Option) else if (Recordings->Count()) { const cRecording *Recording = Recordings->First(); while (Recording) { - Reply(Recording == Recordings->Last() ? 250 : -250, "%d %s", Recording->Index() + 1, Recording->Title(' ', true)); + Reply(Recording == Recordings->Last() ? 250 : -250, "%d %s", Recording->Id(), Recording->Title(' ', true)); Recording = Recordings->Next(Recording); } } @@ -1940,7 +1940,7 @@ void cSVDRPServer::CmdMOVR(const char *Option) if (isnumber(num)) { LOCK_RECORDINGS_WRITE; Recordings->SetExplicitModify(); - if (cRecording *Recording = Recordings->Get(strtol(num, NULL, 10) - 1)) { + if (cRecording *Recording = Recordings->GetById(strtol(num, NULL, 10))) { if (int RecordingInUse = Recording->IsInUse()) Reply(550, "%s", *RecordingInUseMessage(RecordingInUse, Option, Recording)); else { -- Sergey Chernyavskiy

1 0

vdr-2.2.0 compilation fails with gcc7
by Martin Gansser 02 Mar '17

02 Mar '17

vdr-2.2.0 compilation fails with gcc7 on Fedora26. g++ -O3 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -m64 -mtune=generic -fPIC -Werror=overloaded-virtual -Wno-parentheses -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -fPIC -c -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -DREMOTE_KBD -DVDR_USER="vdr" -DSDNOTIFY -DLIRC_DEVICE="/var/run/lirc/lircd" -DVIDEODIR="/var/lib/vdr/video" -DCONFDIR="/etc/vdr" -DARGSDIR="/etc/vdr/conf.d" -DCACHEDIR="/var/cache/vdr" -DRESDIR="/usr/share/vdr" -DPLUGINDIR="/usr/lib64/vdr" -DLOCDIR="/usr/share/locale" -I/usr/include/freetype2 -I/usr/include/libpng16 -o dvbdevice.o dvbdevice.c dvbdevice.c: In member function 'bool cDvbTuner::SetFrontend()': dvbdevice.c:851:31: error: call of overloaded 'abs(unsigned int&)' is ambiguous frequency = abs(frequency); // Allow for C-band, where the frequency is less than the LOF ^ the full build.log file: https://kojipkgs.fedoraproject.org/work/tasks/3857/18133857/build.log corrected with the following patch, but i know that's not a good solution, because i am not a software developer. --- a/dvbdevice.c.orig 2017-02-15 15:46:26.642238239 +0100 +++ b/dvbdevice.c 2017-02-15 15:46:51.820575674 +0100 @@ -848,7 +848,7 @@ CHECK(ioctl(fd_frontend, FE_SET_VOLTAGE, volt)); CHECK(ioctl(fd_frontend, FE_SET_TONE, tone)); } - frequency = abs(frequency); // Allow for C-band, where the frequency is less than the LOF + frequency = abs(int(frequency)); // Allow for C-band, where the frequency is less than the LOF // DVB-S/DVB-S2 (common parts) SETCMD(DTV_FREQUENCY, frequency * 1000UL); Porting to GCC 7: https://gcc.gnu.org/gcc-7/porting_to.html#cmath can somebody help me to correct this ?

2 3

projects.vdr-developer.org spam cleanup
by Tobi 01 Mar '17

01 Mar '17

I did some spam cleanup on projects.vdr-developer.org today. There was a lot of spam in news-comments. I hope I've catched all spam, if not, please let me know. All spam-users and inactive users which haven't created any kind content have been deleted as well. I might have deleted some "false positives". If you are missing something, please let me know and I will try to recover it from the backup. If your account was deleted and you can't login anymore, please let me know or just register again. Right now registration requires manual confirmation by the administrator, until I've found a suitable solution to avoid spam users (most likely a captcha). Tobias

1 0

IPTV Plugin and re-directs
by Peer Oliver Schmidt 21 Feb '17

21 Feb '17

Good morning, last night we tried to setup a US channel using IPTV TV2;IPTV:2:IPTV|HTTP|live.softiptv.com/live/jagdish/jagdish/24914.ts|9900:P… is the entry for it. Using the URL from VLC works fine, using it in the above manner does not. It seems that softiptv is using a redirect at the beginning, which throws the plugin for a fit. Anyone seen this before, and maybe have a solution, other than using EXT or CURL. Thanks. -- Best regards Peer Oliver Schmidt PGP Key ID: 0x83E1C2EA

1 0

[PATCH] Fix building against musl C library
by glenvt18 19 Feb '17

19 Feb '17

This was tested with Alpine Linux 3.5/musl-1.1.15/gcc-6.2.1/vdr-2.3.2. While building for Alpine, add -lintl to LIBS: echo 'LIBS += -lintl' >> Make.config Some notes: 1. __attribute__((__format_arg__(n))) is supported since gcc-2.8 (1998). 2. freopen() can be reworked to work with musl if it really matters. 3. Musl doesn't define __MUSL__ or whatever. Checking __GLIBC__ is definitely not perfect, but VDR build system can't run tests for the moment. --- i18n.h | 2 +- osd.c | 2 +- thread.c | 4 +++- tools.c | 2 +- tools.h | 12 +++++++++++- vdr.c | 6 ++++++ 6 files changed, 23 insertions(+), 5 deletions(-) diff --git a/i18n.h b/i18n.h index f8ad9de..b002bbf 100644 --- a/i18n.h +++ b/i18n.h @@ -46,7 +46,7 @@ const cStringList *I18nLanguages(void); ///< have an actual locale installed. The rest are just dummy entries ///< to allow having three letter language codes for other languages ///< that have no actual locale on this system. -const char *I18nTranslate(const char *s, const char *Plugin = NULL) __attribute_format_arg__(1); +const char *I18nTranslate(const char *s, const char *Plugin = NULL) __attribute__((__format_arg__ (1))); ///< Translates the given string (with optional Plugin context) into ///< the current language. If no translation is available, the original ///< string will be returned. diff --git a/osd.c b/osd.c index 524700a..ef975f5 100644 --- a/osd.c +++ b/osd.c @@ -12,7 +12,7 @@ #include <stdlib.h> #include <sys/ioctl.h> #include <sys/stat.h> -#include <sys/unistd.h> +#include <unistd.h> #include "device.h" #include "tools.h" diff --git a/thread.c b/thread.c index 47eb977..58dba43 100644 --- a/thread.c +++ b/thread.c @@ -155,7 +155,9 @@ cRwLock::cRwLock(bool PreferWriter) writeLockThreadId = 0; pthread_rwlockattr_t attr; pthread_rwlockattr_init(&attr); +#if defined(__GLIBC__) pthread_rwlockattr_setkind_np(&attr, PreferWriter ? PTHREAD_RWLOCK_PREFER_WRITER_NP : PTHREAD_RWLOCK_PREFER_READER_NP); +#endif pthread_rwlock_init(&rwlock, &attr); } @@ -205,7 +207,7 @@ cMutex::cMutex(void) locked = 0; pthread_mutexattr_t attr; pthread_mutexattr_init(&attr); - pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_ERRORCHECK_NP); + pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_ERRORCHECK); pthread_mutex_init(&mutex, &attr); } diff --git a/tools.c b/tools.c index 754673d..fef9d2d 100644 --- a/tools.c +++ b/tools.c @@ -640,7 +640,7 @@ char *ReadLink(const char *FileName) { if (!FileName) return NULL; - char *TargetName = canonicalize_file_name(FileName); + char *TargetName = realpath(FileName, NULL); if (!TargetName) { if (errno == ENOENT) // file doesn't exist TargetName = strdup(FileName); diff --git a/tools.h b/tools.h index 73cca5a..03f5fd1 100644 --- a/tools.h +++ b/tools.h @@ -28,6 +28,16 @@ #include <sys/types.h> #include "thread.h" +#ifndef ACCESSPERMS +# define ACCESSPERMS (S_IRWXU|S_IRWXG|S_IRWXO) /* 0777 */ +#endif +#ifndef ALLPERMS +# define ALLPERMS (S_ISUID|S_ISGID|S_ISVTX|S_IRWXU|S_IRWXG|S_IRWXO)/* 07777 */ +#endif +#ifndef DEFFILEMODE +# define DEFFILEMODE (S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH)/* 0666*/ +#endif + typedef unsigned char uchar; extern int SysLogLevel; @@ -738,7 +748,7 @@ public: data[i] = T(0); size = 0; } - void Sort(__compar_fn_t Compare) + void Sort(int (*Compare)(const void *, const void *)) { qsort(data, size, sizeof(T), Compare); } diff --git a/vdr.c b/vdr.c index 8a49471..c2a82aa 100644 --- a/vdr.c +++ b/vdr.c @@ -670,12 +670,18 @@ int main(int argc, char *argv[]) } } else if (Terminal) { +#ifdef __GLIBC__ // Claim new controlling terminal stdin = freopen(Terminal, "r", stdin); stdout = freopen(Terminal, "w", stdout); stderr = freopen(Terminal, "w", stderr); HasStdin = true; tcgetattr(STDIN_FILENO, &savedTm); +#else + // stdin, stdout, stderr are declared FILE const* by musl C library + fprintf(stderr, "Option '-t' is only supported if VDR has been built against glibc.\n"); + return 2; +#endif } isyslog("VDR version %s started", VDRVERSION); -- Sergey Chernyavskiy

2 1

Re: [vdr] xineliboutput and vaapi
by Jose Alberto Reguero 13 Feb '17

13 Feb '17

El 09/02/2017 11:02, Petri Hintukainen <phintuka(a)users.sourceforge.net> escribió: > > ti, 2017-01-31 kello 18:21 +0100, Jose Alberto Reguero kirjoitti: > > I upgrade to fedora 25, and now vaapi with xineliboutput don't work > > for h264 channels. Works well with softhddevice. Attached is a log > > from vdr-sxfe. > > > > Any hint? > > Please try upgrading xine-lib from hg. > > I've fixed one vaapi decoding issue today. It was causing video to > break every 1-2 seconds (and no video at all if guarded_render was > disabled in xine config). > The log doesn't look exactly the same, so this could be also different > issue. > Thank you. It seem to solve the problem. I did more tests later. Jose Alberto.

1 0

Re: [vdr] xineliboutput and vaapi
by Petri Hintukainen 09 Feb '17

09 Feb '17

ti, 2017-01-31 kello 18:21 +0100, Jose Alberto Reguero kirjoitti: > I upgrade to fedora 25, and now vaapi with xineliboutput don't work > for h264 channels. Works well with softhddevice. Attached is a log > from vdr-sxfe. > > Any hint? Please try upgrading xine-lib from hg. I've fixed one vaapi decoding issue today. It was causing video to break every 1-2 seconds (and no video at all if guarded_render was disabled in xine config). The log doesn't look exactly the same, so this could be also different issue. > Jose Alberto > _______________________________________________ > vdr mailing list > vdr(a)linuxtv.org > https://www.linuxtv.org/cgi-bin/mailman/listinfo/vdr

1 0

xineliboutput and vaapi
by Jose Alberto Reguero 31 Jan '17

31 Jan '17

I upgrade to fedora 25, and now vaapi with xineliboutput don't work for h264 channels. Works well with softhddevice. Attached is a log from vdr-sxfe. Any hint? Jose Alberto

1 0

VDR without PrimaryDVB but with xineliboutput ?
by Harald Milz 19 Jan '17

19 Jan '17

Hi all, I would like to run my headless VDR without a primary DVB (or suspended output) but keep xineliboutput running. I can't figure out how. My VDR has 4 receivers (2x Astra, 2x Hotbird) without MPEG decoder. It runs vnsiserver (for my Kodi client), streamdev-server (for some browser / VLC clients) and xineliboutput (because it's sometimes useful to have access to the VDR console via remote). Alas, xineliboutput will always be the primary DVB device and block a receiver, which is nasty when VDR is recording on one bouquet, xineliboutput blocks another bouquet and I want to watch live TV on just another bouquet, all on the same satellite. Can I use the suspendoutput plugin while keeping xineliboutput active so that I can access it with vdr-sxfe when needed? TIA! (I could "park" xineliboutput on an arbitrary hotbird channel though but I'd like to have it automated ...) -- Keep emotionally active. Cater to your favorite neurosis.

4 10

Fw: pleasant surprise
by Alma Beach 13 Jan '17

13 Jan '17

Dear, I've just read something that could pleasantly surprise you, check it out http://giusepp.carolinabroncos.com/8180 Best, Alma Beach

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

vdr