X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/7290c1872d4f6ac37c8090e1cc2e95aeddf6e814..80a43808a277db246fd679ab7e84b5b932bacfd7:/lib/dvb/dvb.cpp

diff --git a/lib/dvb/dvb.cpp b/lib/dvb/dvb.cpp
index b1e8ad54..dcdac7ef 100644
--- a/lib/dvb/dvb.cpp
+++ b/lib/dvb/dvb.cpp
@@ -304,7 +304,7 @@ RESULT eDVBResourceManager::allocateChannel(const eDVBChannelID &channelid, eUse
 		if(channelid==cache_chan->getChannelID())
 		{
 			eDebug("use cached_channel");
-			channel=m_cached_channel;
+			channel = m_cached_channel;
 			return 0;
 		}
 		m_cached_channel=0;
@@ -363,6 +363,9 @@ RESULT eDVBResourceManager::allocateRawChannel(eUsePtr<iDVBChannel> &channel, in
 {
 	ePtr<eDVBAllocatedFrontend> fe;
 
+	if (m_cached_channel)
+		m_cached_channel=0;
+
 	if (allocateFrontendByIndex(fe, frontend_index))
 		return errNoFrontend;
 	
@@ -377,7 +380,10 @@ RESULT eDVBResourceManager::allocateRawChannel(eUsePtr<iDVBChannel> &channel, in
 RESULT eDVBResourceManager::allocatePVRChannel(eUsePtr<iDVBPVRChannel> &channel)
 {
 	ePtr<eDVBAllocatedDemux> demux;
-	
+
+	if (m_cached_channel)
+		m_cached_channel=0;
+
 	eDVBChannel *ch;
 	ch = new eDVBChannel(this, 0);
 	
@@ -434,6 +440,14 @@ bool eDVBResourceManager::canAllocateFrontend(ePtr<iDVBFrontendParameters> &fepa
 
 bool eDVBResourceManager::canAllocateChannel(const eDVBChannelID &channelid, const eDVBChannelID& ignore)
 {
+	bool ret=true;
+	if (m_cached_channel)
+	{
+		eDVBChannel *cache_chan = (eDVBChannel*)&(*m_cached_channel);
+		if(channelid==cache_chan->getChannelID())
+			return ret;
+	}
+
 		/* first, check if a channel is already existing. */
 //	eDebug("allocate channel.. %04x:%04x", channelid.transport_stream_id.get(), channelid.original_network_id.get());
 	for (std::list<active_channel>::iterator i(m_active_channels.begin()); i != m_active_channels.end(); ++i)
@@ -442,11 +456,12 @@ bool eDVBResourceManager::canAllocateChannel(const eDVBChannelID &channelid, con
 		if (i->m_channel_id == channelid)
 		{
 //			eDebug("found shared channel..");
-			return true;
+			return ret;
 		}
 	}
 
-	int *decremented_fe_usecount=NULL;
+	int *decremented_cached_channel_fe_usecount=NULL,
+		*decremented_fe_usecount=NULL;
 
 	for (std::list<active_channel>::iterator i(m_active_channels.begin()); i != m_active_channels.end(); ++i)
 	{
@@ -465,6 +480,8 @@ bool eDVBResourceManager::canAllocateChannel(const eDVBChannelID &channelid, con
 						{
 							--ii->m_inuse;
 							decremented_fe_usecount = &ii->m_inuse;
+							if (channel == &(*m_cached_channel))
+								decremented_cached_channel_fe_usecount = decremented_fe_usecount;
 							break;
 						}
 					}
@@ -474,23 +491,55 @@ bool eDVBResourceManager::canAllocateChannel(const eDVBChannelID &channelid, con
 		}
 	}
 
+	if (!decremented_cached_channel_fe_usecount)
+	{
+		if (m_cached_channel)
+		{
+			eDVBChannel *channel = (eDVBChannel*) &(*m_cached_channel);
+			if (channel->getUseCount() == 1)
+			{
+				ePtr<iDVBFrontend> fe;
+				if (!channel->getFrontend(fe))
+				{
+					for (eSmartPtrList<eDVBRegisteredFrontend>::iterator ii(m_frontend.begin()); ii != m_frontend.end(); ++ii)
+					{
+						if ( &(*fe) == &(*ii->m_frontend) )
+						{
+							--ii->m_inuse;
+							decremented_cached_channel_fe_usecount = &ii->m_inuse;
+							break;
+						}
+					}
+				}
+			}
+		}
+	}
+	else
+		decremented_cached_channel_fe_usecount=NULL;
+
+	ePtr<iDVBFrontendParameters> feparm;
+
 	if (!m_list)
 	{
 		eDebug("no channel list set!");
-		return false;
+		ret = false;
+		goto error;
 	}
 
-	ePtr<iDVBFrontendParameters> feparm;
 	if (m_list->getChannelFrontendData(channelid, feparm))
 	{
 		eDebug("channel not found!");
-		return false;
+		ret = false;
+		goto error;
 	}
 
-	bool ret = canAllocateFrontend(feparm);
+	ret = canAllocateFrontend(feparm);
 
+error:
 	if (decremented_fe_usecount)
 		++(*decremented_fe_usecount);
+	if (decremented_cached_channel_fe_usecount)
+		++(*decremented_cached_channel_fe_usecount);
 
 	return ret;
 }
@@ -542,8 +591,18 @@ void eDVBChannel::frontendStateChanged(iDVBFrontend*fe)
 		ourstate = state_tuning;
 	} else if (state == iDVBFrontend::stateLostLock)
 	{
-		eDebug("OURSTATE: lost lock");
-		ourstate = state_unavailable;
+			/* on managed channels, we try to retune in order to re-acquire lock. */
+		if (m_feparm)
+		{
+			eDebug("OURSTATE: lost lock, trying to retune");
+			ourstate = state_tuning;
+			m_frontend->get().tune(*m_feparm);
+		} else
+			/* on unmanaged channels, we don't do this. the client will do this. */
+		{
+			eDebug("OURSTATE: lost lock, unavailable now.")
+			ourstate = state_unavailable;
+		}
 	} else if (state == iDVBFrontend::stateFailed)
 	{
 		eDebug("OURSTATE: failed");
@@ -558,6 +617,17 @@ void eDVBChannel::frontendStateChanged(iDVBFrontend*fe)
 	}
 }
 
+void eDVBChannel::pvrEvent(int event)
+{
+	switch (event)
+	{
+	case eFilePushThread::evtEOF:
+		eDebug("eDVBChannel: End of file!");
+		m_event(this, evtEOF);
+		break;
+	}
+}
+
 void eDVBChannel::AddUse()
 {
 	++m_use_count;
@@ -592,6 +662,7 @@ RESULT eDVBChannel::setChannel(const eDVBChannelID &channelid, ePtr<iDVBFrontend
 			/* if tuning fails, shutdown the channel immediately. */
 	int res;
 	res = m_frontend->get().tune(*feparm);
+	m_feparm = feparm;
 	
 	if (res)
 	{
@@ -609,6 +680,12 @@ RESULT eDVBChannel::connectStateChange(const Slot1<void,iDVBChannel*> &stateChan
 	return 0;
 }
 
+RESULT eDVBChannel::connectEvent(const Slot2<void,iDVBChannel*,int> &event, ePtr<eConnection> &connection)
+{
+	connection = new eConnection((iDVBChannel*)this, m_event.connect(event));
+	return 0;
+}
+
 RESULT eDVBChannel::getState(int &state)
 {
 	state = m_state;
@@ -622,7 +699,6 @@ 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)
@@ -631,14 +707,12 @@ RESULT eDVBChannel::getDemux(ePtr<iDVBDemux> &demux, int cap)
 		
 		if (m_mgr->allocateDemux(m_frontend ? (eDVBRegisteredFrontend*)*m_frontend : (eDVBRegisteredFrontend*)0, our_demux, cap))
 			return -1;
-		
 	}
 	
 	demux = *our_demux;
+		/* don't hold a reference to the decoding demux, we don't need it. */
 	if (cap & capDecode)
-	{
 		our_demux = 0;
-	}
 	return 0;
 }
 
@@ -674,7 +748,7 @@ RESULT eDVBChannel::playFile(const char *file)
 		return -ENODEV;
 	}
 	
-	m_pvr_fd_src = open(file, O_RDONLY);
+	m_pvr_fd_src = open(file, O_RDONLY|O_LARGEFILE);
 	if (m_pvr_fd_src < 0)
 	{
 		eDebug("can't open PVR m_pvr_fd_src file %s (%m)", file);
@@ -686,7 +760,9 @@ RESULT eDVBChannel::playFile(const char *file)
 	m_stateChanged(this);
 	
 	m_pvr_thread = new eFilePushThread();
+	m_pvr_thread->enablePVRCommit(1);
 	m_pvr_thread->start(m_pvr_fd_src, m_pvr_fd_dst);
+	CONNECT(m_pvr_thread->m_event, eDVBChannel::pvrEvent);
 
 	return 0;
 }
@@ -696,7 +772,7 @@ RESULT eDVBChannel::getLength(pts_t &len)
 	return m_tstools.calcLen(len);
 }
 
-RESULT eDVBChannel::getCurrentPosition(iDVBDemux *decoding_demux, pts_t &pos)
+RESULT eDVBChannel::getCurrentPosition(iDVBDemux *decoding_demux, pts_t &pos, int mode)
 {
 	if (!decoding_demux)
 		return -1;
@@ -712,7 +788,8 @@ RESULT eDVBChannel::getCurrentPosition(iDVBDemux *decoding_demux, pts_t &pos)
 	
 	pts_t now;
 	
-	r = decoding_demux->getSTC(now);
+			/* TODO: this is a gross hack. */
+	r = decoding_demux->getSTC(now, mode ? 128 : 0);
 
 	if (r)
 	{
@@ -747,7 +824,7 @@ RESULT eDVBChannel::seekTo(iDVBDemux *decoding_demux, int relative, pts_t &pts)
 	if (relative)
 	{
 		pts_t now;
-		if (getCurrentPosition(decoding_demux, now))
+		if (getCurrentPosition(decoding_demux, now, 0))
 		{
 			eDebug("seekTo: getCurrentPosition failed!");
 			return -1;