In case anyone is having trouble, here's an attached patch of v3 for vdr-1.5.2.
diff -ruN vdr-1.5.2-orig/dvbdevice.c vdr-1.5.2/dvbdevice.c
--- vdr-1.5.2-orig/dvbdevice.c	2007-05-14 14:58:29.000000000 -0700
+++ vdr-1.5.2/dvbdevice.c	2007-05-14 15:22:50.000000000 -0700
@@ -1172,7 +1172,7 @@
   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 -ruN vdr-1.5.2-orig/recorder.c vdr-1.5.2/recorder.c
--- vdr-1.5.2-orig/recorder.c	2007-05-14 14:58:29.000000000 -0700
+++ vdr-1.5.2/recorder.c	2007-05-14 15:27:12.000000000 -0700
@@ -176,8 +176,22 @@
            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 -ruN vdr-1.5.2-orig/remux.c vdr-1.5.2/remux.c
--- vdr-1.5.2-orig/remux.c	2007-05-14 14:58:29.000000000 -0700
+++ vdr-1.5.2/remux.c	2007-05-14 15:27:45.000000000 -0700
@@ -1851,7 +1851,7 @@
 
 // --- 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 -ruN vdr-1.5.2-orig/ringbuffer.c vdr-1.5.2/ringbuffer.c
--- vdr-1.5.2-orig/ringbuffer.c	2007-05-14 14:58:29.000000000 -0700
+++ vdr-1.5.2/ringbuffer.c	2007-05-14 15:33:18.000000000 -0700
@@ -151,13 +151,31 @@
   }
 #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,7 @@
 #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 +224,20 @@
   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 +250,10 @@
      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 +280,10 @@
 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 -ruN vdr-1.5.2-orig/ringbuffer.h vdr-1.5.2/ringbuffer.h
--- vdr-1.5.2-orig/ringbuffer.h	2007-05-14 14:58:29.000000000 -0700
+++ vdr-1.5.2/ringbuffer.h	2007-05-14 15:34:46.000000000 -0700
@@ -18,11 +18,11 @@
   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 @@
   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.
_______________________________________________
vdr mailing list
vdr@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/vdr

Reply via email to