X-Git-Url: http://code.vuplus.com/gitweb/?a=blobdiff_plain;f=lib%2Fdvb%2Fpmt.cpp;h=25577f0e0d34b6aa73435afde868acedfa90246c;hb=01dff0278ed0eeb8cee776c8ef9d6fcf0d6229fb;hp=4ad4e76f0a962e51a1c5b4b296756d430f46e7e6;hpb=b306f065ed4804026e03eb11099ec5c2269cd7cc;p=vuplus_dvbapp

diff --git a/lib/dvb/pmt.cpp b/lib/dvb/pmt.cpp
index 4ad4e76..25577f0 100644
--- a/lib/dvb/pmt.cpp
+++ b/lib/dvb/pmt.cpp
@@ -18,12 +18,14 @@
 #include <dvbsi++/teletext_descriptor.h>
 #include <dvbsi++/video_stream_descriptor.h>
 #include <dvbsi++/registration_descriptor.h>
+#include <dvbsi++/ac3_descriptor.h>
 
 eDVBServicePMTHandler::eDVBServicePMTHandler()
 	:m_ca_servicePtr(0), m_dvb_scan(0), m_decode_demux_num(0xFF), m_no_pat_entry_delay(eTimer::create())
 {
 	m_use_decode_demux = 0;
 	m_pmt_pid = -1;
+	m_isstreamclient = false;
 	eDVBResourceManager::getInstance(m_resourceManager);
 	CONNECT(m_PMT.tableReady, eDVBServicePMTHandler::PMTready);
 	CONNECT(m_PAT.tableReady, eDVBServicePMTHandler::PATready);
@@ -44,8 +46,15 @@ void eDVBServicePMTHandler::channelStateChanged(iDVBChannel *channel)
 		&& (state == iDVBChannel::state_ok) && (!m_demux))
 	{
 		if (m_channel)
-			if (m_channel->getDemux(m_demux, (!m_use_decode_demux) ? 0 : iDVBChannel::capDecode))
+		{
+			if (m_pvr_demux_tmp)
+			{
+				m_demux = m_pvr_demux_tmp;
+				m_pvr_demux_tmp = NULL;
+			}
+			else if (m_channel->getDemux(m_demux, (!m_use_decode_demux) ? 0 : iDVBChannel::capDecode))
 				eDebug("Allocating %s-decoding a demux for now tuned-in channel failed.", m_use_decode_demux ? "" : "non-");
+		}
 		
 		serviceEvent(eventTuned);
 		
@@ -101,7 +110,7 @@ void eDVBServicePMTHandler::PMTready(int error)
 		if (!m_pvr_channel) // don't send campmt to camd.socket for playbacked services
 		{
 			eEPGCache::getInstance()->PMTready(this);
-			if(!m_ca_servicePtr)
+			if(!m_ca_servicePtr && !m_isstreamclient)
 			{
 				int demuxes[2] = {0,0};
 				uint8_t tmp;
@@ -464,9 +473,28 @@ int eDVBServicePMTHandler::getProgramInfo(program &program)
 									audio.type = audioStream::atAACHE; // MPEG4-AAC
 									break;
 								case AC3_DESCRIPTOR:
-									isaudio = 1;
+								{    
+									Ac3Descriptor *ac = (Ac3Descriptor*)(*desc);
+
+									isaudio = 1; 
 									audio.type = audioStream::atAC3;
+
+									if(ac->getAc3TypeFlag())
+									{    
+
+										uint8_t ac3type = ac->getAc3Type();
+										if( ( ac3type & 0x80 ) && ( (ac3type<<5) == 0xA0 || (ac3type<<5) == 0xC0) ) // From EN-300 468 v1.7.1 Table D.1
+											audio.type = audioStream::atDDP;
+									}    
+
+									break;
+								}     
+								case ENHANCED_AC3_DESCRIPTOR:
+									isaudio = 1; 
+									audio.type = audioStream::atDDP;
 									break;
+     
+
 								case REGISTRATION_DESCRIPTOR: /* some services don't have a separate AC3 descriptor */
 								{
 									RegistrationDescriptor *d = (RegistrationDescriptor*)(*desc);
@@ -755,12 +783,13 @@ int eDVBServicePMTHandler::tune(eServiceReferenceDVB &ref, int use_decode_demux,
 	return tuneExt(ref, use_decode_demux, s, NULL, cue, simulate, service);
 }
 
-int eDVBServicePMTHandler::tuneExt(eServiceReferenceDVB &ref, int use_decode_demux, ePtr<iTsSource> &source, const char *streaminfo_file, eCueSheet *cue, bool simulate, eDVBService *service)
+int eDVBServicePMTHandler::tuneExt(eServiceReferenceDVB &ref, int use_decode_demux, ePtr<iTsSource> &source, const char *streaminfo_file, eCueSheet *cue, bool simulate, eDVBService *service, bool isstreamclient)
 {
 	RESULT res=0;
 	m_reference = ref;
 	m_use_decode_demux = use_decode_demux;
 	m_no_pat_entry_delay->stop();
+	m_isstreamclient = isstreamclient;
 
 		/* use given service as backup. This is used for timeshift where we want to clone the live stream using the cache, but in fact have a PVR channel */
 	m_service = service;
@@ -804,7 +833,9 @@ int eDVBServicePMTHandler::tuneExt(eServiceReferenceDVB &ref, int use_decode_dem
 		}
 		eDebug("alloc PVR");
 			/* allocate PVR */
-		res = m_resourceManager->allocatePVRChannel(m_pvr_channel);
+		eDVBChannelID chid;
+		if (m_isstreamclient) ref.getChannelID(chid);
+		res = m_resourceManager->allocatePVRChannel(chid, m_pvr_channel);
 		if (res)
 			eDebug("allocatePVRChannel failed!\n");
 		m_channel = m_pvr_channel;
@@ -842,7 +873,18 @@ int eDVBServicePMTHandler::tuneExt(eServiceReferenceDVB &ref, int use_decode_dem
 		if (m_pvr_channel)
 		{
 			m_pvr_channel->setCueSheet(cue);
-			if (source)
+
+			if (m_pvr_channel->getDemux(m_pvr_demux_tmp, (!m_use_decode_demux) ? 0 : iDVBChannel::capDecode))
+			{
+				if (m_isstreamclient)
+				{
+					eDebug("Allocating %s-decoding a demux for http channel failed.", m_use_decode_demux ? "" : "non-");
+					return -2;
+				}
+				else
+					eDebug("Allocating %s-decoding a demux for PVR channel failed.", m_use_decode_demux ? "" : "non-");
+			}
+			else if (source)
 				m_pvr_channel->playSource(source, streaminfo_file);
 			else
 				m_pvr_channel->playFile(ref.path.c_str());