vdr

vdr@linuxtv.org

6731 discussions

[PATCH] Auto sized ringbuffers v3
by Artur Skawina 20 May '07

20 May '07

This is still in a just-for-testing phase. Found a way to better stress test this code, hence these changes: - decreased the growth threshold from 1/2 to 1/3. IOW the goal is always for 66% of the buffer to be free; this increases the working set, but the alternative (handling overflows by spilling over to the unused portion) makes thing more complex. - made buffers grow by 1.5x, not 2x. Related to above. - increased the initial bufsize from 128k to 192k. - removed some now redundant Read() code. - dropped the controversial cRecorder::Receive hunk (I'm keeping this locally as it prevents (very rare) data corruption while testing. Overflows will be logged even w/o this change, so it makes no difference otherwise). - added verbose cRecorder::Action sleep logging. Shorter delays are a side effect, but do not help all that much (from the few times this triggered here so far less than half of the delays were <<100ms). Patch attached (apparently this makes extracting it easier for gmail users). artur diff --git a/dvbdevice.c b/dvbdevice.c index 955483e..20dcf29 100644 --- a/dvbdevice.c +++ b/dvbdevice.c @@ -1184,7 +1184,7 @@ bool cDvbDevice::OpenDvr(void) CloseDvr(); fd_dvr = DvbOpen(DEV_DVB_DVR, CardIndex(), O_RDONLY | O_NONBLOCK, true); if (fd_dvr >= 0) - tsBuffer = new cTSBuffer(fd_dvr, MEGABYTE(2), CardIndex() + 1); + tsBuffer = new cTSBuffer(fd_dvr, MEGABYTE(8), CardIndex() + 1); return fd_dvr >= 0; } diff --git a/recorder.c b/recorder.c index 8bb1621..0b625d6 100644 --- a/recorder.c +++ b/recorder.c @@ -171,8 +171,22 @@ void cRecorder::Action(void) int Count = remux->Put(b, r); if (Count) ringBuffer->Del(Count); - else - cCondWait::SleepMs(100); // avoid busy loop when resultBuffer is full in cRemux::Put() - } + else { // avoid busy loop when resultBuffer is full in cRemux::Put() + int ms; + for (ms=5; Running() && ms<100; ms+=ms) { + cCondWait::SleepMs(ms); + if (!Running()) + return; + Count = remux->Put(b, r); + if (Count) { + ringBuffer->Del(Count); + dsyslog("cRecorder::Action() ring buffer consumer slept %d ms", ms); + break; + } + } + if (ms>=100) + dsyslog("cRecorder::Action() ring buffer consumer slept >100 ms"); + } + } } } diff --git a/remux.c b/remux.c index da805b7..bd29b2f 100644 --- a/remux.c +++ b/remux.c @@ -1851,7 +1851,7 @@ void cTS2PES::ts_to_pes(const uint8_t *Buf) // don't need count (=188) // --- cRemux ---------------------------------------------------------------- -#define RESULTBUFFERSIZE KILOBYTE(256) +#define RESULTBUFFERSIZE MEGABYTE(2) cRemux::cRemux(int VPid, const int *APids, const int *DPids, const int *SPids, bool ExitOnFailure) { diff --git a/ringbuffer.c b/ringbuffer.c index 0633bd3..68ce081 100644 --- a/ringbuffer.c +++ b/ringbuffer.c @@ -151,13 +151,31 @@ void cRingBufferLinear::PrintDebugRBL(void) } #endif +// cRingBufferLinear are dynamically sized, or at least we can pretend they are ;) +// We treat 'Size' as the maximum size, but start with a small buffer, which can +// grow later as it fills up. Memory is always allocated for the full buffer, but +// the unused RAM portion remains untouched until (if at all) it is actually needed. +// Note that we can not start with a larger than requested buffer because there are +// ring buffer users that cause crashes then (eg softdevice mpegdecoder absolutely +// needs 32/64k). + +// Startup size. 64k still causes overflows before buffer starts to grow, 128k doesn't. +// The buffers grow to 200..500k anyway, so maybe increasing this a bit more would +// make sense, but let's first see if it's really needed. +// In fact 128k is on the low side, but let's try not going for 256k yet. +#define DEFRBSIZE KILOBYTE(192) + cRingBufferLinear::cRingBufferLinear(int Size, int Margin, bool Statistics, const char *Description) -:cRingBuffer(Size, Statistics) +:cRingBuffer(min(Size,DEFRBSIZE), Statistics) { description = Description ? strdup(Description) : NULL; tail = head = margin = Margin; gotten = 0; buffer = NULL; + maxsize = Size; + growthresh = size<maxsize ? size/3 : maxsize+1; + growbuf = 0; + dsyslog("New ring buffer \"%s\" size: %d margin: %d", description, Size, Margin ); if (Size > 1) { // 'Size - 1' must not be 0! if (Margin <= Size / 2) { buffer = MALLOC(uchar, Size); @@ -183,6 +201,8 @@ cRingBufferLinear::~cRingBufferLinear() #ifdef DEBUGRINGBUFFERS DelDebugRBL(this); #endif + dsyslog("Deleting ring buffer \"%s\" size: %d / %d (used %g%% of requested size)", description, + size, maxsize, size/(double)maxsize*100.0 ); free(buffer); free(description); } @@ -205,8 +225,20 @@ void cRingBufferLinear::Clear(void) EnablePut(); } +// Must only be called by the producer (ie Read()/Put()), not the consumer (Get()). +void cRingBufferLinear::GrowBuffer(void) +{ + size = min(size+size/2, maxsize); + growthresh = size<maxsize ? size/3 : maxsize+1; + dsyslog("Enlarging ring buffer \"%s\": %d bytes (trigger %d, thresh %d)", + description, size, growbuf, growthresh); + growbuf = 0; +} + int cRingBufferLinear::Read(int FileHandle, int Max) { + if (growbuf && head>=tail && size<maxsize) + GrowBuffer(); int Tail = tail; int diff = Tail - head; int free = (diff > 0) ? diff - 1 : Size() - head; @@ -219,6 +251,10 @@ int cRingBufferLinear::Read(int FileHandle, int Max) Count = safe_read(FileHandle, buffer + head, free); if (Count > 0) { int Head = head + Count; + if (Available()+Count >= growthresh) + growbuf = 2; + if (growbuf && head>=tail && size<maxsize) + GrowBuffer(); if (Head >= Size()) Head = margin; head = Head; @@ -245,6 +281,10 @@ int cRingBufferLinear::Read(int FileHandle, int Max) int cRingBufferLinear::Put(const uchar *Data, int Count) { if (Count > 0) { + if (Available()+Count >= growthresh) + growbuf = 3; + if (growbuf && head>=tail && size<maxsize) + GrowBuffer(); int Tail = tail; int rest = Size() - head; int diff = Tail - head; diff --git a/ringbuffer.h b/ringbuffer.h index dba0e61..3545520 100644 --- a/ringbuffer.h +++ b/ringbuffer.h @@ -18,11 +18,11 @@ private: cCondWait readyForPut, readyForGet; int putTimeout; int getTimeout; - int size; time_t lastOverflowReport; int overflowCount; int overflowBytes; protected: + int size; tThreadId getThreadTid; int maxFill;//XXX int lastPercent; @@ -59,7 +59,11 @@ private: int margin, head, tail; int gotten; uchar *buffer; + int growbuf; + int growthresh; + int maxsize; char *description; + void GrowBuffer(void); public: cRingBufferLinear(int Size, int Margin = 0, bool Statistics = false, const char *Description = NULL); ///< Creates a linear ring buffer.

4 13

Timers not starting
by Petri Helin 20 May '07

20 May '07

Hi, I have encountered a new problem which I have not seen before: I have missed timers without any obvious reason. All these timers were set to the same channel and this partivular channel differs from others in the sense that I have set the xmltv2vdr to update its epg. But I have also had successful timers on that channels so xmltv2vdr shoould not cause this problem. As I said, I have not found any obvious reason, but will still attach a bit of the log showing how the timer for the 15th episode of "Heroes" was set but never started to record. But in the mean time recordings on other channels started just fine. I am using vdr 1.5.2 patched with liemikuutio-, MainMenuHooks-, subtitles- and ttxtsub-patches. The version of the epgsearch-plugin is 0.9.21. Hopefully someone could help me out with this one... -Petri May 16 19:57:00 ... timer 23 (4 1957-2210 'Ep�miellytt�v� totuus') start May 16 19:57:00 ... record /video/Ep�miellytt�v�_totuus/2007-05-16.19.57.50.99.rec May 16 19:57:04 ... recording to '/video/Ep�miellytt�v�_totuus/2007-05-16.19.57.50.99.rec/001.vdr' May 16 19:57:04 ... recording thread started (pid=4767, tid=5034) ... May 16 21:27:01 ... timer 22 (2 2127-0030 'Jalkapallon UEFA-cup') start May 16 21:27:01 ... record /video/Jalkapallon_UEFA-cup/2007-05-16.21.27.50.99.rec May 16 21:27:01 ... recording to '/video/Jalkapallon_UEFA-cup/2007-05-16.21.27.50.99.rec/001.vdr' May 16 21:27:01 ... recording thread started (pid=4767, tid=6077) ... May 16 21:28:24 ... timer 1 (12 2257-2355 'Heroes: 15. jakso: Run!~Ke 16.05.2007-23:00') set to no event ... May 16 21:28:28 ... timer 1 (12 2257-2355 'Heroes: 15. jakso: Run!~Ke 16.05.2007-23:00') set to event Ke 16.05.2007 23:00-23:45 'Heroes: 15. jakso: Run!' ... May 16 21:30:24 ... stopping recording due to modification of channel 2 May 16 21:30:24 ... recording thread ended (pid=4767, tid=6077) May 16 21:30:24 ... timer 22 (2 2127-0030 'Jalkapallon UEFA-cup') stop May 16 21:30:25 ... timer 22 (2 2127-0030 'Jalkapallon UEFA-cup') start May 16 21:30:25 ... record /video/Jalkapallon_UEFA-cup/2007-05-16.21.27.50.99.rec May 16 21:30:25 ... ttxtsubs: Selected language not found, just recording first teletext pid found. May 16 21:30:25 ... recording to '/video/Jalkapallon_UEFA-cup/2007-05-16.21.27.50.99.rec/002.vdr' May 16 21:30:25 ... recording thread started (pid=4767, tid=6125) May 16 21:46:34 ... recording to '/video/Ep�miellytt�v�_totuus/2007-05-16.19.57.50.99.rec/002.vdr' ... May 16 22:10:00 ... recording thread ended (pid=4767, tid=5034) May 16 22:10:00 ... timer 23 (4 1957-2210 'Ep�miellytt�v� totuus') stop May 16 22:11:29 ... deleting timer 23 (4 1957-2210 'Ep�miellytt�v� totuus') ... May 16 22:31:43 ... stopping recording due to modification of channel 2 May 16 22:31:43 ... recording thread ended (pid=4767, tid=6125) May 16 22:31:43 ... timer 22 (2 2127-0030 'Jalkapallon UEFA-cup') stop May 16 22:31:43 ... timer 22 (2 2127-0030 'Jalkapallon UEFA-cup') start May 16 22:31:43 ... record /video/Jalkapallon_UEFA-cup/2007-05-16.21.27.50.99.rec May 16 22:31:44 ... recording to '/video/Jalkapallon_UEFA-cup/2007-05-16.21.27.50.99.rec/003.vdr' May 16 22:31:44 ... recording thread started (pid=4767, tid=6745) May 16 22:40:24 ... stopping recording due to modification of channel 2 May 16 22:40:24 ... recording thread ended (pid=4767, tid=6745) May 16 22:40:24 ... timer 22 (2 2127-0030 'Jalkapallon UEFA-cup') stop May 16 22:40:24 ... timer 22 (2 2127-0030 'Jalkapallon UEFA-cup') start May 16 22:40:24 ... record /video/Jalkapallon_UEFA-cup/2007-05-16.21.27.50.99.rec May 16 22:40:24 ... recording to '/video/Jalkapallon_UEFA-cup/2007-05-16.21.27.50.99.rec/004.vdr' May 16 22:40:24 ... recording thread started (pid=4767, tid=6842) ... May 16 23:39:28 ... recording to '/video/Jalkapallon_UEFA-cup/2007-05-16.21.27.50.99.rec/005.vdr' May 16 23:53:00 ... EPGSearch: search timer update started May 16 23:53:00 ... EPGSearch: search timer update finished May 16 23:56:04 ... deleting timer 1 (12 2257-2355 'Heroes: 15. jakso: Run!~Ke 16.05.2007-23:00')

3 6

broken audio on FF card
by Clemens Kirchgatterer 19 May '07

19 May '07

seams i have broken the audio chipset on my galaxy FF card. also getting audio from the spdif connectors did not work out nicly because there, the left channel is missing (no idea, how this is possible at all). i tried even with 2 different soundcards. playing pcm both channels work. so my question is, do i have to dump the card or is there a plugin, that can play video via the FF card and send audio to a soundcard? i thought about something like bitstream but for stereo (bitstream will not work, will it?). any tips, what i can do to rescue the FF card? :-) thx & best regards ... clemens

