X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/32e138da53cdc01960e274fc5f242805198f8aea..e7e5b70162a6e74d7ee293495635c79660e0f7a8:/lib/dvb/demux.cpp

diff --git a/lib/dvb/demux.cpp b/lib/dvb/demux.cpp
index 810b10a5..6d925405 100644
--- a/lib/dvb/demux.cpp
+++ b/lib/dvb/demux.cpp
@@ -5,6 +5,13 @@
 #include <unistd.h>
 #include <signal.h>
 
+// #define FUZZING 1
+
+#if FUZZING
+		/* change every 1:FUZZING_PROPABILITY byte */
+#define FUZZING_PROPABILITY 100
+#endif
+
 #if HAVE_DVB_API_VERSION < 3
 #include <ost/dmx.h>
 
@@ -28,6 +35,13 @@
 #define HAVE_ADD_PID
 
 #ifdef HAVE_ADD_PID
+
+#if HAVE_DVB_API_VERSION > 3
+#ifndef DMX_ADD_PID
+#define DMX_ADD_PID		_IOW('o', 51, __u16)
+#define DMX_REMOVE_PID		_IOW('o', 52, __u16)
+#endif
+#else
 #define DMX_ADD_PID              _IO('o', 51)
 #define DMX_REMOVE_PID           _IO('o', 52)
 
@@ -35,6 +49,7 @@ typedef enum {
 	DMX_TAP_TS = 0,
 	DMX_TAP_PES = DMX_PES_OTHER, /* for backward binary compat. */
 } dmx_tap_type_t;
+#endif
 
 #endif
 
@@ -178,6 +193,14 @@ void eDVBSectionReader::data(int)
 	__u8 data[4096]; // max. section size
 	int r;
 	r = ::read(fd, data, 4096);
+#if FUZZING
+	int j;
+	for (j = 0; j < r; ++j)
+	{
+		if (!(rand()%FUZZING_PROPABILITY))
+			data[j] ^= rand();
+	}
+#endif	
 	if(r < 0)
 	{
 		eWarning("ERROR reading section - %m\n");
@@ -243,11 +266,13 @@ RESULT eDVBSectionReader::start(const eDVBSectionFilterMask &mask)
 #else
 	sct.flags   = DMX_IMMEDIATE_START;
 #endif
+#if !FUZZING
 	if (mask.flags & eDVBSectionFilterMask::rfCRC)
 	{
 		sct.flags |= DMX_CHECK_CRC;
 		checkcrc = 1;
 	} else
+#endif
 		checkcrc = 0;
 	
 	memcpy(sct.filter.filter, mask.data, DMX_FILTER_SIZE);
@@ -402,9 +427,10 @@ class eDVBRecordFileThread: public eFilePushThread
 {
 public:
 	eDVBRecordFileThread();
-	void setTimingPID(int pid);
+	void setTimingPID(int pid, int type);
 	
-	void saveTimingInformation(const std::string &filename);
+	void startSaveMetaInformation(const std::string &filename);
+	void stopSaveMetaInformation();
 	int getLastPTS(pts_t &pts);
 protected:
 	int filterRecordData(const unsigned char *data, int len, size_t &current_span_remaining);
@@ -422,14 +448,19 @@ eDVBRecordFileThread::eDVBRecordFileThread()
 	m_current_offset = 0;
 }
 
-void eDVBRecordFileThread::setTimingPID(int pid)
+void eDVBRecordFileThread::setTimingPID(int pid, int type)
+{
+	m_ts_parser.setPid(pid, type);
+}
+
+void eDVBRecordFileThread::startSaveMetaInformation(const std::string &filename)
 {
-	m_ts_parser.setPid(pid);
+	m_stream_info.startSave(filename.c_str());
 }
 
-void eDVBRecordFileThread::saveTimingInformation(const std::string &filename)
+void eDVBRecordFileThread::stopSaveMetaInformation()
 {
-	m_stream_info.save(filename.c_str());
+	m_stream_info.stopSave();
 }
 
 int eDVBRecordFileThread::getLastPTS(pts_t &pts)
@@ -470,12 +501,17 @@ eDVBTSRecorder::~eDVBTSRecorder()
 
 RESULT eDVBTSRecorder::start()
 {
+	std::map<int,int>::iterator i(m_pids.begin());
+
 	if (m_running)
 		return -1;
 	
 	if (m_target_fd == -1)
 		return -2;
 
+	if (i == m_pids.end())
+		return -3;
+
 	char filename[128];
 #ifndef HAVE_ADD_PID
 #if HAVE_DVB_API_VERSION < 3
@@ -504,10 +540,16 @@ RESULT eDVBTSRecorder::start()
 	::ioctl(m_source_fd, DMX_SET_BUFFER_SIZE, 1024*1024);
 
 	dmx_pes_filter_params flt;
+#if HAVE_DVB_API_VERSION > 3
+	flt.pes_type = DMX_PES_OTHER;
+	flt.output  = DMX_OUT_TSDEMUX_TAP;
+#else
 	flt.pes_type = (dmx_pes_type_t)DMX_TAP_TS;
-	flt.pid     = (__u16)-1;
-	flt.input   = DMX_IN_FRONTEND;
 	flt.output  = DMX_OUT_TAP;
+#endif
+	flt.pid     = i->first;
+	++i;
+	flt.input   = DMX_IN_FRONTEND;
 	flt.flags   = 0;
 	int res = ::ioctl(m_source_fd, DMX_SET_PES_FILTER, &flt);
 	if (res)
@@ -520,13 +562,18 @@ RESULT eDVBTSRecorder::start()
 	::ioctl(m_source_fd, DMX_START);
 	
 #endif
+
+	if (m_target_filename != "")
+		m_thread->startSaveMetaInformation(m_target_filename);
 	
 	m_thread->start(m_source_fd, m_target_fd);
 	m_running = 1;
-	
-	for (std::map<int,int>::iterator i(m_pids.begin()); i != m_pids.end(); ++i)
+
+	while (i != m_pids.end()) {
 		startPID(i->first);
-	
+		++i;
+	}
+
 	return 0;
 }
 
@@ -553,11 +600,11 @@ RESULT eDVBTSRecorder::removePID(int pid)
 	return 0;
 }
 
