Version 0.85vdr-0.85

- Added Norwegian language texts (thanks to Jørgen Tvedt).
- Increased the usleep value in cDvbOsd::Cmd() to 5000 in order to work on
  systems with the KURT/utime-patch (thanks to Guido Fiala).
- Changed the check whether the driver is loaded in runvdr to check for the
  'dvb' module (the last one loaded).
- Fixed repeat function with LIRC (thanks to Stefan Huelswitt).
- Increased the upper limit for the symbol rate to 30000 (thanks to Ulrich
  Röder).
- Made the position of the channel display configurable (thanks to Stefan
  Huelswitt).
- Made the width and height of the OSD configurable (thanks to Stefan Huelswitt).
- DiSEqC support can now be generally enabled/disabled in the Setup menu. This
  may be necessary if your multiswitch gets irritated by the default DiSEqC
  codes '0' (thanks to Markus Lang).
- Fixed replaying in case there is no index file.
- Fixed jumping to an editing mark when replay has been paused.
- Avoiding unnecessary code execution in the replay progress display (thanks
  to Guido Fiala).
- When entering time values the digits that still have to be entered are now
  shown as '-' (as in "1-:--").
- When setting an editing mark while the progress display is not active, the
  display will now be turned on for a short while to indicate the successful
  setting of the mark.
- Updated 'channels.conf' for Premiere World (thanks to Helmut Schächner).
  Check your timers if you use this channels.conf file, since the sequence of
  several PW channels has been changed.
- Changed the color of "Info" messages to "black on green" and that of the
  confirmation messages (like "Delete...") to "black on yellow".
- Fixed display with DEBUG_OSD (it still crashes sometimes, esp. when replaying,
  but I can't seem to find what causes this... any ideas anybody?).
- Avoiding audio/video distortions in 'Transfer Mode' by no longer actually
  tuning the primary interface (which can't receive this channel, anyway).
  Apparently the driver gets irritated when the channel is switched and a
  replay session is started immediately after that.
- Increased timeout until reporting "video data stream broken" when recording.
- Explicitly switching back to the previously active channel after ending a
  replay session (to have it shown correctly in case it was in 'Transfer Mode').

1 files changed, 18 insertions, 19 deletions

diff --git a/remux.h b/remux.h
index bceb676..792469e 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.5 2001/06/23 14:06:59 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,31 +19,32 @@
 #define P_FRAME    2
 #define B_FRAME    3
 
-// Start codes:
-#define SC_PICTURE 0x00  // "picture header"
-#define SC_SEQU    0xB3  // "sequence header"
-#define SC_PHEAD   0xBA  // "pack header"
-#define SC_SHEAD   0xBB  // "system header"
-#define SC_AUDIO   0xC0
-#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)
+
+#define RESULTBUFFERSIZE (MINVIDEODATA * 4)
 
 typedef unsigned char uchar;
+class cTS2PES;
 
 class cRemux {
 private:
-#if defined(REMUX_NONE)
+  bool exitOnFailure;
   bool synced;
+  int skipped;
+  int vPid, aPid1, aPid2, dPid1, dPid2;
+  cTS2PES *vTS2PES, *aTS2PES1, *aTS2PES2, *dTS2PES1, *dTS2PES2;
+  uchar resultBuffer[RESULTBUFFERSIZE];
+  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(int VPid, int APid1, int APid2, int DPid1, int DPid2, bool ExitOnFailure = false);
   ~cRemux();
-  const uchar *Process(const uchar *Data, int &Count, int &Result, uchar &PictureType);
+  void SetAudioPid(int APid);
+  const uchar *Process(const uchar *Data, int &Count, int &Result, uchar *PictureType = NULL);
   };
 
 #endif // __REMUX_H