1 0

MPlayer plug-in..
by JJussi 19 May '07

19 May '07

Hi! (to everybody) I have "problem" with vdr-mplayer -plug-in... 1. It don't play files.. IF I start pure MPlayer it can play all video files what I have.. 2. some how plug-in have problem to see symbol links and (some of) files.. That number one is annoying... Where I can configure file extensions what it shows.. To select *.* so it's me who decides what I want to play.. And why it cannot play files what normal Mplayer can? What are parameters what are sent to mplayer when plug-in starts it? -- Jjussi

4 12

burn plugin for 1.4.7?
by Torgeir Veimo 18 May '07

18 May '07

Is there any updated vdr-burn plugin for vdr.1.4.7? I tried v 0.5 and the updated on v .009, and they both use the wrong signature for the Active() method. -- Torgeir Veimo torgeir(a)pobox.com

2 2

[ANNOUNCE] Cut-a-Lot 0.0.3
by Marius Heidenstecker 18 May '07

18 May '07

Hi everybody, I'm pleased to announce version 0.0.3 of my cut-a-lot-plugin. From the history: 2007-05-17: Version 0.0.3 - Added the ability to adjust PTS while cutting - Changed the menu label named "Commands" to "Cut-a-Lot" in order to avoid confusions with the original recording menu. (Suggested by FireFly@vdr-portal) From the readme: Adjust PTS: ----------- The adjustment of PTS (see http://www.vdr-wiki.de/wiki/index.php/PTS) can be switched on and off in the setup. Having selected "no" does not end in any differences to the original Multi-cut-process. Is "to first I-frame" or "to zero" selected, all PTS values are going to be adjusted. The PTS of the first I-frame is then either set to its old value or to zero. All following PTS' will be adjusted relativly. What was the motivation? I joined two recordings and generated a new index-file with the genindex-utility. Watching the new recording worked very good, but burning it with ProjectX as the demuxer ends in an incomplete recording. The log-file has a message containing "big PTS difference". I did not find any setup-options in order to solve that problem, so I did it on my own adapting the cut-a-lot-plugin. So how to proceed if "big PTS difference" occurs in a recording during the burn process? At first, one has to remove all cutting marks but the first one, which has to be on the position 0:00:00.01. Then one has to run cut-a-lot in the Mulit-cut mode, having "Adjust PTS" in the setup point to "to first I-frame" or "to zero". Afterwards the cut recording should work with ProjectX without any error. I use it with vdr-version 1.4.4 with big patch applied. I cannot say anything about compiling and running on other environments. You can download it from the vdr-forum: http://vdr-portal.de/board/thread.php?threadid=64354 I am open for any tips, bugs or optimizations. DMH

