X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/37bac1d63115720ca83f064e0e4f5426271fc364..a83125b3e0f7fcfcb06f19e2d1eb086ba792d227:/lib/dvb/demux.cpp

diff --git a/lib/dvb/demux.cpp b/lib/dvb/demux.cpp
index 6d925405..0c736c55 100644
--- a/lib/dvb/demux.cpp
+++ b/lib/dvb/demux.cpp
@@ -247,6 +247,14 @@ eDVBSectionReader::~eDVBSectionReader()
 		::close(fd);
 }
 
+RESULT eDVBSectionReader::setBufferSize(int size)
+{
+	int res=::ioctl(fd, DMX_SET_BUFFER_SIZE, size);
+	if (res < 0)
+		eDebug("eDVBSectionReader DMX_SET_BUFFER_SIZE failed(%m)");
+	return res;
+}
+
 RESULT eDVBSectionReader::start(const eDVBSectionFilterMask &mask)
 {
 	RESULT res;
@@ -279,8 +287,7 @@ RESULT eDVBSectionReader::start(const eDVBSectionFilterMask &mask)
 	memcpy(sct.filter.mask, mask.mask, DMX_FILTER_SIZE);
 #if HAVE_DVB_API_VERSION >= 3
 	memcpy(sct.filter.mode, mask.mode, DMX_FILTER_SIZE);
-	if (::ioctl(fd, DMX_SET_BUFFER_SIZE, 8192*8) < 0)
-		eDebug("DMX_SET_BUFFER_SIZE failed(%m)");
+	setBufferSize(8192*8);
 #endif
 	
 	res = ::ioctl(fd, DMX_SET_FILTER, &sct);
@@ -352,7 +359,7 @@ eDVBPESReader::eDVBPESReader(eDVBDemux *demux, eMainloop *context, RESULT &res):
 	
 	if (m_fd >= 0)
 	{
-		::ioctl(m_fd, DMX_SET_BUFFER_SIZE, 64*1024);
+		setBufferSize(64*1024);
 		::fcntl(m_fd, F_SETFL, O_NONBLOCK);
 		m_notifier = eSocketNotifier::create(context, m_fd, eSocketNotifier::Read, false);
 		CONNECT(m_notifier->activated, eDVBPESReader::data);
@@ -364,6 +371,14 @@ eDVBPESReader::eDVBPESReader(eDVBDemux *demux, eMainloop *context, RESULT &res):
 	}
 }
 
+RESULT eDVBPESReader::setBufferSize(int size)
+{
+	int res = ::ioctl(m_fd, DMX_SET_BUFFER_SIZE, size);
+	if (res < 0)
+		eDebug("eDVBPESReader DMX_SET_BUFFER_SIZE failed(%m)");
+	return res;
+}
+
 DEFINE_REF(eDVBPESReader)
 
 eDVBPESReader::~eDVBPESReader()
@@ -484,7 +499,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);
+	CONNECT(m_thread->m_event, eDVBTSRecorder::filepushEvent);
 #ifndef HAVE_ADD_PID
 	m_demux->m_dvr_busy = 1;
 #endif
@@ -536,8 +551,8 @@ RESULT eDVBTSRecorder::start()
 		eDebug("FAILED to open demux (%s) in ts recoder (%m)", filename);
 		return -3;
 	}
-	
-	::ioctl(m_source_fd, DMX_SET_BUFFER_SIZE, 1024*1024);
+
+	setBufferSize(1024*1024);
 
 	dmx_pes_filter_params flt;
 #if HAVE_DVB_API_VERSION > 3
@@ -577,6 +592,14 @@ RESULT eDVBTSRecorder::start()
 	return 0;
 }
 
+RESULT eDVBTSRecorder::setBufferSize(int size)
+{
+	int res = ::ioctl(m_source_fd, DMX_SET_BUFFER_SIZE, size);
+	if (res < 0)
+		eDebug("eDVBTSRecorder DMX_SET_BUFFER_SIZE failed(%m)");
+	return res;
+}
+
 RESULT eDVBTSRecorder::addPID(int pid)
 {
 	if (m_pids.find(pid) != m_pids.end())
@@ -602,8 +625,6 @@ RESULT eDVBTSRecorder::removePID(int pid)
 
 RESULT eDVBTSRecorder::setTimingPID(int pid, int type)
 {
-	if (m_running)
-		return -1;
 	m_thread->setTimingPID(pid, type);
 	return 0;
 }
@@ -627,18 +648,36 @@ RESULT eDVBTSRecorder::setBoundary(off_t max)
 
 RESULT eDVBTSRecorder::stop()
 {
+	int state=3;
+
 	for (std::map<int,int>::iterator i(m_pids.begin()); i != m_pids.end(); ++i)
 		stopPID(i->first);
 
 	if (!m_running)
 		return -1;
+
+#if HAVE_DVB_API_VERSION >= 5
+	/* workaround for record thread stop */
+	if (::ioctl(m_source_fd, DMX_STOP) < 0)
+		perror("DMX_STOP");
+	else
+		state &= ~1;
+
+	if (::close(m_source_fd) < 0)
+		perror("close");
+	else
+		state &= ~2;
+#endif
+
 	m_thread->stop();
-	
-	close(m_source_fd);
+
+	if (state & 3)
+		::close(m_source_fd);
+
+	m_running = 0;
 	m_source_fd = -1;
-	
+
 	m_thread->stopSaveMetaInformation();
-	
 	return 0;
 }