X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/fa4ce6edf7d5ab9852a2ee3c5bea0b32fd704465..139531c95ab1bd9ea0da563d43a3d8677b937aa9:/lib/dvb/demux.cpp

diff --git a/lib/dvb/demux.cpp b/lib/dvb/demux.cpp
index 0fbd6fbd..810b10a5 100644
--- a/lib/dvb/demux.cpp
+++ b/lib/dvb/demux.cpp
@@ -76,11 +76,12 @@ RESULT eDVBDemux::setSourceFrontend(int fenum)
 {
 #if HAVE_DVB_API_VERSION >= 3
 	int fd = openDemux();
-	
 	int n = DMX_SOURCE_FRONT0 + fenum;
 	int res = ::ioctl(fd, DMX_SET_SOURCE, &n);
 	if (res)
 		eDebug("DMX_SET_SOURCE failed! - %m");
+	else
+		source = fenum;
 	::close(fd);
 	return res;
 #endif
@@ -93,6 +94,7 @@ RESULT eDVBDemux::setSourcePVR(int pvrnum)
 	int fd = openDemux();
 	int n = DMX_SOURCE_DVR0 + pvrnum;
 	int res = ::ioctl(fd, DMX_SET_SOURCE, &n);
+	source = -1;
 	::close(fd);
 	return res;
 #endif
@@ -144,12 +146,15 @@ RESULT eDVBDemux::getSTC(pts_t &pts, int num)
 	
 	if (ioctl(fd, DMX_GET_STC, &stc) < 0)
 	{
+		eDebug("DMX_GET_STC failed!");
 		::close(fd);
 		return -1;
 	}
 	
 	pts = stc.stc;
 	
+	eDebug("DMX_GET_STC - %lld", pts);
+	
 	::close(fd);
 	return 0;
 }
@@ -201,7 +206,7 @@ eDVBSectionReader::eDVBSectionReader(eDVBDemux *demux, eMainloop *context, RESUL
 	
 	if (fd >= 0)
 	{
-		notifier=new eSocketNotifier(context, fd, eSocketNotifier::Read, false);
+		notifier=eSocketNotifier::create(context, fd, eSocketNotifier::Read, false);
 		CONNECT(notifier->activated, eDVBSectionReader::data);
 		res = 0;
 	} else
@@ -215,8 +220,6 @@ DEFINE_REF(eDVBSectionReader)
 
 eDVBSectionReader::~eDVBSectionReader()
 {
-	if (notifier)
-		delete notifier;
 	if (fd >= 0)
 		::close(fd);
 }
@@ -302,7 +305,7 @@ void eDVBPESReader::data(int)
 			return;
 		if(r < 0)
 		{
-			if (errno == EAGAIN) /* ok */
+			if (errno == EAGAIN || errno == EINTR) /* ok */
 				return;
 			eWarning("ERROR reading PES (fd=%d) - %m", m_fd);
 			return;
@@ -326,7 +329,7 @@ eDVBPESReader::eDVBPESReader(eDVBDemux *demux, eMainloop *context, RESULT &res):
 	{
 		::ioctl(m_fd, DMX_SET_BUFFER_SIZE, 64*1024);
 		::fcntl(m_fd, F_SETFL, O_NONBLOCK);
-		m_notifier = new eSocketNotifier(context, m_fd, eSocketNotifier::Read, false);
+		m_notifier = eSocketNotifier::create(context, m_fd, eSocketNotifier::Read, false);
 		CONNECT(m_notifier->activated, eDVBPESReader::data);
 		res = 0;
 	} else
@@ -340,8 +343,6 @@ DEFINE_REF(eDVBPESReader)
 
 eDVBPESReader::~eDVBPESReader()
 {
-	if (m_notifier)
-		delete m_notifier;
 	if (m_fd >= 0)
 		::close(m_fd);
 }
@@ -404,12 +405,14 @@ public:
 	void setTimingPID(int pid);
 	
 	void saveTimingInformation(const std::string &filename);
+	int getLastPTS(pts_t &pts);
 protected:
-	void filterRecordData(const unsigned char *data, int len);
+	int filterRecordData(const unsigned char *data, int len, size_t &current_span_remaining);
 private:
 	eMPEGStreamParserTS m_ts_parser;
 	eMPEGStreamInformation m_stream_info;
 	off_t m_current_offset;
+	pts_t m_last_pcr; /* very approximate.. */
 	int m_pid;
 };
 
@@ -429,11 +432,18 @@ void eDVBRecordFileThread::saveTimingInformation(const std::string &filename)
 	m_stream_info.save(filename.c_str());
 }
 
