pmt: differentiate between data and decoder demux

[enigma2.git] / lib / dvb / pmt.cpp

diff --git a/lib/dvb/pmt.cpp b/lib/dvb/pmt.cpp
index 6b2c835c51e427643fef831a03c110d2daebe19c..8c56589c710f6163fc1cca43943c6c5b056382e1 100644 (file)
--- a/lib/dvb/pmt.cpp
+++ b/lib/dvb/pmt.cpp
@@ -4,24 +4,23 @@
 #include <lib/dvb/dvb.h>
 #include <lib/dvb/metaparser.h>
 #include <lib/dvb_ci/dvbci.h>
+#include <lib/dvb/epgcache.h>
 #include <dvbsi++/ca_program_map_section.h>
 #include <dvbsi++/descriptor_tag.h>
 #include <dvbsi++/iso639_language_descriptor.h>
 #include <dvbsi++/stream_identifier_descriptor.h>
 
-eDVBServicePMTHandler::eDVBServicePMTHandler(int record)
+eDVBServicePMTHandler::eDVBServicePMTHandler()
        :m_ca_servicePtr(0)
 {
-       m_record = record;
+       m_use_decode_demux = 0;
        eDVBResourceManager::getInstance(m_resourceManager);
        CONNECT(m_PMT.tableReady, eDVBServicePMTHandler::PMTready);
        CONNECT(m_PAT.tableReady, eDVBServicePMTHandler::PATready);
-       eDebug("new PMT handler record: %d", m_record);
 }
 
 eDVBServicePMTHandler::~eDVBServicePMTHandler()
 {
-       eDebug("delete PMT handler record: %d", m_record);
        if (m_ca_servicePtr)
        {
                eDebug("unregister caservice");
@@ -43,7 +42,7 @@ void eDVBServicePMTHandler::channelStateChanged(iDVBChannel *channel)
                && (state == iDVBChannel::state_ok) && (!m_demux))
        {
                if (m_channel)
-                       if (m_channel->getDemux(m_demux, m_record ? 0 : iDVBChannel::capDecode))
+                       if (m_channel->getDemux(m_demux, (!m_use_decode_demux) ? 0 : iDVBChannel::capDecode))
                                eDebug("Allocating a demux for now tuned-in channel failed.");
                
                serviceEvent(eventTuned);
@@ -72,6 +71,7 @@ void eDVBServicePMTHandler::PMTready(int error)
        else
        {
                serviceEvent(eventNewProgramInfo);
+               eEPGCache::getInstance()->PMTready(this);
                if (!m_pvr_channel)
                {
                        if(!m_ca_servicePtr)   // don't send campmt to camd.socket for playbacked services
@@ -96,7 +96,6 @@ void eDVBServicePMTHandler::PMTready(int error)
 
 void eDVBServicePMTHandler::PATready(int)
 {
-       eDebug("got PAT");
        ePtr<eTable<ProgramAssociationSection> > ptr;
        if (!m_PAT.getCurrent(ptr))
        {
@@ -126,9 +125,19 @@ int eDVBServicePMTHandler::getProgramInfo(struct program &program)
        program.audioStreams.clear();
        program.pcrPid = -1;
        program.isCrypted = false;
+       program.pmtPid = -1;
 
        if (!m_PMT.getCurrent(ptr))
        {
+               int cached_apid_ac3 = -1;
+               int cached_apid_mpeg = -1;
+               int cached_vpid = -1;
+               if ( m_service && !m_service->cacheEmpty() )
+               {
+                       cached_vpid = m_service->getCachePID(eDVBService::cVPID);
+                       cached_apid_mpeg = m_service->getCachePID(eDVBService::cAC3PID);
+                       cached_apid_ac3 = m_service->getCachePID(eDVBService::cAPID);
+               }
                eDVBTableSpec table_spec;
                ptr->getSpec(table_spec);
                program.pmtPid = table_spec.pid < 0x1fff ? table_spec.pid : -1;
@@ -201,9 +210,26 @@ int eDVBServicePMTHandler::getProgramInfo(struct program &program)
                                        break;
                                }
                                if (isaudio)
-                                       program.audioStreams.push_back(audio);
+                               {
+                                       if ( !program.audioStreams.empty() &&
+                                               ( audio.pid == cached_apid_ac3 || audio.pid == cached_apid_mpeg) )
+                                       {
+                                               program.audioStreams.push_back(program.audioStreams[0]);
+                                               program.audioStreams[0] = audio;
+                                       }
+                                       else
+                                               program.audioStreams.push_back(audio);
+                               }
                                else if (isvideo)
-                                       program.videoStreams.push_back(video);
+                               {
+                                       if ( !program.videoStreams.empty() && video.pid == cached_vpid )
+                                       {
+                                               program.videoStreams.push_back(program.videoStreams[0]);
+                                               program.videoStreams[0] = video;
+                                       }
+                                       else
+                                               program.videoStreams.push_back(video);
+                               }
                                else
                                        continue;
                                if ( cadescriptors > 0 )
@@ -225,8 +251,7 @@ int eDVBServicePMTHandler::getProgramInfo(struct program &program)
                        }
                }
                return 0;
-       }
-       else if ( m_service && !m_service->cacheEmpty() )
+       } else if ( m_service && !m_service->cacheEmpty() )
        {
                int vpid = m_service->getCachePID(eDVBService::cVPID),
                        apid_ac3 = m_service->getCachePID(eDVBService::cAC3PID),
@@ -276,7 +301,7 @@ int eDVBServicePMTHandler::getChannel(eUsePtr<iDVBChannel> &channel)
                return -1;
 }
 
-int eDVBServicePMTHandler::getDemux(ePtr<iDVBDemux> &demux)
+int eDVBServicePMTHandler::getDataDemux(ePtr<iDVBDemux> &demux)
 {
        demux = m_demux;
        if (demux)
@@ -285,6 +310,19 @@ int eDVBServicePMTHandler::getDemux(ePtr<iDVBDemux> &demux)
                return -1;
 }
 
+int eDVBServicePMTHandler::getDecodeDemux(ePtr<iDVBDemux> &demux)
+{
+               /* if we're using the decoding demux as data source
+                  (for example in pvr playbacks), return that one. */
+       if (m_use_decode_demux)
+       {
+               demux = m_demux;
+               return 0;
+       }
+       
+       return m_channel->getDemux(demux, iDVBChannel::capDecode);
+}
+
 int eDVBServicePMTHandler::getPVRChannel(ePtr<iDVBPVRChannel> &pvr_channel)
 {
        pvr_channel = m_pvr_channel;
@@ -294,11 +332,13 @@ int eDVBServicePMTHandler::getPVRChannel(ePtr<iDVBPVRChannel> &pvr_channel)
                return -1;
 }
 
-int eDVBServicePMTHandler::tune(eServiceReferenceDVB &ref)
+int eDVBServicePMTHandler::tune(eServiceReferenceDVB &ref, int use_decode_demux)
 {
        RESULT res;
        m_reference = ref;
        
+       m_use_decode_demux = use_decode_demux;
+       
                /* is this a normal (non PVR) channel? */
        if (ref.path.empty())
        {
@@ -346,6 +386,16 @@ int eDVBServicePMTHandler::tune(eServiceReferenceDVB &ref)
        return res;
 }
 
+void eDVBServicePMTHandler::free()
+{
+       m_PMT.stop();
+       m_PAT.stop();
+       m_service = 0;
+       m_channel = 0;
+       m_pvr_channel = 0;
+       m_demux = 0;
+}
+
 std::map<eServiceReferenceDVB, eDVBCAService*> eDVBCAService::exist;
 
 eDVBCAService::eDVBCAService()