X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/f7c8d3cf16c62a7be9ebb66a726237736bdd0a8e..06ca56e60c8d3e13d161b481b7716303bd3aa9f2:/lib/dvb/dvb.cpp

diff --git a/lib/dvb/dvb.cpp b/lib/dvb/dvb.cpp
index 86b1965e..09c9f5f6 100644
--- a/lib/dvb/dvb.cpp
+++ b/lib/dvb/dvb.cpp
@@ -42,6 +42,16 @@ DEFINE_REF(eDVBResourceManager);
 
 eDVBResourceManager *eDVBResourceManager::instance;
 
+RESULT eDVBResourceManager::getInstance(ePtr<eDVBResourceManager> &ptr)
+{
+	if (instance)
+	{
+		ptr = instance;
+		return 0;
+	}
+	return -1;
+}
+
 eDVBResourceManager::eDVBResourceManager()
 	:m_releaseCachedChannelTimer(eApp)
 {
@@ -263,12 +273,23 @@ RESULT eDVBResourceManager::allocateDemux(eDVBRegisteredFrontend *fe, ePtr<eDVBA
 	int n=0;
 		/* FIXME: hardware demux policy */
 	if (!(cap & iDVBChannel::capDecode))
-		++i, ++n;
+	{
+		if (m_demux.size() > 2)  /* assumed to be true, otherwise we have lost anyway */
+		{
+			++i, ++n;
+			++i, ++n;
+		}
+	}
 	
 	for (; i != m_demux.end(); ++i, ++n)
-		if ((!i->m_inuse) && ((!fe) || (i->m_adapter == fe->m_adapter)))
+	{
+		int is_decode = n < 2;
+		
+		int in_use = is_decode ? (i->m_demux->getRefCount() != 2) : i->m_inuse;
+		
+		if ((!in_use) && ((!fe) || (i->m_adapter == fe->m_adapter)))
 		{
-			if ((cap & iDVBChannel::capDecode) && n)
+			if ((cap & iDVBChannel::capDecode) && !is_decode)
 				continue;
 			
 			demux = new eDVBAllocatedDemux(i);
@@ -278,6 +299,7 @@ RESULT eDVBResourceManager::allocateDemux(eDVBRegisteredFrontend *fe, ePtr<eDVBA
 				demux->get().setSourcePVR(0);
 			return 0;
 		}
+	}
 	eDebug("demux not found");
 	return -1;
 }
@@ -422,9 +444,16 @@ RESULT eDVBResourceManager::allocatePVRChannel(eUsePtr<iDVBPVRChannel> &channel)
 {
 	ePtr<eDVBAllocatedDemux> demux;
 
+	if (m_cached_channel && m_releaseCachedChannelTimer.isActive())
+	{
+		m_cached_channel_state_changed_conn.disconnect();
+		m_cached_channel=0;
+		m_releaseCachedChannelTimer.stop();
+	}
+
 	eDVBChannel *ch;
 	ch = new eDVBChannel(this, 0);
-	
+
 	channel = ch;
 	return 0;
 }
@@ -507,7 +536,11 @@ bool eDVBResourceManager::canAllocateChannel(const eDVBChannelID &channelid, con
 		if (i->m_channel_id == ignore)
 		{
 			eDVBChannel *channel = (eDVBChannel*) &(*i->m_channel);
-			if (channel == &(*m_cached_channel) ? channel->getUseCount() == 2 : channel->getUseCount() == 1)  // channel only used once..
+			// one eUsePtr<iDVBChannel> is used in eDVBServicePMTHandler
+			// another on eUsePtr<iDVBChannel> is used in the eDVBScan instance used in eDVBServicePMTHandler (for SDT scan)
+			// so we must check here if usecount is 3 (when the channel is equal to the cached channel)
+			// or 2 when the cached channel is not equal to the compared channel
+			if (channel == &(*m_cached_channel) ? channel->getUseCount() == 3 : channel->getUseCount() == 2)  // channel only used once..
 			{
 				ePtr<iDVBFrontend> fe;
 				if (!i->m_channel->getFrontend(fe))
@@ -826,10 +859,12 @@ void eDVBChannel::getNextSourceSpan(off_t current_offset, size_t bytes_read, off
 		if ((current_offset >= i->first) && (current_offset < i->second))
 		{
 			start = current_offset;
-			size = i->second - current_offset;
-			if (size > max)
+				/* max can not exceed max(size_t). i->second - current_offset, however, can. */
+			if ((i->second - current_offset) > max)
 				size = max;
-			eDebug("HIT, %lld < %lld < %lld", i->first, current_offset, i->second);
+			else
+				size = i->second - current_offset;
+			eDebug("HIT, %lld < %lld < %lld, size: %d", i->first, current_offset, i->second, size);
 			return;
 		}
 		if (current_offset < i->first)
@@ -839,9 +874,13 @@ void eDVBChannel::getNextSourceSpan(off_t current_offset, size_t bytes_read, off
 			{
 					/* in normal playback, just start at the next zone. */
 				start = i->first;
-				size = i->second - i->first;
-				if (size > max)
+				
+					/* size is not 64bit! */
+				if ((i->second - i->first) > max)
 					size = max;
+				else
+					size = i->second - i->first;
+
 				eDebug("skip");
 				if (m_skipmode_m < 0)
 				{
@@ -855,12 +894,15 @@ void eDVBChannel::getNextSourceSpan(off_t current_offset, size_t bytes_read, off
 					/* when skipping reverse, however, choose the zone before. */
 				--i;
 				eDebug("skip to previous block, which is %llx..%llx", i->first, i->second);
-				size_t len = i->second - i->first;
-				if (max > len)
-					max = len;
-				start = i->second - max;
-				size = max;
-				eDebug("skipping to %llx, %d", start, size);
+				size_t len;
+				
+				if ((i->second - i->first) > max)
+					len = max;
+				else
+					len = i->second - i->first;
+
+				start = i->second - len;
+				eDebug("skipping to %llx, %d", start, len);
 			}
 			return;
 		}
@@ -971,6 +1013,11 @@ RESULT eDVBChannel::getDemux(ePtr<iDVBDemux> &demux, int cap)
 	
 	demux = *our_demux;
 		/* don't hold a reference to the decoding demux, we don't need it. */
+		
+		/* FIXME: by dropping the 'allocated demux' in favour of the 'iDVBDemux',
+		   the refcount is lost. thus, decoding demuxes are never allocated. 
+		   
+		   this poses a big problem for PiP. */
 	if (cap & capDecode)
 		our_demux = 0;
 	return 0;
@@ -978,6 +1025,9 @@ RESULT eDVBChannel::getDemux(ePtr<iDVBDemux> &demux, int cap)
 
 RESULT eDVBChannel::getFrontend(ePtr<iDVBFrontend> &frontend)
 {
+	frontend = 0;
+	if (!m_frontend)
+		return -ENODEV;
 	frontend = &m_frontend->get();
 	if (frontend)
 		return 0;
@@ -1016,10 +1066,7 @@ RESULT eDVBChannel::playFile(const char *file)
 		eDebug("can't open /dev/misc/pvr - you need to buy the new(!) $$$ box! (%m)"); // or wait for the driver to be improved.
 		return -ENODEV;
 	}
-	
-	m_state = state_ok;
-	m_stateChanged(this);
-	
+
 	m_pvr_thread = new eFilePushThread();
 	m_pvr_thread->enablePVRCommit(1);
 	m_pvr_thread->setScatterGather(this);
@@ -1033,6 +1080,9 @@ RESULT eDVBChannel::playFile(const char *file)
 	}
 	CONNECT(m_pvr_thread->m_event, eDVBChannel::pvrEvent);
 
+	m_state = state_ok;
+	m_stateChanged(this);
+
 	return 0;
 }