- transfer

6 files changed, 290 insertions, 247 deletions

diff --git a/remux/ts2es.c b/remux/ts2es.c
index 3c3138c..83e3c80 100644
--- a/remux/ts2es.c
+++ b/remux/ts2es.c
@@ -1,4 +1,6 @@
 #include "remux/ts2es.h"
+#include "server/streamer.h"
+#include "libdvbmpeg/transform.h"
 #include "common.h"
 
 // from VDR's remux.c
@@ -8,40 +10,38 @@ class cTS2ES: public ipack {
 	friend void PutES(uint8_t *Buffer, int Size, void *Data);
 
 private:
-	uint8_t *m_ResultBuffer;
-	int *m_ResultCount;
+	cRingBufferLinear *m_ResultBuffer;
 
 public:
-	cTS2ES(uint8_t *ResultBuffer, int *ResultCount);
+	cTS2ES(cRingBufferLinear *ResultBuffer);
 	~cTS2ES();
 
 	void PutTSPacket(const uint8_t *Buffer);
 };
 
-void PutES(uint8_t *Buffer, int Size, void *Data) {
+void PutES(uint8_t *Buffer, int Size, void *Data) 
+{
 	cTS2ES *This = (cTS2ES*)Data;
 	uint8_t payl = Buffer[8] + 9 + This->start - 1;
 	int count = Size - payl;
 
-	if (*This->m_ResultCount + count > RESULTBUFFERSIZE) {
-		esyslog("ERROR: result buffer overflow (%d + %d > %d)", 
-				*This->m_ResultCount, count, RESULTBUFFERSIZE);
-		count = RESULTBUFFERSIZE - *This->m_ResultCount;
-	}
-	memcpy(This->m_ResultBuffer + *This->m_ResultCount, Buffer + payl, count);
-	*This->m_ResultCount += count;
+	int n = This->m_ResultBuffer->Put(Buffer + payl, count);
+	if (n != count)
+		esyslog("ERROR: result buffer overflow, dropped %d out of %d byte", count - n, count);
 	This->start = 1;
 }
 
-cTS2ES::cTS2ES(uint8_t *ResultBuffer, int *ResultCount) {
+cTS2ES::cTS2ES(cRingBufferLinear *ResultBuffer) 
+{
 	m_ResultBuffer = ResultBuffer;
-	m_ResultCount = ResultCount;
 
 	init_ipack(this, IPACKS, PutES, 0);
 	data = (void*)this;
 }
 
-cTS2ES::~cTS2ES() {
+cTS2ES::~cTS2ES() 
+{
+	free_ipack(this);
 }
 
 void cTS2ES::PutTSPacket(const uint8_t *Buffer) {
@@ -73,16 +73,67 @@ void cTS2ES::PutTSPacket(const uint8_t *Buffer) {
 }
 
 cTS2ESRemux::cTS2ESRemux(int Pid):
-		cTSRemux(false) {
-	m_Pid = Pid;
-  m_Remux = new cTS2ES(m_ResultBuffer, &m_ResultCount);
+		m_Pid(Pid),
+		m_ResultBuffer(new cRingBufferLinear(WRITERBUFSIZE, IPACKS)),
+		m_Remux(new cTS2ES(m_ResultBuffer))
+{
+	m_ResultBuffer->SetTimeouts(0, 100);
 }
 
-cTS2ESRemux::~cTS2ESRemux() {
+cTS2ESRemux::~cTS2ESRemux() 
+{
 	delete m_Remux;
+	delete m_ResultBuffer;
 }
 
-void cTS2ESRemux::PutTSPacket(int Pid, const uint8_t *Data) {
-	if (Pid == m_Pid) m_Remux->PutTSPacket(Data);
+int cTS2ESRemux::Put(const uchar *Data, int Count) 
+{
+	int used = 0;
+
+	// Make sure we are looking at a TS packet:
+
+	while (Count > TS_SIZE) {
+		if (Data[0] == TS_SYNC_BYTE && Data[TS_SIZE] == TS_SYNC_BYTE)
+			break;
+		Data++;
+		Count--;
+		used++;
+	}
+
+	if (used)
+		esyslog("ERROR: skipped %d byte to sync on TS packet", used);
+
+	// Convert incoming TS data into ES:
+
+	for (int i = 0; i < Count; i += TS_SIZE) {
+		if (Count - i < TS_SIZE)
+			break;
+		if (Data[i] != TS_SYNC_BYTE)
+			break;
+		if (m_ResultBuffer->Free() < 2 * IPACKS)
+			break; // A cTS2ES might write one full packet and also a small rest
+		int pid = cTSRemux::GetPid(Data + i + 1);
+		if (Data[i + 3] & 0x10) { // got payload
+			if (m_Pid == pid)
+				m_Remux->PutTSPacket(Data + i);
+		}
+		used += TS_SIZE;
+	}
+
+/*
+  // Check if we're getting anywhere here:
+  if (!synced && skipped >= 0) {
+     if (skipped > MAXNONUSEFULDATA) {
+        esyslog("ERROR: no useful data seen within %d byte of video stream", skipped);
+        skipped = -1;
+        if (exitOnFailure)
+           cThread::EmergencyExit(true);
+        }
+     else
+        skipped += used;
+     }
+*/
+
+	return used;
 }
 
diff --git a/remux/ts2es.h b/remux/ts2es.h
index 8026a1b..551df1d 100644
--- a/remux/ts2es.h
+++ b/remux/ts2es.h
@@ -2,20 +2,24 @@
 #define VDR_STREAMDEV_TS2ESREMUX_H
 
 #include "remux/tsremux.h"
+#include <vdr/ringbuffer.h>
 
 class cTS2ES;
+class cRingBufferLinear;
 
 class cTS2ESRemux: public cTSRemux {
 private:
-	int m_Pid;
-	cTS2ES *m_Remux;
-
-protected:
-	virtual void PutTSPacket(int Pid, const uint8_t *Data);
+	int                m_Pid;
+	cRingBufferLinear *m_ResultBuffer;
+	cTS2ES            *m_Remux;
 
 public:
 	cTS2ESRemux(int Pid);
 	virtual ~cTS2ESRemux();
+	
+	int Put(const uchar *Data, int Count);
+	uchar *Get(int &Count) { return m_ResultBuffer->Get(Count); }
+	void Del(int Count) { m_ResultBuffer->Del(Count); }
 };
 
 #endif // VDR_STREAMDEV_TS2ESREMUX_H
diff --git a/remux/ts2ps.c b/remux/ts2ps.c
index 222c39a..8794e88 100644
--- a/remux/ts2ps.c
+++ b/remux/ts2ps.c
@@ -1,46 +1,49 @@
 #include "remux/ts2ps.h"
+#include "server/streamer.h"
+#include <vdr/channels.h>
 
 class cTS2PS {
 	friend void PutPES(uint8_t *Buffer, int Size, void *Data);
 
 private:
 	ipack m_Ipack;
-	uint8_t *m_ResultBuffer;
-	int *m_ResultCount;
+	int m_Pid;
+	cRingBufferLinear *m_ResultBuffer;
 
 public:
-	cTS2PS(uint8_t *ResultBuffer, int *ResultCount, uint8_t AudioCid = 0x00, 
-			bool PS = false);
+	cTS2PS(cRingBufferLinear *ResultBuffer, int Pid, uint8_t AudioCid = 0x00);
 	~cTS2PS();
 
 	void PutTSPacket(const uint8_t *Buffer);
+
+	int Pid(void) const { return m_Pid; }
 };
 
-void PutPES(uint8_t *Buffer, int Size, void *Data) {
+void PutPES(uint8_t *Buffer, int Size, void *Data) 
+{
 	cTS2PS *This = (cTS2PS*)Data;
-	if (*This->m_ResultCount + Size > RESULTBUFFERSIZE) {
-		esyslog("ERROR: result buffer overflow (%d + %d > %d)", 
-				*This->m_ResultCount, Size, RESULTBUFFERSIZE);
-		Size = RESULTBUFFERSIZE - *This->m_ResultCount;
-	}
-	memcpy(This->m_ResultBuffer + *This->m_ResultCount, Buffer, Size);
-	*This->m_ResultCount += Size;
+	int n = This->m_ResultBuffer->Put(Buffer, Size);
+	if (n != Size)
+		esyslog("ERROR: result buffer overflow, dropped %d out of %d byte", Size - n, Size);
 }
 
-cTS2PS::cTS2PS(uint8_t *ResultBuffer, int *ResultCount, uint8_t AudioCid, 
-		bool PS) {
+cTS2PS::cTS2PS(cRingBufferLinear *ResultBuffer, int Pid, uint8_t AudioCid)
+{
 	m_ResultBuffer = ResultBuffer;
-	m_ResultCount = ResultCount;
+	m_Pid = Pid;
 
-	init_ipack(&m_Ipack, IPACKS, PutPES, PS);
+	init_ipack(&m_Ipack, IPACKS, PutPES, false);
 	m_Ipack.cid = AudioCid;
 	m_Ipack.data = (void*)this;
 }
 
-cTS2PS::~cTS2PS() {
+cTS2PS::~cTS2PS() 
+{
+	free_ipack(&m_Ipack);
 }
 
-void cTS2PS::PutTSPacket(const uint8_t *Buffer) {
+void cTS2PS::PutTSPacket(const uint8_t *Buffer) 
+{
   if (!Buffer)
      return;
 
@@ -68,37 +71,140 @@ void cTS2PS::PutTSPacket(const uint8_t *Buffer) {
   instant_repack((uint8_t*)(Buffer + 4 + off), TS_SIZE - 4 - off, &m_Ipack);
 }
 
-cTS2PSRemux::cTS2PSRemux(int VPid, int APid1, int APid2, int DPid1, 
-		int DPid2, bool PS) {
-	m_VPid  = VPid;
-	m_APid1 = APid1;
-	m_APid2 = APid2;
-	m_DPid1 = DPid1;
-	m_DPid2 = DPid2;
-  m_VRemux  =         new cTS2PS(m_ResultBuffer, &m_ResultCount, 0x00, PS);
-  m_ARemux1 =         new cTS2PS(m_ResultBuffer, &m_ResultCount, 0xC0, PS);
-  m_ARemux2 = APid2 ? new cTS2PS(m_ResultBuffer, &m_ResultCount, 0xC1, PS) 
-	                  : NULL;
-  m_DRemux1 = DPid1 ? new cTS2PS(m_ResultBuffer, &m_ResultCount, 0x00, PS) 
-	                  : NULL;
-  //XXX don't yet know how to tell apart primary and secondary DD data...
-  m_DRemux2 = /*XXX m_DPid2 ? new cTS2PS(m_ResultBuffer, &m_ResultCount, 
-			0x00, PS) : XXX*/ NULL;
+cTS2PSRemux::cTS2PSRemux(int VPid, const int *APids, const int *DPids, const int *SPids):
+		m_NumTracks(0),
+		m_ResultBuffer(new cRingBufferLinear(WRITERBUFSIZE, IPACKS)),
+		m_ResultSkipped(0),
+		m_Skipped(0),
+		m_Synced(false),
+		m_IsRadio(VPid == 0 || VPid == 1 || VPid == 0x1FFF)
+{
+	m_ResultBuffer->SetTimeouts(0, 100);
+
+	if (VPid)
+		m_Remux[m_NumTracks++] = new cTS2PS(m_ResultBuffer, VPid);
+	if (APids) {
+		int n = 0;
+		while (*APids && m_NumTracks < MAXTRACKS && n < MAXAPIDS)
+			m_Remux[m_NumTracks++] = new cTS2PS(m_ResultBuffer, *APids++, 0xC0 + n++);
+	}
+	if (DPids) {
+		int n = 0;
+		while (*DPids && m_NumTracks < MAXTRACKS && n < MAXDPIDS)
+			m_Remux[m_NumTracks++] = new cTS2PS(m_ResultBuffer, *DPids++, 0x80 + n++);
+	}
 }
 
 cTS2PSRemux::~cTS2PSRemux() {
-	if (m_DRemux2) delete m_DRemux2;
-	if (m_DRemux1) delete m_DRemux1;
-	if (m_ARemux2) delete m_ARemux2;
-	delete m_ARemux1;
-	delete m_VRemux;
+	for (int i = 0; i < m_NumTracks; ++i)
+		delete m_Remux[i];
+	delete m_ResultBuffer;
+}
+
+int cTS2PSRemux::Put(const uchar *Data, int Count)
+{
+	int used = 0;
+
+	// Make sure we are looking at a TS packet:
+	while (Count > TS_SIZE) {
+		if (Data[0] == TS_SYNC_BYTE && Data[TS_SIZE] == TS_SYNC_BYTE)
+			break;
+		Data++;
+		Count--;
+		used++;
+	}
+	if (used)
+		esyslog("ERROR: m_Skipped %d byte to sync on TS packet", used);
+
+	// Convert incoming TS data into multiplexed PS:
+
+	for (int i = 0; i < Count; i += TS_SIZE) {
+		if (Count - i < TS_SIZE)
+			break;
+		if (Data[i] != TS_SYNC_BYTE)
+			break;
+		if (m_ResultBuffer->Free() < 2 * IPACKS)
+			break; // A cTS2PS might write one full packet and also a small rest
+		int pid = GetPid(Data + i + 1);
+		if (Data[i + 3] & 0x10) { // got payload
+			for (int t = 0; t < m_NumTracks; t++) {
+				if (m_Remux[t]->Pid() == pid) {
+					m_Remux[t]->PutTSPacket(Data + i);
+					break;
+				}
+			}
+		}
+		used += TS_SIZE;
+	}
+
+	// Check if we're getting anywhere here:
+	if (!m_Synced && m_Skipped >= 0)
+		m_Skipped += used;
+
+	return used;
 }
 
-void cTS2PSRemux::PutTSPacket(int Pid, const uint8_t *Data) {
-	if      (Pid == m_VPid)               m_VRemux->PutTSPacket(Data);
-	else if (Pid == m_APid1)              m_ARemux1->PutTSPacket(Data);
-	else if (Pid == m_APid2 && m_ARemux2) m_ARemux2->PutTSPacket(Data);
-	else if (Pid == m_DPid1 && m_DRemux1) m_DRemux1->PutTSPacket(Data);
-	else if (Pid == m_DPid2 && m_DRemux2) m_DRemux2->PutTSPacket(Data);
+uchar *cTS2PSRemux::Get(int &Count)
+{
+	// Remove any previously skipped data from the result buffer:
+
+	if (m_ResultSkipped > 0) {
+		m_ResultBuffer->Del(m_ResultSkipped);
+		m_ResultSkipped = 0;
+	}
+
+	// Special VPID case to enable recording radio channels:
+	if (m_IsRadio) {
+		// Force syncing of radio channels to avoid "no useful data" error
+		m_Synced = true;
+		return m_ResultBuffer->Get(Count);
+	}
+
+	// Check for frame borders:
+	Count = 0;
+	uchar *resultData = NULL;
+	int resultCount = 0;
+	uchar *data = m_ResultBuffer->Get(resultCount);
+	if (data) {
+		for (int i = 0; i < resultCount - 3; i++) {
+			if (data[i] == 0 && data[i + 1] == 0 && data[i + 2] == 1) {
+				int l = 0;
+				uchar StreamType = data[i + 3];
+				if (VIDEO_STREAM_S <= StreamType && StreamType <= VIDEO_STREAM_E) {
+					uchar pt = NO_PICTURE;
+					l = ScanVideoPacket(data, resultCount, i, pt);
+					if (l < 0)
+						return resultData;
+					if (pt != NO_PICTURE) {
+						if (pt < I_FRAME || B_FRAME < pt) {
+							esyslog("ERROR: unknown picture type '%d'", pt);
+						}
+						else if (!m_Synced) {
+							if (pt == I_FRAME) {
+								m_ResultSkipped = i; // will drop everything before this position
+								SetBrokenLink(data + i, l);
+								m_Synced = true;
+							}
+						}
+						else if (Count)
+							return resultData;
+					}
+				} else {
+					l = GetPacketLength(data, resultCount, i);
+					if (l < 0)
+						return resultData;
+				}
+				if (m_Synced) {
+					if (!Count)
+						resultData = data + i;
+					Count += l;
+				} else
+					m_ResultSkipped = i + l;
+				if (l > 0)
+					i += l - 1; // the loop increments, too
+			}
+		}
+	}
+	return resultData;
 }
 
diff --git a/remux/ts2ps.h b/remux/ts2ps.h
index 4e43ed2..334215a 100644
--- a/remux/ts2ps.h
+++ b/remux/ts2ps.h
@@ -2,21 +2,28 @@
 #define VDR_STREAMDEV_TS2PESREMUX_H
 
 #include "remux/tsremux.h"
+#include <vdr/remux.h>
+#include <vdr/ringbuffer.h>
 
 class cTS2PS;
 
 class cTS2PSRemux: public cTSRemux {
 private:
-	int m_VPid, m_APid1, m_APid2, m_DPid1, m_DPid2;
-	cTS2PS *m_VRemux, *m_ARemux1, *m_ARemux2, *m_DRemux1, *m_DRemux2;
-
-protected:	
-	virtual void PutTSPacket(int Pid, const uint8_t *Data);
-
+	int                m_NumTracks;
+	cTS2PS            *m_Remux[MAXTRACKS];
+	cRingBufferLinear *m_ResultBuffer;
+	int                m_ResultSkipped;
+	int                m_Skipped;
+	bool               m_Synced;
+	bool               m_IsRadio;
+	
 public:
-	cTS2PSRemux(int VPid, int APid1, int APid2, int DPid1, int DPid2, 
-			bool PS = false);
+	cTS2PSRemux(int VPid, const int *Apids, const int *Dpids, const int *Spids);
 	virtual ~cTS2PSRemux();
+
+	int Put(const uchar *Data, int Count);
+	uchar *Get(int &Count);
+	void Del(int Count) { m_ResultBuffer->Del(Count); }
 };
 
 #endif // VDR_STREAMDEV_TS2PESREMUX_H
diff --git a/remux/tsremux.c b/remux/tsremux.c
index 665c8ff..6be5245 100644
--- a/remux/tsremux.c
+++ b/remux/tsremux.c
@@ -1,185 +1,59 @@
 #include "remux/tsremux.h"
 
-// from VDR's remux.c
-#define MAXNONUSEFULDATA (10*1024*1024)
 #define SC_PICTURE 0x00  // "picture header"
-#define VIDEO_STREAM_S   0xE0
 
-cTSRemux::cTSRemux(bool Sync) {
-	m_ResultCount = 0;
-	m_ResultDelivered = 0;
-	m_Synced = false;
-	m_Skipped = 0;
-	m_Sync = Sync;
+void cTSRemux::SetBrokenLink(uchar *Data, int Length)
+{
+  if (Length > 9 && Data[0] == 0 && Data[1] == 0 && Data[2] == 1 && (Data[3] & 0xF0) == VIDEO_STREAM_S) {
+     for (int i = Data[8] + 9; i < Length - 7; i++) { // +9 to skip video packet header
+         if (Data[i] == 0 && Data[i + 1] == 0 && Data[i + 2] == 1 && Data[i + 3] == 0xB8) {
+            if (!(Data[i + 7] & 0x40)) // set flag only if GOP is not closed
+               Data[i + 7] |= 0x20;
+            return;
+            }
+         }
+     dsyslog("SetBrokenLink: no GOP header found in video packet");
+     }
+  else
+     dsyslog("SetBrokenLink: no video packet in frame");
 }
 
-cTSRemux::~cTSRemux(void) {
+int cTSRemux::GetPid(const uchar *Data)
+{
+  return (((uint16_t)Data[0] & PID_MASK_HI) << 8) | (Data[1] & 0xFF);
 }
 
-uchar *cTSRemux::Process(const uchar *Data, int &Count, int &Result) {
-  // Remove any previously delivered data from the result buffer:
-  if (m_ResultDelivered) {
-    if (m_ResultDelivered < m_ResultCount)
-      memmove(m_ResultBuffer, m_ResultBuffer + m_ResultDelivered, m_ResultCount 
-					- m_ResultDelivered);
-    m_ResultCount -= m_ResultDelivered;
-    m_ResultDelivered = 0;
-	}
-
-  int used = 0;
-  
-	// Make sure we are looking at a TS packet:
-  while (Count > TS_SIZE) {
-		if (Data[0] == 0x47 && Data[TS_SIZE] == 0x47)
-			break;
-    Data++;
-    Count--;
-    used++;
-  }
-  if (used)
-    esyslog("ERROR: skipped %d byte to sync on TS packet", used);
-  
-	// Convert incoming TS data
-  for (int i = 0; i < Count; i += TS_SIZE) {
-    if (Count - i < TS_SIZE)
-      break;
-    if (Data[i] != 0x47)
-      break;
-    int pid = get_pid((uint8_t*)(Data + i + 1));
-    if (Data[i + 3] & 0x10) // got payload
-			PutTSPacket(pid, Data + i);
-    /*if      (pid == m_VPid)               m_VRemux->ConvertTSPacket(Data + i);
-         else if (pid == m_APid1)              m_ARemux1->ConvertTSPacket(Data + i);
-         else if (pid == m_APid2 && m_ARemux2) m_ARemux2->ConvertTSPacket(Data + i);
-         else if (pid == m_DPid1 && m_DRemux1) m_DRemux1->ConvertTSPacket(Data + i);
-         else if (pid == m_DPid2 && m_DRemux2) m_DRemux2->ConvertTSPacket(Data + i);*/
-    used += TS_SIZE;
-    if (m_ResultCount > (int)sizeof(m_ResultBuffer) / 2)
-      break;
-  }
-  Count = used;
-  
-	// When we don't need to sync, we don't need to sync :-)
-  if (!m_Sync) {
-    Result = m_ResultDelivered = m_ResultCount;
-    return Result ? m_ResultBuffer : NULL;
-  }
-  
-	// Check if we're getting anywhere here:
-
-  if (!m_Synced && m_Skipped >= 0) {
-     if (m_Skipped > MAXNONUSEFULDATA) {
-        esyslog("ERROR: no useful data seen within %d byte of video stream", m_Skipped);
-        m_Skipped = -1;
-        //if (exitOnFailure)
-           //cThread::EmergencyExit(true);
-        }
-     else
-        m_Skipped += Count;
-     }
-
-  // Check for frame borders:
-
-  if (m_ResultCount > 0) {
-     for (int i = 0; i < m_ResultCount; i++) {
-         if (m_ResultBuffer[i] == 0 && m_ResultBuffer[i + 1] == 0 && m_ResultBuffer[i + 2] == 1) {
-            switch (m_ResultBuffer[i + 3]) {
-              case VIDEO_STREAM_S ... VIDEO_STREAM_E:
-                   {
-                     uchar pt = NO_PICTURE;
-                     int l = ScanVideoPacket(m_ResultBuffer, m_ResultCount, i, pt);
-                     if (l < 0)
-                        return NULL; // no useful data found, wait for more
-                     if (pt != NO_PICTURE) {
-                        if (pt < I_FRAME || B_FRAME < pt)
-                           esyslog("ERROR: unknown picture type '%d'", pt);
-                        else if (!m_Synced) {
-                           if (pt == I_FRAME) {
-                              m_ResultDelivered = i; // will drop everything before this position
-                              SetBrokenLink(m_ResultBuffer + i, l);
-                              m_Synced = true;
-                              }
-                           else {
-                              m_ResultDelivered = i + l; // will drop everything before and including this packet
-                              return NULL;
-                              }
-                           }
-                        }
-                     if (m_Synced) {
-                        Result = l;
-                        uchar *p = m_ResultBuffer + m_ResultDelivered;
-                        m_ResultDelivered += l;
-                        return p;
-                        }
-                     else {
-                        m_ResultDelivered = i + l; // will drop everything before and including this packet
-                        return NULL;
-                        }
-                   }
-                   break;
-              case PRIVATE_STREAM1:
-              case AUDIO_STREAM_S ... AUDIO_STREAM_E:
-                   {
-                     int l = GetPacketLength(m_ResultBuffer, m_ResultCount, i);
-                     if (l < 0)
-                        return NULL; // no useful data found, wait for more
-                     if (m_Synced) {
-                        Result = l;
-                        uchar *p = m_ResultBuffer + m_ResultDelivered;
-                        m_ResultDelivered += l;
-                        return p;
-                        }
-                     else {
-                        m_ResultDelivered = i + l; // will drop everything before and including this packet
-                        return NULL;
-                        }
-                   }
-                   break;
-              }
-            }
-         }
-     }
-  return NULL; // no useful data found, wait for more
+int cTSRemux::GetPacketLength(const uchar *Data, int Count, int Offset)
+{
+  // Returns the length of the packet starting at Offset, or -1 if Count is
+  // too small to contain the entire packet.
+  int Length = (Offset + 5 < Count) ? (Data[Offset + 4] << 8) + Data[Offset + 5] + 6 : -1;
+  if (Length > 0 && Offset + Length <= Count)
+     return Length;
+  return -1;
 }
 
-int cTSRemux::ScanVideoPacket(const uchar *Data, int Count, int Offset, uchar &PictureType) {
+int cTSRemux::ScanVideoPacket(const uchar *Data, int Count, int Offset, uchar &PictureType)
+{
   // Scans the video packet starting at Offset and returns its length.
   // If the return value is -1 the packet was not completely in the buffer.
-
   int Length = GetPacketLength(Data, Count, Offset);
-  if (Length > 0 && Offset + Length <= Count) {
-     int i = Offset + 8; // the minimum length of the video packet header
-     i += Data[i] + 1;   // possible additional header bytes
-     for (; i < Offset + Length; i++) {
-         if (Data[i] == 0 && Data[i + 1] == 0 && Data[i + 2] == 1) {
-            switch (Data[i + 3]) {
-              case SC_PICTURE: PictureType = (Data[i + 5] >> 3) & 0x07;
-                               return Length;
-              }
+  if (Length > 0) {
+     if (Length >= 8) {
+        int i = Offset + 8; // the minimum length of the video packet header
+        i += Data[i] + 1;   // possible additional header bytes
+        for (; i < Offset + Length - 5; i++) {
+            if (Data[i] == 0 && Data[i + 1] == 0 && Data[i + 2] == 1) {
+               switch (Data[i + 3]) {
+                 case SC_PICTURE: PictureType = (Data[i + 5] >> 3) & 0x07;
+                                  return Length;
+                 }
+               }
             }
-         }
+        }
      PictureType = NO_PICTURE;
      return Length;
      }
   return -1;
 }
 
-int cTSRemux::GetPacketLength(const uchar *Data, int Count, int Offset) {
-  // Returns the entire length of the packet starting at offset, or -1 in case of error.
-  return (Offset + 5 < Count) ? (Data[Offset + 4] << 8) + Data[Offset + 5] + 6 : -1;
-}
-
-void cTSRemux::SetBrokenLink(uchar *Data, int Length) {
-  if (Length > 9 && Data[0] == 0 && Data[1] == 0 && Data[2] == 1 && (Data[3] & VIDEO_STREAM_S) == VIDEO_STREAM_S) {
-     for (int i = Data[8] + 9; i < Length - 7; i++) { // +9 to skip video packet header
-         if (Data[i] == 0 && Data[i + 1] == 0 && Data[i + 2] == 1 && Data[i + 3] == 0xB8) {
-            if (!(Data[i + 7] & 0x40)) // set flag only if GOP is not closed
-               Data[i + 7] |= 0x20;
-            return;
-            }
-         }
-     dsyslog("SetBrokenLink: no GOP header found in video packet");
-     }
-  else
-     dsyslog("SetBrokenLink: no video packet in frame");
-}
diff --git a/remux/tsremux.h b/remux/tsremux.h
index a48e5b1..f7e4e09 100644
--- a/remux/tsremux.h
+++ b/remux/tsremux.h
@@ -8,15 +8,13 @@
 
 class cTSRemux {
 protected:
-  uchar m_ResultBuffer[RESULTBUFFERSIZE];
+  /*uchar m_ResultBuffer[RESULTBUFFERSIZE];
 	int m_ResultCount;
 	int m_ResultDelivered;
 	int m_Synced;
 	int m_Skipped;
 	int m_Sync;
 
-  int GetPacketLength(const uchar *Data, int Count, int Offset);
-  int ScanVideoPacket(const uchar *Data, int Count, int Offset, uchar &PictureType);
 
 	virtual void PutTSPacket(int Pid, const uint8_t *Data) = 0;
 
@@ -24,9 +22,12 @@ public:
 	cTSRemux(bool Sync = true);
 	virtual ~cTSRemux();
 	
-	virtual uchar *Process(const uchar *Data, int &Count, int &Result);
+	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 ScanVideoPacket(const uchar *Data, int Count, int Offset, uchar &PictureType);
 };
 
 #endif // VDR_STREAMDEV_TSREMUX_H