- missing

2 files changed, 161 insertions, 0 deletions

diff --git a/remux/extern.c b/remux/extern.c
new file mode 100644
index 0000000..50f103a
--- /dev/null
+++ b/remux/extern.c
@@ -0,0 +1,138 @@
+#include "remux/extern.h"
+#include "server/streamer.h"
+#include <vdr/tools.h>
+#include <sys/types.h>
+#include <signal.h>
+
+class cTSExt: public cThread {
+private:
+	cRingBufferLinear *m_ResultBuffer;
+	bool               m_Active;
+	int                m_Process;
+	int                m_Inpipe, m_Outpipe;
+
+protected:
+	virtual void Action(void);
+
+public:
+	cTSExt(cRingBufferLinear *ResultBuffer);
+	virtual ~cTSExt();
+
+	void Put(const uchar *Data, int Count);
+};
+
+cTSExt::cTSExt(cRingBufferLinear *ResultBuffer):
+		m_ResultBuffer(ResultBuffer),
+		m_Active(false),
+		m_Process(0),
+		m_Inpipe(0),
+		m_Outpipe(0)
+{
+	int inpipe[2];
+	int outpipe[2];
+
+	if (pipe(inpipe) == -1) {
+		LOG_ERROR_STR("pipe failed");
+		return;
+	}
+
+	if (pipe(outpipe) == -1) {
+		LOG_ERROR_STR("pipe failed");
+		return;
+	}
+
+	if ((m_Process = fork()) == -1) {
+		LOG_ERROR_STR("fork failed");
+		return;
+	}
+
+	if (m_Process == 0) {
+		// child process
+		dup2(inpipe[0], STDIN_FILENO);
+		close(inpipe[1]);
+		dup2(outpipe[1], STDOUT_FILENO);
+		close(outpipe[0]);
+
+        int MaxPossibleFileDescriptors = getdtablesize();
+        for (int i = STDERR_FILENO + 1; i < MaxPossibleFileDescriptors; i++)
+            close(i); //close all dup'ed filedescriptors
+
+		printf("starting externremux.sh\n");
+		execl("/bin/sh", "sh", "-c", "/root/externremux.sh", NULL);
+		printf("failed externremux.sh\n");
+		_exit(-1);
+	}
+
+	close(inpipe[0]);
+	close(outpipe[1]);
+	m_Inpipe = inpipe[1];
+	m_Outpipe = outpipe[0];
+	Start();
+}
+
+cTSExt::~cTSExt()
+{
+	m_Active = false;
+	Cancel(3);
+	close(m_Outpipe);
+	close(m_Inpipe);
+	kill(m_Process, SIGTERM);
+}
+
+void cTSExt::Action(void)
+{
+	m_Active = true;
+	while (m_Active) {
+		fd_set rfds;
+		struct timeval tv;
+
+		FD_ZERO(&rfds);
+		FD_SET(m_Outpipe, &rfds);
+
+		while (FD_ISSET(m_Outpipe, &rfds)) {
+			tv.tv_sec = 2;
+			tv.tv_usec = 0;
+			if (select(m_Outpipe + 1, &rfds, NULL, NULL, &tv) == -1) {
+				LOG_ERROR_STR("poll failed");
+				break;;
+			}
+
+			if (FD_ISSET(m_Outpipe, &rfds)) {
+				int result;
+				if ((result = m_ResultBuffer->Read(m_Outpipe)) == -1) {
+					LOG_ERROR_STR("read failed");
+					break;
+				}
+			}
+		}
+	}
+	m_Active = false;
+}
+
+
+void cTSExt::Put(const uchar *Data, int Count)
+{
+	if (safe_write(m_Inpipe, Data, Count) == -1) {
+		LOG_ERROR_STR("write failed");
+		return;
+	}
+}
+
+cExternRemux::cExternRemux(int VPid, const int *APids, const int *Dpids, const int *SPids):
+		m_ResultBuffer(new cRingBufferLinear(WRITERBUFSIZE, TS_SIZE * 2)),
+		m_Remux(new cTSExt(m_ResultBuffer))
+{
+	m_ResultBuffer->SetTimeouts(0, 100);
+}
+
+cExternRemux::~cExternRemux()
+{
+	delete m_Remux;
+	delete m_ResultBuffer;
+}
+
+int cExternRemux::Put(const uchar *Data, int Count) 
+{
+	m_Remux->Put(Data, Count);
+	return Count;
+}
diff --git a/remux/extern.h b/remux/extern.h
new file mode 100644
index 0000000..9066680
--- /dev/null
+++ b/remux/extern.h
@@ -0,0 +1,23 @@
+#ifndef VDR_STREAMDEV_EXTERNREMUX_H
+#define VDR_STREAMDEV_EXTERNREMUX_H
+
+#include "remux/tsremux.h"
+#include <vdr/ringbuffer.h>
+
+class cTSExt;
+
+class cExternRemux: public cTSRemux {
+private:
+	cRingBufferLinear *m_ResultBuffer;
+	cTSExt            *m_Remux;
+
+public:
+	cExternRemux(int VPid, const int *APids, const int *Dpids, const int *SPids);
+	virtual ~cExternRemux();
+	
+	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_EXTERNREMUX_H