mirror of
https://github.com/vdr-projects/vdr.git
synced 2025-03-01 10:50:46 +00:00
e36fe18c48
- Making sure at least the default skin is available at program start in case a plugin needs to issue an error message (thanks to Achim Tuffentshammer for reporting a crash in such a case). Also checking if there is a current skin in cSkins::Message(). - Completed the Finnish OSD texts and fixed internationalization of the text for "Setup/DVB/Audio language(s)" (thanks to Rolf Ahrenberg). - Completed the Estonian OSD texts and switched to iso8859-13 character set (thanks to Arthur Konovalov). - Made cCondWait::SleepMs() sleep at least 3ms to avoid a possible busy wait. - Fixed canceling the LIRC thread (thanks to Marco Schlüßler for pointing out this one). - The "Green" button in the "Main" menu is now always "Audio", since the audio channel might be changed even if there is only one actual audio PID. - Fixed handling the '-E' option which was broken in version 1.3.18 (thanks to Christian Jacobsen for reporting this one). - Added 'channels.conf.terr' entries for Mainz (thanks to Michael Heyse). - Implemented cDolbyRepacker for better handling of Dolby Digital PES packets (thanks to Reinhard Nissl). - Fixed playing files with PES packets longer than 2048 byte through the full featured DVB card (thanks to Marco Kremer for reporting this one and providing a test sample). - Recording and Transfer Mode now handle more than 2 audio PIDs. For this the interfaces of the following functions have been changed: cTransferControl::cTransferControl() cTransfer::cTransfer() cRecorder::cRecorder() cReceiver::cReceiver() cRemux::cRemux() - Fixed a possible race condition in cDevice::Action() and cTSBuffer::Action() (thanks to Stefan Huelswitt). - Extended some buffer sizes to allow handling HDTV streams (thanks to Reinhard Nissl). - Added 'channels.conf.terr' entries for Düsseldorf and Köln (thanks to Walter Koch). - Falling back to 'stereo' when switching channels in case the user had switched to 'left' or 'right' (suggested by Rolf Groppe). - Completed the Danish OSD texts (thanks to Mogens Elneff). - Recording and Transfer Mode can now handle up to 8 Dolby Digital tracks (thanks to Marco Schlüßler for a patch that implements substream handling into cDevice::PlayPesPacket(), and Reinhard Nissl for adding substream handling to cDolbyRepacker). - Added PlayPes(NULL, 0) to cTransfer::Action() when clearing the transfer buffer to avoid overflows (thanks to Marco Schlüßler for pointing this out).
70 lines
2.4 KiB
C++
70 lines
2.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.13 2005/01/16 13:15:17 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 "ringbuffer.h"
|
|
#include "tools.h"
|
|
|
|
// Picture types:
|
|
#define NO_PICTURE 0
|
|
#define I_FRAME 1
|
|
#define P_FRAME 2
|
|
#define B_FRAME 3
|
|
|
|
#define MAXTRACKS 64
|
|
|
|
class cTS2PES;
|
|
|
|
class cRemux {
|
|
private:
|
|
bool exitOnFailure;
|
|
bool isRadio;
|
|
int numUPTerrors;
|
|
bool synced;
|
|
int skipped;
|
|
cTS2PES *ts2pes[MAXTRACKS];
|
|
int numTracks;
|
|
cRingBufferLinear *resultBuffer;
|
|
int resultSkipped;
|
|
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, const int *APids, const int *DPids, const int *SPids, bool ExitOnFailure = false);
|
|
///< Creates a new remuxer for the given PIDs. VPid is the video PID, while
|
|
///< APids, DPids and SPids are pointers to zero terminated lists of audio,
|
|
///< dolby and subtitle PIDs (the pointers may be NULL if there is no such
|
|
///< PID). If ExitOnFailure is true, the remuxer will initiate an "emergency
|
|
///< exit" in case of problems with the data stream.
|
|
~cRemux();
|
|
int Put(const uchar *Data, int Count);
|
|
///< Puts at most Count bytes of Data into the remuxer.
|
|
///< \return Returns the number of bytes actually consumed from Data.
|
|
uchar *Get(int &Count, uchar *PictureType = NULL);
|
|
///< Gets all currently available data from the remuxer.
|
|
///< \return Count contains the number of bytes the result points to, and
|
|
///< PictureType (if not NULL) will contain one of NO_PICTURE, I_FRAME, P_FRAME
|
|
///< or B_FRAME.
|
|
void Del(int Count);
|
|
///< Deletes Count bytes from the remuxer. Count must be the number returned
|
|
///< from a previous call to Get(). Several calls to Del() with fractions of
|
|
///< a previously returned Count may be made, but the total sum of all Count
|
|
///< values must be exactly what the previous Get() has returned.
|
|
void Clear(void);
|
|
///< Clears the remuxer of all data it might still contain, keeping the PID
|
|
///< settings as they are.
|
|
static void SetBrokenLink(uchar *Data, int Length);
|
|
};
|
|
|
|
#endif // __REMUX_H
|