mirror of
https://github.com/vdr-projects/vdr.git
synced 2025-03-01 10:50:46 +00:00
ad40eaa28e
- Added missing German OSD texts for 'Audio language'. - The Setup/CICAM menu now only contains the devices that actually have a CI and dynamically detects the number of slots a CI provides. - Implemented cAudioRepacker for better handling of audio PES packets (thanks to Reinhard Nissl). - Modified handling of audio packets for radio channels in remux.c (thanks to Reinhard Nissl). - Updated the Danish OSD texts (thanks to Mogens Elneff). - Fixed the EPG scan, so that it doesn't use the primary device if that is currently in Transfer-Mode from itself (thanks to Marcus Hilbrich for a bug report that lead to this). - Removed the TUNER_LOCK_TIMEOUT in cDevice::AttachReceiver() since it caused more trouble than it fixed. - Fixed detecting short channel names for "Kabel Deutschland", who uses a comma as delimiter (thanks to Marco Schlüßler). - Moved cMenuEditTimer and cMenuEvent to menu.h so that plugins can use it (suggested by Thomas Günther). - The new static function cString::sprintf() can be used to easily create a formatted string. - Plugins can now implement their own SVDRP commands (based on a patch from Hardy Flor). See PLUGINS.html, section "SVDRP commands" for details. The SVDRP commands of a plugin are accessed through the new SVDRP command PLUG. See PLUGINS/src/svdrpdemo for an example of how to use this feature. - The new SVDRP command PLAY can be used to start replaying a recording (thanks to Hardy Flor). - The new SVDRP command EDIT can be used to start the editing process of a recording (based on the CUTR patch by Harald Milz).
85 lines
3.1 KiB
C++
85 lines
3.1 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.15 2005/08/26 13:22:19 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"
|
|
|
|
enum ePesHeader {
|
|
phNeedMoreData = -1,
|
|
phInvalid = 0,
|
|
phMPEG1 = 1,
|
|
phMPEG2 = 2
|
|
};
|
|
|
|
ePesHeader AnalyzePesHeader(const uchar *Data, int Count, int &PesPayloadOffset, bool *ContinuationHeader = NULL);
|
|
|
|
// 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();
|
|
void SetTimeouts(int PutTimeout, int GetTimeout) { resultBuffer->SetTimeouts(PutTimeout, GetTimeout); }
|
|
///< By default cRemux assumes that Put() and Get() are called from different
|
|
///< threads, and uses a timeout in the Get() function in case there is no
|
|
///< data available. SetTimeouts() can be used to modify these timeouts.
|
|
///< Especially if Put() and Get() are called from the same thread, setting
|
|
///< both timeouts to 0 is recommended.
|
|
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
|