summaryrefslogtreecommitdiff
path: root/ringbuffer.h
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2001-08-05 12:23:24 +0200
committerKlaus Schmidinger <vdr@tvdr.de>2001-08-05 12:23:24 +0200
commitc2ed9b5daf19b86823b27a06799d7d43d476f654 (patch)
treee7c24b75e4cd2b181ebc9e88ad22bb888960c39d /ringbuffer.h
parent614113cdcb1ebb176891664426e9c0cc2bb63c9d (diff)
downloadvdr-c2ed9b5daf19b86823b27a06799d7d43d476f654.tar.gz
vdr-c2ed9b5daf19b86823b27a06799d7d43d476f654.tar.bz2
New ringbuffer for frames
Diffstat (limited to 'ringbuffer.h')
-rw-r--r--ringbuffer.h85
1 files changed, 70 insertions, 15 deletions
diff --git a/ringbuffer.h b/ringbuffer.h
index 2121332b..f61d9e04 100644
--- a/ringbuffer.h
+++ b/ringbuffer.h
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: ringbuffer.h 1.3 2001/08/02 13:48:42 kls Exp $
+ * $Id: ringbuffer.h 1.4 2001/08/05 11:12:06 kls Exp $
*/
#ifndef __RINGBUFFER_H
@@ -24,25 +24,24 @@ private:
cRingBufferInputThread *inputThread;
cRingBufferOutputThread *outputThread;
cMutex mutex;
- int size, head, tail;
- uchar *buffer;
- int maxFill;
+ cCondVar readyForPut, readyForGet;
+ cMutex putMutex, getMutex;
+ int size;
bool busy;
- bool statistics;
protected:
+ int maxFill;//XXX
+ bool statistics;//XXX
+ void WaitForPut(void);
+ void WaitForGet(void);
+ void EnablePut(void);
+ void EnableGet(void);
+ virtual void Clear(void) = 0;
+ virtual int Available(void) = 0;
+ int Free(void) { return size - Available() - 1; }
void Lock(void) { mutex.Lock(); }
void Unlock(void) { mutex.Unlock(); }
- int Available(void);
- int Free(void) { return size - Available() - 1; }
+ int Size(void) { return size; }
bool Busy(void) { return busy; }
- void Clear(void);
- // Immediately clears the ring buffer.
- int Put(const uchar *Data, int Count);
- // Puts at most Count bytes of Data into the ring buffer.
- // Returns the number of bytes actually stored.
- int Get(uchar *Data, int Count);
- // Gets at most Count bytes of Data from the ring buffer.
- // Returns the number of bytes actually retrieved.
virtual void Input(void) = 0;
// Runs as a separate thread and shall continuously read data from
// a source and call Put() to store the data in the ring buffer.
@@ -57,4 +56,60 @@ public:
void Stop(void);
};
+class cRingBufferLinear : public cRingBuffer {
+private:
+ int head, tail;
+ uchar *buffer;
+protected:
+ virtual int Available(void);
+ virtual void Clear(void);
+ // Immediately clears the ring buffer.
+ int Put(const uchar *Data, int Count);
+ // Puts at most Count bytes of Data into the ring buffer.
+ // Returns the number of bytes actually stored.
+ int Get(uchar *Data, int Count);
+ // Gets at most Count bytes of Data from the ring buffer.
+ // Returns the number of bytes actually retrieved.
+public:
+ cRingBufferLinear(int Size, bool Statistics = false);
+ virtual ~cRingBufferLinear();
+ };
+
+class cFrame {
+ friend class cRingBufferFrame;
+private:
+ cFrame *next;
+ uchar *data;
+ int count;
+ int index;
+public:
+ cFrame(const uchar *Data, int Count, int Index = -1);
+ ~cFrame();
+ const uchar *Data(void) const { return data; }
+ int Count(void) const { return count; }
+ int Index(void) const { return index; }
+ };
+
+class cRingBufferFrame : public cRingBuffer {
+private:
+ cFrame *head;
+ int currentFill;
+ void Delete(const cFrame *Frame);
+protected:
+ virtual int Available(void);
+ virtual void Clear(void);
+ // Immediately clears the ring buffer.
+ bool Put(cFrame *Frame);
+ // Puts the Frame into the ring buffer.
+ // Returns true if this was possible.
+ const cFrame *Get(bool Wait = true);
+ // Gets the next frame from the ring buffer.
+ // The actual data still remains in the buffer until Drop() is called.
+ void Drop(const cFrame *Frame);
+ // Drops the Frame that has just been fetched with Get().
+public:
+ cRingBufferFrame(int Size, bool Statistics = false);
+ virtual ~cRingBufferFrame();
+ };
+
#endif // __RINGBUFFER_H