-RESULT eDVBTSRecorder::setTimingPID(int pid)
+RESULT eDVBTSRecorder::setTimingPID(int pid, int type)
 {
 	if (m_running)
 		return -1;
-	m_thread->setTimingPID(pid);
+	m_thread->setTimingPID(pid, type);
 	return 0;
 }
 
@@ -590,8 +637,7 @@ RESULT eDVBTSRecorder::stop()
 	close(m_source_fd);
 	m_source_fd = -1;
 	
-	if (m_target_filename != "")
-		m_thread->saveTimingInformation(m_target_filename + ".ap");
+	m_thread->stopSaveMetaInformation();
 	
 	return 0;
 }
@@ -650,7 +696,12 @@ RESULT eDVBTSRecorder::startPID(int pid)
 	m_pids[pid] = fd;
 #else
 	while(true) {
+#if HAVE_DVB_API_VERSION > 3
+		__u16 p = pid;
+		if (::ioctl(m_source_fd, DMX_ADD_PID, &p) < 0) {
+#else
 		if (::ioctl(m_source_fd, DMX_ADD_PID, pid) < 0) {
+#endif
 			perror("DMX_ADD_PID");
 			if (errno == EAGAIN || errno == EINTR) {
 				eDebug("retry!");
@@ -673,7 +724,12 @@ void eDVBTSRecorder::stopPID(int pid)
 	if (m_pids[pid] != -1)
 	{
 		while(true) {
+#if HAVE_DVB_API_VERSION > 3
+			__u16 p = pid;
+			if (::ioctl(m_source_fd, DMX_REMOVE_PID, &p) < 0) {
+#else
 			if (::ioctl(m_source_fd, DMX_REMOVE_PID, pid) < 0) {
+#endif
 				perror("DMX_REMOVE_PID");
 				if (errno == EAGAIN || errno == EINTR) {
 					eDebug("retry!");