3 7

DVB-T frontend time-out
by Dominique Dumont 17 May '07

17 May '07

Hello I'm trying to set up a WinTv Nova-T usb box with vdr (along with my regular NOVA-CI-S PCI card). This set up is working fine with Kaffeine, but vdr is unable to tune to a TNT channel. My channel.conf contains the following channels (got with scan -c while kaffeine was running): France 2:4294967:D12M64B8T8G32Y0:T:27500:120:130:0:0:257:0:0:0 France 4:4294967:D12M64B8T8G32Y0:T:27500:420:430:0:0:259:0:0:0 France 5:4294967:D12M64B8T8G32Y0:T:27500:320:330:0:0:260:0:0:0 ARTE:4294967:D12M64B8T8G32Y0:T:27500:520:530,531:0:0:261:0:0:0 LCP:4294967:D12M64B8T8G32Y0:T:27500:620:630:0:0:262:0:0:0 Anytime I try to tune to a DVB-T channel I get: vdr: [15337] frontend 0 timed out while tuning to channel 47, tp 4294 If I stop vdr, start kaffeine, I can receive the dvb-t channels correctly (no need to unplug/plug the dvb usb device as mentioned elsewhere) I'm using vdr 1.4.5-2.ds with xine plugin. Can anyone help me on this topic ? Thanks