-void eDVBRecordFileThread::filterRecordData(const unsigned char *data, int len)
+int eDVBRecordFileThread::getLastPTS(pts_t &pts)
+{
+	return m_ts_parser.getLastPTS(pts);
+}
+
+int eDVBRecordFileThread::filterRecordData(const unsigned char *data, int len, size_t &current_span_remaining)
 {
 	m_ts_parser.parseData(m_current_offset, data, len);
 	
 	m_current_offset += len;
+	
+	return len;
 }
 
 DEFINE_REF(eDVBTSRecorder);
@@ -443,6 +453,7 @@ eDVBTSRecorder::eDVBTSRecorder(eDVBDemux *demux): m_demux(demux)
 	m_running = 0;
 	m_target_fd = -1;
 	m_thread = new eDVBRecordFileThread();
+  CONNECT(m_thread->m_event, eDVBTSRecorder::filepushEvent);
 #ifndef HAVE_ADD_PID
 	m_demux->m_dvr_busy = 1;
 #endif
@@ -585,6 +596,18 @@ RESULT eDVBTSRecorder::stop()
 	return 0;
 }
 
+RESULT eDVBTSRecorder::getCurrentPCR(pts_t &pcr)
+{
+	if (!m_running)
+		return 0;
+	if (!m_thread)
+		return 0;
+		/* XXX: we need a lock here */
+
+			/* we don't filter PCR data, so just use the last received PTS, which is not accurate, but better than nothing */
+	return m_thread->getLastPTS(pcr);
+}
+
 RESULT eDVBTSRecorder::connectEvent(const Slot1<void,int> &event, ePtr<eConnection> &conn)
 {
 	conn = new eConnection(this, m_event.connect(event));
@@ -626,10 +649,17 @@ RESULT eDVBTSRecorder::startPID(int pid)
 	}
 	m_pids[pid] = fd;
 #else
-	if (::ioctl(m_source_fd, DMX_ADD_PID, pid))
-		perror("DMX_ADD_PID");
-	else
-		m_pids[pid] = 1;
+	while(true) {
+		if (::ioctl(m_source_fd, DMX_ADD_PID, pid) < 0) {
+			perror("DMX_ADD_PID");
+			if (errno == EAGAIN || errno == EINTR) {
+				eDebug("retry!");
+				continue;
+			}
+		} else
+			m_pids[pid] = 1;
+		break;
+	}
 #endif
 	return 0;
 }
@@ -642,9 +672,27 @@ void eDVBTSRecorder::stopPID(int pid)
 #else
 	if (m_pids[pid] != -1)
 	{
-		if (::ioctl(m_source_fd, DMX_REMOVE_PID, pid))
-			perror("DMX_REMOVE_PID");
+		while(true) {
+			if (::ioctl(m_source_fd, DMX_REMOVE_PID, pid) < 0) {
+				perror("DMX_REMOVE_PID");
+				if (errno == EAGAIN || errno == EINTR) {
+					eDebug("retry!");
+					continue;
+				}
+			}
+			break;
+		}
 	}
 #endif
 	m_pids[pid] = -1;
 }
+
+void eDVBTSRecorder::filepushEvent(int event)
+{
+	switch (event)
+	{
+	case eFilePushThread::evtWriteError:
+		m_event(eventWriteError);
+		break;
+	}
+}