mirror of
https://github.com/vdr-projects/vdr.git
synced 2025-03-01 10:50:46 +00:00
4c5de28883
- Added a sleep in cDvbPlayer::Action() in case there is no data to send to the device, which avoids a busy loop on very fast machines (thanks to Martin Wache). - Modified the description of cDevice::Poll() to avoid misunderstandings. - Updated Croatian language texts (thanks to Drazen Dupor). - cDvbPlayer::Goto() now appends a Sequence End Code to get the image shown immediately with softdevices (thanks to Reinhard Nissl). - Reactivated cVideoRepacker in remux.c after some fixes (thanks to Reinhard Nissl). - Removed the fix for handling VPS timers, so that they only record if the event they are assigned to actually has the given VPS time. This has caused repeating VPS timers to stop recording prematurely. - Avoiding duplicate components in EPG events when reading epg.data or in the PUTE SVDRP command (thanks to Olaf Titz for reporting this one). - Added the command line options '--lirc', '--rcu' and '--no-kbd' to allow setting the remote control at runtime (based on a patch by Darren Salt). - Now checking whether timers or channels are currently being edited via the menu before making changes through SVDRP (thanks to Andreas Brugger for reporting a problem with this). - Files and directories are now created with rights according to the shell's umask settings (thanks to Andreas Brachold). - Fixed the cChannel copy constructor (thanks to Marcel Wiesweg for pointing out a problem with it). - Fixed an out-of-bounds memory access with audio language ids (thanks to Matthias Lenk for reporting, and Udo Richter for suggesting a fix). - Updated the Finnish OSD texts (thanks to Rolf Ahrenberg). - Added missing storing of the MenuScrollPage parameter (thanks to Frank Krömmelbein). - Added cRemux::SetTimeouts() for better use of cRemux in a single thread (thanks to Udo Richter for reporting a problem with this). - Modified cEITScanner::Process() so that it uses the primary device if it is replaying and is the only device that provides the given transponder, and that a forced EPG scan works even if EPG scan timeout is set to 0 (thanks to Bernhard Stegmaier for reporting a problem with this). - Fixed cDvbSpuBitmap::putPixel() (thanks to Reinhard Nissl). - Fixed setting system time to avoid time jumps in case of faulty data (thanks to Andreas Böttger). - Fixed a memory leak in the SVDRP command LSTE (thanks to Stefan Huelswitt).
76 lines
2.9 KiB
C++
76 lines
2.9 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.14 2005/08/07 10:28:07 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();
|
|
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
|