1 files changed, 47 insertions, 11 deletions

diff --git a/pes2ts.h b/pes2ts.h
index 43fa3a1..2674bd8 100644
--- a/pes2ts.h
+++ b/pes2ts.h
@@ -16,15 +16,40 @@
 #define TS_SIZE         188
 #define IPACKS		2048
 
-class cPES2TSRemux: public cThread {
+class cPESRemux {
+private:
+   bool  	   	   OutputLocked;
+   
+protected:
+   cRingBufferLinear *m_InputBuffer;
+   cMutex  	         InputMutex;
+
+public:
+   cPESRemux(int inputBufferSize, int outputBufferSize);
+	virtual ~cPESRemux();
+	
+   int Put(const uchar *Data, int Count);
+   void DelInput (int Count) { InputMutex.Lock(); m_InputBuffer ->Del(Count); InputMutex.Unlock(); }
+   void ClearInput () { InputMutex.Lock(); m_InputBuffer ->Clear(); InputMutex.Unlock(); }
+   
+   virtual int Available(void) = 0;
+   virtual int Free(void) = 0;
+   virtual int InputFree(void) = 0;
+   virtual uchar *Get(int &Count) = 0;
+   virtual void DelOutput(int Count) = 0;
+   virtual void ClearOutput() = 0;
+   void LockOutput()   { while (OutputLocked) cCondWait::SleepMs(1); OutputLocked = true; }
+   void UnlockOutput() { OutputLocked = false; }
+	virtual void PlayModeChange() {}; 
+   
+};
+
+class cPES2TSRemux: public cPESRemux, cThread {
 private:
 	cRingBufferLinear *m_OutputBuffer;
-	cRingBufferLinear *m_InputBuffer;
 	bool               m_Active;
 	unsigned short	   vpid;
 	unsigned short	   apid;
-        bool  	   	   OutputLocked;
-	cMutex  	   InputMutex;
 	bool 		   m_PlayModeChanged;
   
 protected:
@@ -34,17 +59,28 @@ public:
 	cPES2TSRemux(int VPid, int APid);
 	virtual ~cPES2TSRemux();
 
-	int Free(void) { return m_InputBuffer->Free(); }
-	int Available(void) { return m_OutputBuffer->Available(); }
-	int Put(const uchar *Data, int Count);
+   int Available(void) { return m_OutputBuffer->Available(); }
+	int Free(void) { return m_OutputBuffer->Free(); }
+	int InputFree(void) { return m_InputBuffer->Free(); }
 	uchar *Get(int &Count) { return  m_OutputBuffer->Get(Count); }
 	void DelOutput(int Count) { m_OutputBuffer->Del(Count); }
-	void DelInput (int Count) { InputMutex.Lock(); m_InputBuffer ->Del(Count); InputMutex.Unlock(); }
 	void ClearOutput() { LockOutput(); m_OutputBuffer->Clear(); UnlockOutput(); }
-	void ClearInput () { InputMutex.Lock(); m_InputBuffer ->Clear(); InputMutex.Unlock(); }
-	void LockOutput()   { while (OutputLocked) cCondWait::SleepMs(1); OutputLocked = true; }
-	void UnlockOutput() { OutputLocked = false; }
 	void PlayModeChange() { m_PlayModeChanged = true; } 
+	
+};
+
+class cPES2PESRemux: public cPESRemux {
+public:
+	cPES2PESRemux();
+	virtual ~cPES2PESRemux();
+
+   int Available(void) { return m_InputBuffer->Available(); }
+   int Free(void) { return m_InputBuffer->Free(); }
+   int InputFree(void) { return m_InputBuffer->Free(); }
+	uchar *Get(int &Count) { return  m_InputBuffer->Get(Count); }
+	void DelOutput(int Count) { m_InputBuffer->Del(Count); }
+	void ClearOutput() { LockOutput(); m_InputBuffer->Clear(); UnlockOutput(); } 
+	
 };
 
 #endif // PES2TSREMUX_H