1 1

softdevice crash
by aironet＠tigercomp.ro 16 May '07

16 May '07

Hi there, My config: - Asus M2NPV-VM (Geforce6150), Hauppauge nexus-s. - suse 10.0, kde, vdr-1.4.4. I recently purchased a 32" LCD-TV, and I would like to set up vdr-softdevice, to connect vdrbox via D-SUB or DVI to the TV set. I compiled ffmpeg-0.4.9-cvs and vdr-softdevice-0.4.0 without any errors. Probing vdr with softdevice: tigervdr:/opt/tigervdr/vdr-1.4.4 # ./vdr -c /vdrconf -P 'softdevice -vo xv:' [softdevice] processing args [softdevice] argv [0] = softdevice [softdevice] argv [1] = -vo vo_argv: xv: [softdevice] initializing Plugin [softdevice] Initializing Video Out [softdevice] ffmpeg build(3344640) [XvVideoOut]: Xinerama Screen 0: 0,0 1360x768 [XvVideoOut]: Xinerama Screen 1: 1360,0 720x480 [XvVideoOut]: osd_image shmid = 2949127 [XvVideoOut]: got osd_image: width 2080 height 768, bytes per line 4160 [XvVideoOut]: max area size 2046 x 2046 [XvVideoOut]: using area size 736 x 576 [softdevice] Subplugin successfully opend [softdevice] Video Out seems to be OK [softdevice] Initializing Audio Out [softdevice] Audio out seems to be OK [softdevice] A/V devices initialized, now initializing MPEG2 Decoder Segmentation fault I tried different ffmpeg and softdevice versions, with same result. Any hint? Thanks a lot, Istvan

