Now the ringbuffer, well, rings.

git-svn-id: http://svn.mythtv.org/svn/trunk@9 7dbf422c-18fa-0310-86e9-fd20926502f2

Author: Isaac Richards

mythtv/libs/libmythtv/Makefile

@@ -44,10 +44,10 @@ tv: $(TVOBJ)
 	@rm -f tv
 	$(CXXLINK) $(TVOBJ) $(TVLDF)
 
-install: nuvrec nuvplay 
-	 strip nuvrec nuvplay 
+install: nuvrec nuvplay tv
+	 strip nuvrec nuvplay tv
 	 install -m 755 nuvrec nuvplay /usr/local/bin
 
 clean:	
-	rm -f *.o nuvplay nuvrec
+	rm -f *.o nuvplay nuvrec tv
 	$(DO_MAKE)

mythtv/libs/libmythtv/RingBuffer.cpp

@@ -28,14 +28,17 @@ RingBuffer::RingBuffer(const char *lfilename, long long size)
 {
     normalfile = false;
     filename = lfilename;
-
+    filesize = size;
+    
     fd = -1; fd2 = -1;
 
     fd = open(filename.c_str(), O_WRONLY|O_CREAT|O_LARGEFILE, 0644);
     fd2 = open(filename.c_str(), O_RDONLY|O_LARGEFILE);
 
     writestart = writepos = 0;
     readstart = readpos = 0;
+
+    wrapcount = 0;
 }
 
 RingBuffer::~RingBuffer(void)
@@ -62,10 +65,30 @@ int RingBuffer::Read(void *buf, int count)
     }
     else
     {
-        while (readpos + count >= writepos)
+        while (readpos + count >= writepos + wrapcount * filesize)
+	{
             usleep(5);
-        ret = read(fd2, buf, count);
-        readpos += ret;
+	}
+
+	if (readpos + count > filesize)
+        {
+	    int toread = filesize - readpos;
+
+	    ret = read(fd2, buf, toread);
+	    
+	    int left = count - toread;
+	    lseek(fd2, 0, SEEK_SET);
+
+	    ret = read(fd2, (char *)buf + toread, left);
+	    ret += toread;
+
+	    readpos = left;
+	}
+	else
+        {
+            ret = read(fd2, buf, count);
+            readpos += ret;
+        }
     }
     return ret;
 }
@@ -87,9 +110,27 @@ int RingBuffer::Write(const void *buf, int count)
     }
     else
     {
-        ret = write(fd, buf, count);
-        writepos += ret;
+        if (writepos + count > filesize)
+        {
+	    int towrite = filesize - writepos;
+	    ret = write(fd, buf, towrite);
+
+	    int left = count - towrite;
+	    lseek(fd, 0, SEEK_SET);
+
+	    ret = write(fd, (char *)buf + towrite, left);
+	    writepos = left;
+
+	    ret += towrite;
+	    wrapcount++;
+        }
+	else
+	{
+            ret = write(fd, buf, count);
+            writepos += ret;
+	}
     }
+
     return ret;
 }
 
@@ -103,6 +144,7 @@ long long RingBuffer::Seek(long long pos, int whence)
     else
     {
         ret = lseek(fd2, pos, whence);
+	readpos = pos;
     }
     return ret;
 }

mythtv/libs/libmythtv/RingBuffer.h

@@ -33,6 +33,10 @@ class RingBuffer
 
     long long readpos;
     long long readstart;
+
+    long long filesize;
+
+    long long wrapcount;
 };
 
 #endif

mythtv/libs/libmythtv/tv.cpp

@@ -30,7 +30,7 @@ int main(int argc, char *argv[])
 {
   pthread_t encode, decode;
 
-  RingBuffer *rbuffer = new RingBuffer("ringbuf.nuv", 1024 * 1024 * 5);
+  RingBuffer *rbuffer = new RingBuffer("ringbuf.nuv", 1024 * 1024 * 10);
 
   NuppelVideoRecorder *nvr = new NuppelVideoRecorder();
   nvr->SetRingBuffer(rbuffer);
@@ -48,6 +48,7 @@ int main(int argc, char *argv[])
       usleep(50);
 
   usleep(800000);
+
   pthread_create(&decode, NULL, SpawnDecode, nvp);
 
   while (!nvp->IsPlaying())

mythtv/libs/libmythtv/videoout_xv.cpp

@@ -253,7 +253,7 @@ char *XJ_init(int width, int height, char *window_name, char *icon_name)
 
   XJ_started=1;
 
-  XJ_toggleFullscreen();
+  //XJ_toggleFullscreen();
 
   return(sbuf);
 }

mythtv/programs/mythtv/Makefile

@@ -44,10 +44,10 @@ tv: $(TVOBJ)
 	@rm -f tv
 	$(CXXLINK) $(TVOBJ) $(TVLDF)
 
-install: nuvrec nuvplay 
-	 strip nuvrec nuvplay 
+install: nuvrec nuvplay tv
+	 strip nuvrec nuvplay tv
 	 install -m 755 nuvrec nuvplay /usr/local/bin
 
 clean:	
-	rm -f *.o nuvplay nuvrec
+	rm -f *.o nuvplay nuvrec tv
 	$(DO_MAKE)