mirror of
https://projects.vdr-developer.org/git/vdr-plugin-streamdev.git
synced 2023-10-10 19:16:51 +02:00
008e7c8510
- increased WRITERBUFSIZE - buffer was too small for high bandwidth content - removed cStreamdevStreamer::m_Running - eliminated potential busy waits in remuxers - updated cTSRemux static helpers to code of their VDR 1.6.0 counterparts - re-enabled PES vor VDR 1.7.3+. Streamdev now uses a copy of VDR 1.6.0's cRemux for TS to PES remuxing. - make sure that only complete TS packets are written to ringbuffers - use signaling instead of sleeps when writing to ringbuffers - optimized cStreamdevPatFilter PAT packet initialization - fixed cStreamdevPatFilter not processing PATs with length > TS_SIZE - 5 - use a small ringbuffer for cStreamdevPatFilter instead of writing to cStreamdevStreamers SendBuffer as two threads mustn't write to the same ringbuffer Modified Files: CONTRIBUTORS HISTORY Makefile common.c common.h streamdev-server.c libdvbmpeg/transform.h remux/extern.c remux/extern.h remux/ts2es.c remux/ts2es.h remux/ts2ps.c remux/ts2ps.h remux/tsremux.c remux/tsremux.h server/connectionHTTP.c server/connectionVTP.c server/livestreamer.c server/livestreamer.h server/menuHTTP.c server/streamer.c server/streamer.h Added Files: remux/ts2pes.c remux/ts2pes.h
89 lines
2.3 KiB
C++
89 lines
2.3 KiB
C++
#ifndef VDR_STREAMDEV_LIVESTREAMER_H
|
|
#define VDR_STREAMDEV_LIVESTREAMER_H
|
|
|
|
#include <vdr/config.h>
|
|
#include <vdr/receiver.h>
|
|
|
|
#include "server/streamer.h"
|
|
#include "common.h"
|
|
|
|
namespace Streamdev {
|
|
class cTS2PSRemux;
|
|
class cTS2ESRemux;
|
|
class cExternRemux;
|
|
class cTS2PESRemux;
|
|
}
|
|
class cStreamdevPatFilter;
|
|
class cStreamdevLiveReceiver;
|
|
|
|
// --- cStreamdevLiveStreamer -------------------------------------------------
|
|
|
|
class cStreamdevLiveStreamer: public cStreamdevStreamer {
|
|
private:
|
|
int m_Priority;
|
|
std::string m_Parameter;
|
|
int m_Pids[MAXRECEIVEPIDS + 1];
|
|
int m_NumPids;
|
|
eStreamType m_StreamType;
|
|
const cChannel *m_Channel;
|
|
cDevice *m_Device;
|
|
cStreamdevLiveReceiver *m_Receiver;
|
|
cStreamdevPatFilter *m_PatFilter;
|
|
Streamdev::cTS2PESRemux *m_PESRemux;
|
|
Streamdev::cTS2ESRemux *m_ESRemux;
|
|
Streamdev::cTS2PSRemux *m_PSRemux;
|
|
Streamdev::cExternRemux *m_ExtRemux;
|
|
|
|
void StartReceiver(void);
|
|
bool HasPid(int Pid);
|
|
|
|
public:
|
|
cStreamdevLiveStreamer(int Priority, std::string Parameter = "");
|
|
virtual ~cStreamdevLiveStreamer();
|
|
|
|
void SetDevice(cDevice *Device) { m_Device = Device; }
|
|
bool SetPid(int Pid, bool On);
|
|
bool SetPids(int Pid, const int *Pids1 = NULL, const int *Pids2 = NULL, const int *Pids3 = NULL);
|
|
bool SetChannel(const cChannel *Channel, eStreamType StreamType, int Apid = 0);
|
|
|
|
virtual int Put(const uchar *Data, int Count);
|
|
virtual uchar *Get(int &Count);
|
|
virtual void Del(int Count);
|
|
|
|
virtual void Attach(void);
|
|
virtual void Detach(void);
|
|
|
|
// Statistical purposes:
|
|
virtual std::string Report(void);
|
|
};
|
|
|
|
|
|
// --- cStreamdevFilterStreamer -------------------------------------------------
|
|
|
|
//#include <vdr/status.h>
|
|
|
|
class cStreamdevLiveFilter;
|
|
|
|
class cStreamdevFilterStreamer: public cStreamdevStreamer /*, public cStatus*/ {
|
|
private:
|
|
cDevice *m_Device;
|
|
cStreamdevLiveFilter *m_Filter;
|
|
//const cChannel *m_Channel;
|
|
|
|
public:
|
|
cStreamdevFilterStreamer();
|
|
virtual ~cStreamdevFilterStreamer();
|
|
|
|
void SetDevice(cDevice *Device);
|
|
//void SetChannel(const cChannel *Channel);
|
|
bool SetFilter(u_short Pid, u_char Tid, u_char Mask, bool On);
|
|
|
|
virtual void Attach(void);
|
|
virtual void Detach(void);
|
|
|
|
// cStatus message handlers
|
|
//virtual void ChannelSwitch(const cDevice *Device, int ChannelNumber);
|
|
};
|
|
|
|
#endif // VDR_STREAMDEV_LIVESTREAMER_H
|