X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/c2f1a638b1eb861d1a8e97530adfcefd65ff6ac0..6a1fc924eb21f22f9b522df233a9a98d4c5bdca7:/lib/dvb/dvb.cpp

diff --git a/lib/dvb/dvb.cpp b/lib/dvb/dvb.cpp
index 13ae224c..0201b337 100644
--- a/lib/dvb/dvb.cpp
+++ b/lib/dvb/dvb.cpp
@@ -9,6 +9,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include <fcntl.h>
+#include <sys/ioctl.h>
 
 DEFINE_REF(eDVBRegisteredFrontend);
 DEFINE_REF(eDVBRegisteredDemux);
@@ -232,6 +233,10 @@ RESULT eDVBResourceManager::allocateDemux(eDVBRegisteredFrontend *fe, ePtr<eDVBA
 		if ((!i->m_inuse) && ((!fe) || (i->m_adapter == fe->m_adapter)))
 		{
 			demux = new eDVBAllocatedDemux(i);
+			if (fe)
+				demux->get().setSourceFrontend(fe->m_frontend->getID());
+			else
+				demux->get().setSourcePVR(0);
 			eDebug("demux found");
 			return 0;
 		}
@@ -617,13 +622,60 @@ RESULT eDVBChannel::getCurrentPosition(pts_t &pos)
 	return 0;
 }
 
-RESULT eDVBChannel::seekTo(pts_t &pts)
+RESULT eDVBChannel::seekTo(int relative, pts_t &pts)
 {
+	int bitrate = m_tstools.calcBitrate(); /* in bits/s */
+	
+	if (bitrate == -1)
+		return -1;
+	
+	if (relative)
+	{
+		pts_t now;
+		if (getCurrentPosition(now))
+		{
+			eDebug("seekTo: getCurrentPosition failed!");
+			return -1;
+		}
+		pts += now;
+	}
+	
+	if (pts < 0)
+		pts = 0;
+	
+	off_t offset = (pts * (pts_t)bitrate) / 8ULL / 90000ULL;
+	
+	seekToPosition(offset);
+	return 0;
+}
+
+RESULT eDVBChannel::seekToPosition(const off_t &r)
+{
+			/* when seeking, we have to ensure that all buffers are flushed.
+			   there are basically 3 buffers:
+			   a.) the filepush's internal buffer
+			   b.) the PVR buffer (before demux)
+			   c.) the ratebuffer (after demux)
+			   
+			   it's important to clear them in the correct order, otherwise
+			   the ratebuffer (for example) would immediately refill from
+			   the not-yet-flushed PVR buffer.
+			*/
+	eDebug("eDVBChannel: seekToPosition .. %llx", r);
 	m_pvr_thread->pause();
+
+		/* flush internal filepush buffer */
+	m_pvr_thread->flush();
+
+		/* HACK: flush PVR buffer */
+	::ioctl(m_pvr_fd_dst, 0);
+	
+		/* flush ratebuffers (video, audio) */
 	if (m_decoder_demux)
 		m_decoder_demux->get().flush();
+
 		/* demux will also flush all decoder.. */
-//	m_pvr_thread->seek(pts);
+	m_pvr_thread->seek(SEEK_SET, r);
 	m_pvr_thread->resume();
+	return 0;
 }
-