4 9

BUG: race condition triggered in cReceiver due to incorrect use by femon
by Reinhard Nissl 16 May '07

16 May '07

Hi, I've just got a pure virtual function call in cDevice::Action() for receiver[i]->Receive(b, TS_SIZE); It has happened while closing femon's OSD: (gdb) bt #0 0xffffe410 in __kernel_vsyscall () #1 0xb7f2fc4e in __lll_mutex_lock_wait () from /lib/libpthread.so.0 #2 0xb7f2ba3c in _L_mutex_lock_88 () from /lib/libpthread.so.0 #3 0xb7f2b42d in pthread_mutex_lock () from /lib/libpthread.so.0 #4 0x08124281 in cMutex::Lock (this=0xb762c48) at thread.c:190 #5 0x080a7cdc in cThread::Lock (this=0xb762c38) at thread.h:91 #6 0x080a5548 in cDevice::Detach (this=0xb762c38, Receiver=0xb099ab0) at device.c:1298 #7 0x080effb9 in cReceiver::Detach (this=0xb099ab0) at receiver.c:60 #8 0x080f0090 in ~cReceiver (this=0xb099ab0) at receiver.c:43 #9 0xb799ac29 in cFemonReceiver::~cFemonReceiver () from /soft/vdr-1.4.6/lib/vdr/libvdr-femon.so.1.4.5 #10 0xb7998b05 in cFemonOsd::~cFemonOsd () from /soft/vdr-1.4.6/lib/vdr/libvdr-femon.so.1.4.5 #11 0x08131da7 in main (argc=20, argv=0xbf90e914) at vdr.c:885 #12 0xb7ce6f9c in __libc_start_main () from /lib/libc.so.6 #13 0x08091111 in _start () (gdb) cReceiver::~cReceiver() calls Detach(), but at that time, it is simply too late as the virtual method table entry for Receive() has already been restored to 0. I suggest to call Detach() from cFemonReceiver::~cFemonReceiver() to fix this issue. Furthermore I suggest to add some debug output to ~cReceiver() in the case where the receiver is still attached. I've been using femon for quite some time now and it was the first time, that VDR dumped a core regarding a pure virtual function call. Such a debug output would have triggered way more early. Bye. -- Dipl.-Inform. (FH) Reinhard Nissl mailto:rnissl@gmx.de

3 2

Bug/SegFault in vdr-1.4.6
by Patrick Cernko 16 May '07

16 May '07

Hi List, I think I just found a bug/segfault in vdr's timer handling. Could someone please verify that: 1. start with empty timers list 2. schedule some timers (at least 2) 3. Go to the timers menu and "deactivate" all but the last. 4. deactivate the last timer -> CRASH Also happens when selecting all timers in vdradmin's timer menu and pressing "inactivate". To fix the resulting Crash-loop, remove the timers.conf file. Is this happening only to me or can someone reproduce it? So long, -- Patrick Cernko | mailto:errror@errror.org | http://www.errror.org "Wo wir schon bei den Drogen sind kommen wir auch gleich zum Hip-Hip." (Jimi Blue Ochsenknecht, Echo-Verleihung 2007)

4 10

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

vdr