Converted to the new API plus several small enhancements0.8.0

1 files changed, 16 insertions, 11 deletions

diff --git a/remux.h b/remux.h
index bceb676b..6705e341 100644
--- a/remux.h
+++ b/remux.h
@@ -4,16 +4,14 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remux.h 1.1 2001/03/31 08:42:27 kls Exp $
+ * $Id: remux.h 1.2 2001/05/26 11:50:52 kls Exp $
  */
 
 #ifndef __REMUX_H
 #define __REMUX_H
 
-// There are various experiments with different types of remultiplexers
-// going on at the moment. Select the remultiplexer here:
-#define REMUX_NONE 1
-//#define REMUX_TEST 1
+#include <time.h> //XXX FIXME: DVB/ost/include/ost/dmx.h should include <time.h> itself!!!
+#include <ost/dmx.h>
 
 // Picture types:
 #define NO_PICTURE 0
@@ -21,6 +19,7 @@
 #define P_FRAME    2
 #define B_FRAME    3
 
+//XXX -> remux.c???
 // Start codes:
 #define SC_PICTURE 0x00  // "picture header"
 #define SC_SEQU    0xB3  // "sequence header"
@@ -30,22 +29,28 @@
 #define SC_VIDEO   0xE0
 
 // The minimum amount of video data necessary to identify frames:
-#define MINVIDEODATA (256*1024) // just a safe guess (max. size of any frame block, plus some safety)
+#define MINVIDEODATA (16*1024) // just a safe guess (max. size of any frame block, plus some safety)
 
 typedef unsigned char uchar;
+class cTS2PES;
 
 class cRemux {
 private:
-#if defined(REMUX_NONE)
+  bool exitOnFailure;
   bool synced;
+  int skipped;
+  dvb_pid_t vPid, aPid;
+  cTS2PES *vTS2PES, *aTS2PES;
+  uchar resultBuffer[MINVIDEODATA * 4];//XXX
+  int resultCount;
+  int resultDelivered;
+  int GetPid(const uchar *Data);
   int GetPacketLength(const uchar *Data, int Count, int Offset);
   int ScanVideoPacket(const uchar *Data, int Count, int Offset, uchar &PictureType);
-#elif defined(REMUX_TEST)
-#endif
 public:
-  cRemux(void);
+  cRemux(dvb_pid_t VPid, dvb_pid_t APid, bool ExitOnFailure = false);
   ~cRemux();
-  const uchar *Process(const uchar *Data, int &Count, int &Result, uchar &PictureType);
+  const uchar *Process(const uchar *Data, int &Count, int &Result, uchar *PictureType = NULL);
   };
 
 #endif // __REMUX_H