X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/b6592b47fa1932132a67a3beabcce7c96856d211..a4a0916f9569f364bb72e5f18e4035cabea9a7d9:/lib/dvb/dvb.cpp

diff --git a/lib/dvb/dvb.cpp b/lib/dvb/dvb.cpp
index c8feccfd..bd3571a6 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);
@@ -176,7 +177,6 @@ eDVBResourceManager::~eDVBResourceManager()
 {
 	if (instance == this)
 		instance = 0;
-
 }
 
 void eDVBResourceManager::addAdapter(iDVBAdapter *adapter)
@@ -225,15 +225,22 @@ RESULT eDVBResourceManager::allocateDemux(eDVBRegisteredFrontend *fe, ePtr<eDVBA
 	if (i == m_demux.end())
 		return -1;
 		
+	int n=0;
 		/* FIXME: hardware demux policy */
 	if (!(cap & iDVBChannel::capDecode))
-		++i;
+		++i, ++n;
 	
-	for (; i != m_demux.end(); ++i)
+	for (; i != m_demux.end(); ++i, ++n)
 		if ((!i->m_inuse) && ((!fe) || (i->m_adapter == fe->m_adapter)))
 		{
+			if ((cap & iDVBChannel::capDecode) && n)
+				continue;
+			
 			demux = new eDVBAllocatedDemux(i);
-			eDebug("demux found");
+			if (fe)
+				demux->get().setSourceFrontend(fe->m_frontend->getID());
+			else
+				demux->get().setSourcePVR(0);
 			return 0;
 		}
 	eDebug("demux not found");
@@ -288,7 +295,7 @@ RESULT eDVBResourceManager::allocateChannel(const eDVBChannelID &channelid, eUse
 //		return errNoDemux;
 	
 	RESULT res;
-	eDVBChannel *ch;
+	ePtr<eDVBChannel> ch;
 	ch = new eDVBChannel(this, fe);
 
 	ePtr<iDVBFrontend> myfe;
@@ -346,7 +353,6 @@ RESULT eDVBResourceManager::allocatePVRChannel(eUsePtr<iDVBPVRChannel> &channel)
 
 RESULT eDVBResourceManager::addChannel(const eDVBChannelID &chid, eDVBChannel *ch)
 {
-	eDebug("add channel %p", ch);
 	m_active_channels.push_back(active_channel(chid, ch));
 	/* emit */ m_channelAdded(ch);
 	return 0;
@@ -404,7 +410,6 @@ eDVBChannel::~eDVBChannel()
 
 void eDVBChannel::frontendStateChanged(iDVBFrontend*fe)
 {
-	eDebug("fe state changed!");
 	int state, ourstate = 0;
 	
 		/* if we are already in shutdown, don't change state. */
@@ -422,10 +427,14 @@ void eDVBChannel::frontendStateChanged(iDVBFrontend*fe)
 	{
 		eDebug("OURSTATE: tuning");
 		ourstate = state_tuning;
-	} else if (state == iDVBFrontend::stateFailed)
+	} else if (state == iDVBFrontend::stateLostLock)
 	{
-		eDebug("OURSTATE: failed/unavailable");
+		eDebug("OURSTATE: lost lock");
 		ourstate = state_unavailable;
+	} else if (state == iDVBFrontend::stateFailed)
+	{
+		eDebug("OURSTATE: failed");
+		ourstate = state_failed;
 	} else
 		eFatal("state unknown");
 	
@@ -475,7 +484,6 @@ RESULT eDVBChannel::setChannel(const eDVBChannelID &channelid)
 		eDebug("channel not found!");
 		return -ENOENT;
 	}
-	eDebug("allocateChannel: channel found..");
 	
 	if (!m_frontend)
 	{
@@ -486,7 +494,18 @@ RESULT eDVBChannel::setChannel(const eDVBChannelID &channelid)
 	m_channel_id = channelid;
 	m_mgr->addChannel(channelid, this);
 	m_state = state_tuning;
-	return m_frontend->get().tune(*feparm);
+			/* if tuning fails, shutdown the channel immediately. */
+	int res;
+	res = m_frontend->get().tune(*feparm);
+	
+	if (res)
+	{
+		m_state = state_release;
+		m_stateChanged(this);
+		return res;
+	}
+	
+	return 0;
 }
 
 RESULT eDVBChannel::connectStateChange(const Slot1<void,iDVBChannel*> &stateChange, ePtr<eConnection> &connection)
@@ -508,6 +527,7 @@ RESULT eDVBChannel::setCIRouting(const eDVBCIRouting &routing)
 
 RESULT eDVBChannel::getDemux(ePtr<iDVBDemux> &demux, int cap)
 {
+	eDebug("get %d demux", cap);
 	ePtr<eDVBAllocatedDemux> &our_demux = (cap & capDecode) ? m_decoder_demux : m_demux;
 	
 	if (!our_demux)
@@ -515,10 +535,15 @@ RESULT eDVBChannel::getDemux(ePtr<iDVBDemux> &demux, int cap)
 		demux = 0;
 		
 		if (m_mgr->allocateDemux(m_frontend ? (eDVBRegisteredFrontend*)*m_frontend : (eDVBRegisteredFrontend*)0, our_demux, cap))
-			return 0;
+			return -1;
+		
 	}
 	
 	demux = *our_demux;
+	if (cap & capDecode)
+	{
+		our_demux = 0;
+	}
 	return 0;
 }
 
@@ -616,3 +641,61 @@ RESULT eDVBChannel::getCurrentPosition(pts_t &pos)
 	
 	return 0;
 }
+
+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(SEEK_SET, r);
+	m_pvr_thread->resume();
+	return 0;
+}