vdr

vdr@linuxtv.org

2 participants
6731 discussions

[PATCH] UnbufferedFile improvements v3
by Artur Skawina 21 Nov '05

21 Nov '05

Jon Burgess wrote: > > This reminds me of a recent LKML thread. It noted that under some > circumstances the kernel seems to forget to flush the dirty data. It > didn't come to any particular conclusion but maybe there is a problem in > the kernel. It might be an interesting read for you... Hmm, i don't remember exactly how flushing happened before the fdatasyncs appeared; it's possible that that thread could be relevant. So.. here's a version of the patch which lets you choose the strategy at runtime. Simply set the menuitem Setup->Recording->WriteStrategy to 0, 1 or 2 to try them. 0 - STREAM 1 - NORMAL (no fadvise and no fdatasync) 2 - BURST (fadvise plus fdatasync) it's a quick hack, it compiles, but i haven't tested it at all yet... I will probably not be to play with this more in the next days, but maybe somebody else wants to test it... artur --- vdr-1.3.36.org/config.c 2005-09-09 17:08:59.000000000 +0200 +++ vdr-1.3.36/config.c 2005-11-21 22:17:55.000000000 +0100 @@ -453,6 +453,7 @@ bool cSetup::Parse(const char *Name, con else if (!strcasecmp(Name, "UseSmallFont")) UseSmallFont = atoi(Value); else if (!strcasecmp(Name, "MaxVideoFileSize")) MaxVideoFileSize = atoi(Value); else if (!strcasecmp(Name, "SplitEditedFiles")) SplitEditedFiles = atoi(Value); + else if (!strcasecmp(Name, "WriteStrategy")) WriteStrategy = atoi(Value); else if (!strcasecmp(Name, "MinEventTimeout")) MinEventTimeout = atoi(Value); else if (!strcasecmp(Name, "MinUserInactivity")) MinUserInactivity = atoi(Value); else if (!strcasecmp(Name, "MultiSpeedMode")) MultiSpeedMode = atoi(Value); @@ -518,6 +519,7 @@ bool cSetup::Save(void) Store("UseSmallFont", UseSmallFont); Store("MaxVideoFileSize", MaxVideoFileSize); Store("SplitEditedFiles", SplitEditedFiles); + Store("WriteStrategy", WriteStrategy); Store("MinEventTimeout", MinEventTimeout); Store("MinUserInactivity", MinUserInactivity); Store("MultiSpeedMode", MultiSpeedMode); --- vdr-1.3.36.org/config.h 2005-11-04 16:55:05.000000000 +0100 +++ vdr-1.3.36/config.h 2005-11-21 21:57:52.000000000 +0100 @@ -249,6 +249,7 @@ public: int UseSmallFont; int MaxVideoFileSize; int SplitEditedFiles; + int WriteStrategy; int MinEventTimeout, MinUserInactivity; int MultiSpeedMode; int ShowReplayMode; --- vdr-1.3.36.org/cutter.c 2005-10-31 13:26:44.000000000 +0100 +++ vdr-1.3.36/cutter.c 2005-11-18 03:20:50.000000000 +0100 @@ -66,6 +66,7 @@ void cCuttingThread::Action(void) toFile = toFileName->Open(); if (!fromFile || !toFile) return; + fromFile->setreadahead(MEGABYTE(10)); int Index = Mark->position; Mark = fromMarks.Next(Mark); int FileSize = 0; @@ -90,6 +91,7 @@ void cCuttingThread::Action(void) if (fromIndex->Get(Index++, &FileNumber, &FileOffset, &PictureType, &Length)) { if (FileNumber != CurrentFileNumber) { fromFile = fromFileName->SetOffset(FileNumber, FileOffset); + fromFile->setreadahead(MEGABYTE(10)); CurrentFileNumber = FileNumber; } if (fromFile) { --- vdr-1.3.36.org/menu.c 2005-11-05 18:29:22.000000000 +0100 +++ vdr-1.3.36/menu.c 2005-11-21 22:14:38.000000000 +0100 @@ -2270,6 +2270,7 @@ cMenuSetupRecord::cMenuSetupRecord(void) Add(new cMenuEditIntItem( tr("Setup.Recording$Instant rec. time (min)"), &data.InstantRecordTime, 1, MAXINSTANTRECTIME)); Add(new cMenuEditIntItem( tr("Setup.Recording$Max. video file size (MB)"), &data.MaxVideoFileSize, MINVIDEOFILESIZE, MAXVIDEOFILESIZE)); Add(new cMenuEditBoolItem(tr("Setup.Recording$Split edited files"), &data.SplitEditedFiles)); + Add(new cMenuEditIntItem( tr("Setup.Recording$Write strategy"), &data.WriteStrategy, 0, 2)); } // --- cMenuSetupReplay ------------------------------------------------------ --- vdr-1.3.36.org/tools.c 2005-11-04 17:33:18.000000000 +0100 +++ vdr-1.3.36/tools.c 2005-11-21 22:36:11.000000000 +0100 @@ -7,6 +7,7 @@ * $Id: tools.c 1.103 2005/11/04 16:33:18 kls Exp $ */ +#include "config.h" #include "tools.h" #include <ctype.h> #include <dirent.h> @@ -851,8 +852,7 @@ bool cSafeFile::Close(void) // --- cUnbufferedFile ------------------------------------------------------- -#define READ_AHEAD MEGABYTE(2) -#define WRITE_BUFFER MEGABYTE(10) +#define WRITE_BUFFER KILOBYTE(800) cUnbufferedFile::cUnbufferedFile(void) { @@ -869,7 +869,16 @@ int cUnbufferedFile::Open(const char *Fi Close(); fd = open(FileName, Flags, Mode); begin = end = ahead = -1; + readahead = 16*1024; + pendingreadahead = 0; written = 0; + totwritten = 0; + if (fd >= 0) { + // we really mean POSIX_FADV_SEQUENTIAL, but we do our own readahead + // so turn off the kernel one. + if (Setup.WriteStrategy!=1) + posix_fadvise(fd, 0, 0, POSIX_FADV_RANDOM); + } return fd; } @@ -882,8 +891,8 @@ int cUnbufferedFile::Close(void) //dsyslog("close buffer: %d (flush: %d bytes, %ld-%ld)", fd, written, begin, end); if (written) fdatasync(fd); - posix_fadvise(fd, begin, end - begin, POSIX_FADV_DONTNEED); } + posix_fadvise(fd, 0, 0, POSIX_FADV_DONTNEED); begin = end = ahead = -1; written = 0; } @@ -899,35 +908,89 @@ off_t cUnbufferedFile::Seek(off_t Offset return -1; } +// when replaying and going eg FF->PLAY the position jumps back 2..8M +// hence we might not want to drop that data at once. +// Ignoring for now to avoid making this even more complex, but we could +// at least try to handle the common cases +// (PLAY->FF->PLAY, small jumps, moving editing marks etc) + ssize_t cUnbufferedFile::Read(void *Data, size_t Size) { if (fd >= 0) { off_t pos = lseek(fd, 0, SEEK_CUR); - // jump forward - adjust end position - if (pos > end) - end = pos; - // after adjusting end - don't clear more than previously requested - if (end > ahead) - end = ahead; - // jump backward - drop read ahead of previous run - if (pos < begin) - end = ahead; - if (begin >= 0 && end > begin) - posix_fadvise(fd, begin - KILOBYTE(200), end - begin + KILOBYTE(200), POSIX_FADV_DONTNEED);//XXX macros/parameters??? - begin = pos; + off_t jumped = pos-end; // nonzero means we're not at the last offset - some kind of jump happened. + if (jumped) { + pendingreadahead += ahead-end+KILOBYTE(64); + // jumped forward? - treat as if we did read all the way to current pos. + if (pos > end) { + end = pos; + // but clamp at ahead so we don't clear more than previously requested. + // (would be mostly harmless anyway, unless we got more than one reader of this file) + // add a little extra readahead, JIC the kernel prefethed more than we requested. + if (end > (ahead+KILOBYTE(128))) + end = ahead+KILOBYTE(128); + } + // jumped backward? - drop both last read _and_ read-ahead + if (pos < begin) + end = ahead+KILOBYTE(128); + // jumped backward, but still inside prev read window? - pretend we read less. + if ((pos >= begin) && (pos < end)) + end = pos; + } + ssize_t bytesRead = safe_read(fd, Data, Size); + + // now drop all data accesed during _previous_ Read(). + if (Setup.WriteStrategy!=1 && begin >= 0 && end > begin) + posix_fadvise(fd, begin, end-begin, POSIX_FADV_DONTNEED); + + begin = pos; if (bytesRead > 0) { pos += bytesRead; - end = pos; // this seems to trigger a non blocking read - this // may or may not have been finished when we will be called next time. // If it is not finished we can't release the not yet filled buffers. // So this is commented out till we find a better solution. - //posix_fadvise(fd, pos, READ_AHEAD, POSIX_FADV_WILLNEED); - ahead = pos + READ_AHEAD; + + // Hmm, it's obviously harmless if we're actually going to read the data + // -- the whole point of read-ahead is to start the IO early... + // The comment above applies only when we jump somewhere else _before_ the + // IO started here finishes. How common would that be? Could be handled eg + // by posix_fadvise(fd, 0, 0, POSIX_FADV_DONTNEED) called some time after + // we detect a jump. Ignoring this for now. /AS + + // Ugh, it seems to cause some "leaks" at every jump... Either the + // brute force approach mentioned above should work (it's not like this is + // much different than O_DIRECT) or keeping notes about the ahead reads and + // flushing them after some time. the latter seems overkill though, trying + // the former... + + //syslog(LOG_DEBUG,"jump: %06ld ra: %06ld size: %ld", jumped, (long)readahead, (long)Size); + + // no jump? also permit small jump still inside readahead window (FF). + if (Setup.WriteStrategy!=1 && jumped>=0 && jumped<=(off_t)readahead) { + if ( readahead <= Size*4 ) // automagically tune readahead size. + readahead = Size*4; + posix_fadvise(fd, pos, readahead, POSIX_FADV_WILLNEED); + ahead = pos + readahead; + } + else { + // jumped - we really don't want any readahead now. otherwise + // eg fast-rewind gets in trouble. + ahead = pos; + + // flush it all; mostly to get rid of nonflushed readahead coming + // from _previous_ jumps. ratelimited. + // the accounting is _very_ unaccurate, i've seen ~50M get flushed + // when the limit was set to 4M. As long as this triggers after + // _some_ jumps we should be ok though. + if (Setup.WriteStrategy!=1 && pendingreadahead>MEGABYTE(2)) { + posix_fadvise(fd, 0, 0, POSIX_FADV_DONTNEED); + pendingreadahead = 0; + } + } } - else - end = pos; + end = pos; return bytesRead; } return -1; @@ -950,11 +1013,21 @@ ssize_t cUnbufferedFile::Write(const voi end = pos + bytesWritten; if (written > WRITE_BUFFER) { //dsyslog("flush buffer: %d (%d bytes, %ld-%ld)", fd, written, begin, end); - fdatasync(fd); - if (begin >= 0 && end > begin) - posix_fadvise(fd, begin, end - begin, POSIX_FADV_DONTNEED); + totwritten += written; + if (Setup.WriteStrategy!=1 && begin >= 0 && end > begin) { + off_t headdrop = max((long)begin&~4095,(long)WRITE_BUFFER*2); + posix_fadvise(fd, (begin&~4095)-headdrop, end - begin + headdrop, POSIX_FADV_DONTNEED); + } begin = end = -1; written = 0; + // the above fadvise() works when recording, but seems to leave cached + // data around when writing at a high rate (eg cutting). Hence... + if (Setup.WriteStrategy!=1 && totwritten>MEGABYTE(20)) { + if (Setup.WriteStrategy==2) + fdatasync(fd); + posix_fadvise(fd, 0, 0, POSIX_FADV_DONTNEED); + totwritten = 0; + } } } return bytesWritten; --- vdr-1.3.36.org/tools.h 2005-11-05 11:54:39.000000000 +0100 +++ vdr-1.3.36/tools.h 2005-11-18 03:13:31.000000000 +0100 @@ -209,6 +209,9 @@ private: off_t end; off_t ahead; ssize_t written; + ssize_t totwritten; + size_t readahead; + size_t pendingreadahead; public: cUnbufferedFile(void); ~cUnbufferedFile(); @@ -218,6 +221,7 @@ public: ssize_t Read(void *Data, size_t Size); ssize_t Write(const void *Data, size_t Size); static cUnbufferedFile *Create(const char *FileName, int Flags, mode_t Mode = DEFFILEMODE); + void setreadahead(size_t ra) { readahead = ra; }; }; class cLockFile {

1 0

OT: "Hape trifft - 15.10."
by Seeberg, Ingo 21 Nov '05

21 Nov '05

Hello list, I'd like to know, wether somebody has recorded the interview from Hape Kerkeling with David Copperfield. If somebody has: what was the favorite german word of David Copperfield? It's some kind of quiz and it would be great to know ;-) Sorry for disturbance, Ingo Seeberg

2 1

[ANNOUNCE] vdr-autosort-0.0.7
by CopyPoint 21 Nov '05

21 Nov '05

- S E V E N - http://www.copypointburscheid.de/linux/vdr-autosort-0.0.7.tgz ------------------------------------------------------------------------------------------------------------------------------ 2005-11-21: Version 0.0.7 - Corrected order of 'SubSection'-groups. The 'digits' group is first now. - Implemented option 'FixedPos' to assign a fixed channel number to a group. - Adapted a patch to get rid of some compiler warnings (thanks to Frank Scherthan for providing it) - Added another sorting method witch ignores spaces and special chars and orders numbers correctly. You can switch back to the old lexically sortion it in Setup Menu. - Added detailed description about how AutoSort does it's job to reduce users confusion. - Raised default OSD-message level to 2. - Fix a bug who moved a channel after the group it should be put in. ------------------------------------------------------------------------------------------------------------------------------ i hope you can enjoy it Thorsten =============================================================== Project's homepage: http://www.copypointburscheid.de/linux/autosort.htm Latest version: http://www.copypointburscheid.de/linux/vdr-autosort-0.0.7.tgz ===============================================================

1 0

RE: [vdr] Problem with occasional key repeats - Privat
by christian jacobsen 21 Nov '05

21 Nov '05

Hallo, > This problem is quite annoying one. Time to time I get douple key > presses from remote. There is delay before repeat so it is > not that. I'm > not sure what is causing this but I suspect lirc. > > Any idea what is the cause and how to fix this? > > I have One-for-all remote (2 devices supported) and self made > IR-receiver. > > Setup: > vdr 1.3.35 (same problem with 1.3.27) + patches + plugins > kernel 2.6.12 > lirc from CVS (not sure about exact date/version - not in docs) Try changing KEYPRESSDELAY in lirc.c to a higher value. Greetings Christian Jacobsen

1 0

@Klaus: usage of alternative device nodes possible?
by Alfred Zastrow 20 Nov '05

20 Nov '05

Hello Klaus, a miniudev created dev-structure of a 2-card system looks like this: ----------- snip ---------------- #cd /dev #ls -l [...] crwx------ 1 root root 212, 1 Nov 20 06:43 dvb0.audio0 crwx------ 1 root root 212, 6 Nov 20 06:43 dvb0.ca0 crwx------ 1 root root 212, 4 Nov 20 06:43 dvb0.demux0 crwx------ 1 root root 212, 5 Nov 20 06:43 dvb0.dvr0 crwx------ 1 root root 212, 3 Nov 20 06:43 dvb0.frontend0 crwx------ 1 root root 212, 7 Nov 20 06:43 dvb0.net0 crwx------ 1 root root 212, 8 Nov 20 06:43 dvb0.osd0 crwx------ 1 root root 212, 0 Nov 20 06:43 dvb0.video0 crwx------ 1 root root 212, 65 Nov 20 06:43 dvb1.audio0 crwx------ 1 root root 212, 70 Nov 20 06:43 dvb1.ca0 crwx------ 1 root root 212, 68 Nov 20 06:43 dvb1.demux0 crwx------ 1 root root 212, 69 Nov 20 06:43 dvb1.dvr0 crwx------ 1 root root 212, 67 Nov 20 06:43 dvb1.frontend0 crwx------ 1 root root 212, 71 Nov 20 06:43 dvb1.net0 crwx------ 1 root root 212, 72 Nov 20 06:43 dvb1.osd0 crwx------ 1 root root 212, 64 Nov 20 06:43 dvb1.video0 crw-rw-rw- 1 root root 1, 7 Nov 20 06:43 full brw------- 1 root root 3, 0 Nov 20 06:43 hda brw------- 1 root root 3, 1 Nov 20 06:43 hda1 [...] ----------- snap ---------------- Would it be possible, that vdr looks for and uses this device nodes directly without searching for a /dev/dvb/adapter.. directory structure? Best regards Alfred

5 5

[ANNOUNCE] vdr-image-0.2.4
by Andreas Brachold 20 Nov '05

20 Nov '05

Hi, here are update of vdr-image plugin, for build again newer ffmpeg(-cvs) release. With this release now for compiled are at the least VDR 1.3.28 required. Changes for release Version 0.2.4 ================================= - Deny VDR-EITScanner on active Live Audio - Add plugin options to specify directory of configuration data - add FFMDIR to liboutput/Makefile, for build again ffmpeg directory - fix scripts/magickplugin.sh: better resolution retrieval - add option for border of underscan - rotate pictures now in several 90° steps - add alternative script (scripts/magickplugin.sh) for image converting with imagemagick - adjust encoding parameter for new ffmpeg-releases, downwards compatible - remove linking with dlfcn at runtime of libavcodec.so, now are linked at compiled time - and a some more... Thanks to Tobias Grimm, Tom Günther, and kc_captain-at-vdr-portal to provide some solutions. What is it : ============ This is a plugin for vdr and allows the display of digital images, like jpeg, tiff, png, bmp and some more, on the TV screen, using the DVB out device from vdr. Depends: ======== netpbm (or now as alternative imagemagick) ffmpeg Link : ====== Homepage : http://vdr-image.berlios.de/ Download : http://download.berlios.de/vdr-image/vdr-image-0.2.4.tar.gz Cu, Andreas

2 2

index.vdr misses pictures
by Werner 20 Nov '05

20 Nov '05

Hello, in recent recording from premiere i saw that not all pictures in the data stream are indexed in index.vdr. The displayed movie lenghts are slightly to short and the cutmarks in marks.vdr are wrong. I use marks.vdr in an external program. The resulting cutted movies are sometimes about 1-2 minutes too short. This does not affect normal vdr users too much because vdr cutted movies have the right len. Im not an mpeg expert, so only some speculations: It looks that every index.vdr entry points to an "packet start code" (0x000001). Vdr assumes that every packet has mostly one picture start code. The difference i saw between old recordings and new recordings is that in new recordings are sometimes two picture start codes in a packet. The second one is dropped by vdr. I have no idea of how to fix this assuming that vdr can only resume on a packet start code. Anyone any idea? /Werner

2 4

Problem with occasional key repeats
by Pasi Juppo 20 Nov '05

20 Nov '05

Hi, This problem is quite annoying one. Time to time I get douple key presses from remote. There is delay before repeat so it is not that. I'm not sure what is causing this but I suspect lirc. Any idea what is the cause and how to fix this? I have One-for-all remote (2 devices supported) and self made IR-receiver. Setup: vdr 1.3.35 (same problem with 1.3.27) + patches + plugins kernel 2.6.12 lirc from CVS (not sure about exact date/version - not in docs) Br, Pasi

1 0

Bug #1: Delayed live TV broadcast showing
by Pasi Juppo 20 Nov '05

20 Nov '05

Each bug as a separate message as requested. Here are few bugs that I have found so far from vdr 1.3.27 with patches: -vdr-1.3.27-enAIO-2.4.diff -vdr-1.3.27-subtitles-0.3.7-and-ttxtsubs-0.0.5.diff -vdr-1.3.27-finnish.diff and plugins (and patches when needed): -vdr-femon-0.9.0 -vdr-mp3-0.9.12 -vdr-osdteletext-0.5 + vdr-osdteletext-0.5-finnish.diff patch -vdr-subtitles-0.3.7 -vdr-text2skin-1.1 (cvs) -vdr-ttxtsubs-0.0.5 + vdr-ttxtsubs-0.0.5-premium-edition.diff patch -vdr-tvonscreen-0.7.0 + vdr-tvonscreen-0.7.0-1.3.diff patch -vdr-timeline-0.9.0 + vdr-1.3.25-timeline-0.9.0.diff patch -vdr-sysinfo-0.0.4a DVB drivers are from kernel 2.6.12.1. DVB-C card is Technotrend's FF card (v1.5 iirc). NTPL is disabled (export LD_ASSUME_KERNEL=2.4.1). Bug: VDR: Delayed live TV broadcast showing Steps to how to reveal this: 1. Replay a recording 2. Stop replaying (shows live TV broadcast almost immediately) 3. Resume replay (press play) 4. Stop replaying 5. Resume replaying 6. Stop replaying => live TV shows after around 8s

2 5

Bug #10: Replay stops and TV channel changes
by Pasi Juppo 20 Nov '05

20 Nov '05

Setup: -vdr-1.3.27-enAIO-2.4.diff -vdr-1.3.27-subtitles-0.3.7-and-ttxtsubs-0.0.5.diff -vdr-1.3.27-finnish.diff and plugins (and patches when needed): -vdr-femon-0.9.0 -vdr-mp3-0.9.12 -vdr-osdteletext-0.5 + vdr-osdteletext-0.5-finnish.diff patch -vdr-subtitles-0.3.7 -vdr-text2skin-1.1 (cvs) -vdr-ttxtsubs-0.0.5 + vdr-ttxtsubs-0.0.5-premium-edition.diff patch -vdr-tvonscreen-0.7.0 + vdr-tvonscreen-0.7.0-1.3.diff patch -vdr-timeline-0.9.0 + vdr-1.3.25-timeline-0.9.0.diff patch -vdr-sysinfo-0.0.4a DVB drivers are from kernel 2.6.12.1. DVB-C card is Technotrend's FF card (v1.5 iirc). NTPL is disabled (export LD_ASSUME_KERNEL=2.4.1). Bug: VDR: Replay stops and TV channel changes -occasionally at the beginning of the replaying of a recording VDR stops replaying and changes to first channel of the channel list (despite what channels was being viewed before replaying) VDR seems to work OK otherwise. Pasi

2 2

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

vdr