mirror of
https://github.com/vdr-projects/vdr.git
synced 2025-03-01 10:50:46 +00:00
0686038af3
- Fixed detecting broken connection to the LIRC daemon (thanks to Ludwig Nussel). - Now sending CA descriptors to the CAM in the same sequence as they were originally received (thanks to Stefan Huelswitt). - The PCR PID can now be set separately from the video PID. The syntax in the 'channels.conf' file is, for example, ...:164+17:..., where 164 is the video PID and 17 is the PCR PID. The separator is a '+' sign, not a comma or semicolon as with the audio PIDs, because this is not an alternate PID, but rather an additional, necessary PID. In order to use this feature you need a driver version dated 2003-04-27 or higher (setting the PCR PID didn't work in earlier versions). - Fixed deleting the last recording in the "Recordings" menu, which started pausing live video (thanks to Christoph Friederich for reporting this one). - Now setting the "broken link" flag for GOPs at the beginning of a new video sequence, which avoids artefacts when cutting (thanks to Stefan Huelswitt). - Removed the Mute() call from cDvbDevice::StillPicture() (suggested by Andreas Schultz). - Updated 'channels.conf.terr' for Berlin (thanks to Andreas Brachold). - Extended logging info when starting/stopping timers to show the channel number, start/stop time and the file name (suggested by Manuel Hartl). - Added a note regarding non-VDR files in the /videoX directories to INSTALL (suggested by Benjamin Harling). - Skipping keys that come in too fast from LIRC (thanks to Christian Jacobsen). - Avoiding short display of the main menu if a plugin displays its own OSD and is started through a user defined key macro (thanks to Andreas Mair for reporting this one). - Reduced the time to wait for EPG data when starting a recording to 3 seconds. - The new SVDRP command STAT can be used to request information about the disk usage (thanks to Thomas Koch). - Fixed faulty calculation of section length in eit.c (thanks to Teemu Rantanen).
51 lines
1.4 KiB
C++
51 lines
1.4 KiB
C++
/*
|
|
* remux.h: A streaming MPEG2 remultiplexer
|
|
*
|
|
* See the main source file 'vdr.c' for copyright information and
|
|
* how to reach the author.
|
|
*
|
|
* $Id: remux.h 1.10 2003/04/26 14:13:11 kls Exp $
|
|
*/
|
|
|
|
#ifndef __REMUX_H
|
|
#define __REMUX_H
|
|
|
|
#include <time.h> //XXX FIXME: DVB/linux/dvb/dmx.h should include <time.h> itself!!!
|
|
#include <linux/dvb/dmx.h>
|
|
#include "tools.h"
|
|
|
|
// Picture types:
|
|
#define NO_PICTURE 0
|
|
#define I_FRAME 1
|
|
#define P_FRAME 2
|
|
#define B_FRAME 3
|
|
|
|
// The minimum amount of video data necessary to identify frames:
|
|
#define MINVIDEODATA (16*1024) // just a safe guess (max. size of any frame block, plus some safety)
|
|
|
|
#define RESULTBUFFERSIZE (MINVIDEODATA * 4)
|
|
|
|
class cTS2PES;
|
|
|
|
class cRemux {
|
|
private:
|
|
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);
|
|
public:
|
|
cRemux(int VPid, int APid1, int APid2, int DPid1, int DPid2, bool ExitOnFailure = false);
|
|
~cRemux();
|
|
uchar *Process(const uchar *Data, int &Count, int &Result, uchar *PictureType = NULL);
|
|
static void SetBrokenLink(uchar *Data, int Length);
|
|
};
|
|
|
|
#endif // __REMUX_H
|