diff options
author | schmirl <schmirl> | 2009-06-19 06:32:38 +0000 |
---|---|---|
committer | schmirl <schmirl> | 2009-06-19 06:32:38 +0000 |
commit | 008e7c851013722a377aa9ff4485d4af2d991883 (patch) | |
tree | 8178a3251d528849d2ccbb0cef9b1bd712cfd6f9 /remux/tsremux.h | |
parent | 64ff2c08be769cf227ac6cf2e318fcb6b80c9689 (diff) | |
download | vdr-plugin-streamdev-008e7c851013722a377aa9ff4485d4af2d991883.tar.gz vdr-plugin-streamdev-008e7c851013722a377aa9ff4485d4af2d991883.tar.bz2 |
- added namespace to remuxers
- 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
Diffstat (limited to 'remux/tsremux.h')
-rw-r--r-- | remux/tsremux.h | 28 |
1 files changed, 8 insertions, 20 deletions
diff --git a/remux/tsremux.h b/remux/tsremux.h index a7fe481..09a5372 100644 --- a/remux/tsremux.h +++ b/remux/tsremux.h @@ -4,34 +4,22 @@ #include "libdvbmpeg/transform.h" #include <vdr/remux.h> -#ifndef NO_PICTURE +// Picture types: #define NO_PICTURE 0 -#endif +#define I_FRAME 1 +#define P_FRAME 2 +#define B_FRAME 3 -#define RESULTBUFFERSIZE KILOBYTE(256) +namespace Streamdev { class cTSRemux { -protected: - /*uchar m_ResultBuffer[RESULTBUFFERSIZE]; - int m_ResultCount; - int m_ResultDelivered; - int m_Synced; - int m_Skipped; - int m_Sync; - - - virtual void PutTSPacket(int Pid, const uint8_t *Data) = 0; - public: - cTSRemux(bool Sync = true); - virtual ~cTSRemux(); - - virtual uchar *Process(const uchar *Data, int &Count, int &Result);*/ - static void SetBrokenLink(uchar *Data, int Length); static int GetPid(const uchar *Data); - static int GetPacketLength(const uchar *Data, int Count, int Offset); + static int GetPacketLength(const uchar *Data, int Count, int Offset); static int ScanVideoPacket(const uchar *Data, int Count, int Offset, uchar &PictureType); }; +} // namespace Streamdev + #endif // VDR_STREAMDEV_TSREMUX_H |