mirror of
https://github.com/vdr-projects/vdr.git
synced 2025-03-01 10:50:46 +00:00
49b561fcad
- Fixed updating the "Info" button in the "Timers" menu. - Reduced the number of events to actually check when setting events to timers. - cMenuEditIntItem now checks the given value and forces it to be between the given min and max limits. - The status changes of EPG events are now logged for all channels that have timers. - Removed the log message "deleting plugin: ..." when shutting down VDR (thanks to Christoph Haubrich for reporting that this is irritating when calling "vdr --help"). - Fixed cReadLine::Read() for lines that end with the infamous "\r\n" (thanks to Rolf Ahrenberg). - Fixed cDvbDevice::SetAudioBypass() in case setTransferModeForDolbyDigital is false (thanks to Werner Fink). - Updated 'sources.conf' (thanks to Oleg Roitburd). - Fixed the shutdown timeout (thanks to Alexander Wenzel). - Only calling RemoveEmptyVideoDirectories() once in case a recording has been deleted (reported by Hardy Flor). - Fixed deleting recordings that have been removed externally when running out of disk space (reported by Jan Lenz). - Fixed handling repeating VPS timers (they stopped recording too early). - Timer log messages now show "VPS" if this is a VPS timer. - Fixed getting the present EPG event in case none is currently 'running' (it then returns the one that just ended). - Fixed calling a plugin's main menu function while a message is being displayed (reported by Helmut Auer). - Updated the Russian OSD texts (thanks to Oleg Roitburd). - Made cMenuRecordings::GetRecording() 'protected' (suggested by Marius Heidenstecker). - Speeded up cRemux::ScanVideoPacket() (thanks to Reinhard Nissl). - Enhanced logging EPG event data. - Fixed format string handling (thanks to Darren Salt). - The new function cDevice::ForceTransferMode() can be used to force the primary device into transfer mode (thanks to Reinhard Nissl). - The 'version' of EPG events is now ignored when reading EPG data from 'epg.data' or via SVDRP/PUTE to avoid problems with double EPG events. - The 'running status' of EPG events is now only set to SI::RunningStatusNotRunning for events before the present event. - Fixed some #include sequences. - Single shot VPS timers are now only considered 'expired' if their associated EPG event has been explicitly set to SI::RunningStatusNotRunning. - The check for timers to be deleted is now done only every 30 seconds.
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.16 2006/03/25 12:27:30 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);
|
|
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);
|
|
static int GetPacketLength(const uchar *Data, int Count, int Offset);
|
|
static int ScanVideoPacket(const uchar *Data, int Count, int Offset, uchar &PictureType);
|
|
};
|
|
|
|
#endif // __REMUX_H
|