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

diff --git a/lib/dvb/dvb.cpp b/lib/dvb/dvb.cpp
index 6e87585e..b7d278cc 100644
--- a/lib/dvb/dvb.cpp
+++ b/lib/dvb/dvb.cpp
@@ -2,6 +2,7 @@
 #include <lib/base/filepush.h>
 #include <lib/dvb/idvb.h>
 #include <lib/dvb/dvb.h>
+#include <lib/dvb/pmt.h>
 #include <lib/dvb/sec.h>
 
 #include <errno.h>
@@ -82,6 +83,8 @@ eDVBResourceManager::eDVBResourceManager()
 	eDebug("found %d adapter, %d frontends and %d demux", 
 		m_adapter.size(), m_frontend.size(), m_demux.size());
 
+	eDVBCAService::registerChannelCallback(this);
+
 	CONNECT(m_releaseCachedChannelTimer.timeout, eDVBResourceManager::releaseCachedChannel);
 }
 
@@ -248,12 +251,12 @@ void eDVBResourceManager::addAdapter(iDVBAdapter *adapter)
 	}
 }
 
-void eDVBResourceManager::setFrontendSlotInformations(ePyObject list)
+PyObject *eDVBResourceManager::setFrontendSlotInformations(ePyObject list)
 {
 	if (!PyList_Check(list))
 	{
 		PyErr_SetString(PyExc_StandardError, "eDVBResourceManager::setFrontendSlotInformations argument should be a python list");
-		return;
+		return NULL;
 	}
 	if ((unsigned int)PyList_Size(list) != m_frontend.size())
 	{
@@ -261,14 +264,16 @@ void eDVBResourceManager::setFrontendSlotInformations(ePyObject list)
 		sprintf(blasel, "eDVBResourceManager::setFrontendSlotInformations list size incorrect %d frontends avail, but %d entries in slotlist",
 			m_frontend.size(), PyList_Size(list));
 		PyErr_SetString(PyExc_StandardError, blasel);
-		return;
+		return NULL;
 	}
 	int pos=0;
 	for (eSmartPtrList<eDVBRegisteredFrontend>::iterator i(m_frontend.begin()); i != m_frontend.end(); ++i)
 	{
 		ePyObject obj = PyList_GET_ITEM(list, pos++);
-		i->m_frontend->setSlotInfo(obj);
+		if (!i->m_frontend->setSlotInfo(obj))
+			return NULL;
 	}
+	Py_RETURN_NONE;
 }
 
 RESULT eDVBResourceManager::allocateFrontend(ePtr<eDVBAllocatedFrontend> &fe, ePtr<iDVBFrontendParameters> &feparm)
@@ -592,14 +597,41 @@ int eDVBResourceManager::canAllocateFrontend(ePtr<iDVBFrontendParameters> &fepar
 	return bestval;
 }
 
+int tuner_type_channel_default(ePtr<iDVBChannelList> &channellist, const eDVBChannelID &chid)
+{
+	if (channellist)
+	{
+		ePtr<iDVBFrontendParameters> feparm;
+		if (!channellist->getChannelFrontendData(chid, feparm))
+		{
+			int system;
+			if (!feparm->getSystem(system))
+			{
+				switch(system)
+				{
+					case iDVBFrontend::feSatellite:
+						return 50000;
+					case iDVBFrontend::feCable:
+						return 40000;
+					case iDVBFrontend::feTerrestrial:
+						return 30000;
+					default:
+						break;
+				}
+			}
+		}
+	}
+	return 0;
+}
+
 int eDVBResourceManager::canAllocateChannel(const eDVBChannelID &channelid, const eDVBChannelID& ignore)
 {
-	int ret=30000;
+	int ret=0;
 	if (m_cached_channel)
 	{
 		eDVBChannel *cache_chan = (eDVBChannel*)&(*m_cached_channel);
 		if(channelid==cache_chan->getChannelID())
-			return ret;
+			return tuner_type_channel_default(m_list, channelid);
 	}
 
 		/* first, check if a channel is already existing. */
@@ -610,7 +642,7 @@ int eDVBResourceManager::canAllocateChannel(const eDVBChannelID &channelid, cons
 		if (i->m_channel_id == channelid)
 		{
 //			eDebug("found shared channel..");
-			return ret;
+			return tuner_type_channel_default(m_list, channelid);
 		}
 	}
 
@@ -680,14 +712,12 @@ int eDVBResourceManager::canAllocateChannel(const eDVBChannelID &channelid, cons
 	if (!m_list)
 	{
 		eDebug("no channel list set!");
-		ret = 0;
 		goto error;
 	}
 
 	if (m_list->getChannelFrontendData(channelid, feparm))
 	{
 		eDebug("channel not found!");
-		ret = 0;
 		goto error;
 	}
 
@@ -920,6 +950,7 @@ void eDVBChannel::cueSheetEvent(int event)
 				m_skipmode_n = m_skipmode_m = 0;
 			}
 		}
+		ASSERT(m_pvr_thread);
 		m_pvr_thread->setIFrameSearch(m_skipmode_n != 0);
 		eDebug("flush pvr");
 		flushPVR(m_cue->m_decoding_demux);
@@ -1057,7 +1088,7 @@ void eDVBChannel::getNextSourceSpan(off_t current_offset, size_t bytes_read, off
 			pts_t nextap;
 			if (m_tstools.getNextAccessPoint(nextap, now, pts))
 			{
-				pts = now;
+				pts = now - 90000; /* approx. 1s */
 				eDebug("AP relative seeking failed!");
 			} else
 			{
@@ -1102,7 +1133,7 @@ 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 is not 64bit! */
 				if ((i->second - i->first) > max)
 					size = max;
@@ -1123,8 +1154,11 @@ void eDVBChannel::getNextSourceSpan(off_t current_offset, size_t bytes_read, off
 				--i;
 				eDebug("skip to previous block, which is %llx..%llx", i->first, i->second);
 				size_t len;
-				
-				if ((i->second - i->first) > max)
+
+				aligned_start = align(i->first, blocksize);
+				aligned_end = align(i->second, blocksize);
+
+				if ((aligned_end - aligned_start) > max)
 					len = max;
 				else
 					len = aligned_end - aligned_start;
@@ -1132,19 +1166,19 @@ void eDVBChannel::getNextSourceSpan(off_t current_offset, size_t bytes_read, off
 				start = aligned_end - len;
 				eDebug("skipping to %llx, %d", start, len);
 			}
-			
+
 			eDebug("result: %llx, %x (%llx %llx)", start, size, aligned_start, aligned_end);
 			return;
 		}
 	}
-	
+
 	if ((current_offset < -m_skipmode_m) && (m_skipmode_m < 0))
 	{
 		eDebug("reached SOF");
 		m_skipmode_m = 0;
 		m_pvr_thread->sendEvent(eFilePushThread::evtUser);
 	}
-	
+
 	start = current_offset;
 	size = max;