X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/0f70a75ff64c1583ccd620631462499f9d5fbc26..457ccb7da5d147837110a6be85b7f2d041e1dcba:/lib/service/servicedvb.cpp diff --git a/lib/service/servicedvb.cpp b/lib/service/servicedvb.cpp index a36b3008..9cfe7073 100644 --- a/lib/service/servicedvb.cpp +++ b/lib/service/servicedvb.cpp @@ -5,7 +5,7 @@ #include #include #include - +#include // access to python config #include #include #include @@ -242,7 +242,6 @@ RESULT eDVBPVRServiceOfflineOperations::deleteFromDisk(int simulate) if (!eraser) eDebug("FATAL !! can't get background file eraser"); - /* TODO: deferred removing.. */ for (std::list::iterator i(res.begin()); i != res.end(); ++i) { eDebug("Removing %s...", i->c_str()); @@ -986,7 +985,7 @@ RESULT eDVBServicePlay::isCurrentlySeekable() return m_is_pvr || m_timeshift_active; } -RESULT eDVBServicePlay::frontendStatusInfo(ePtr &ptr) +RESULT eDVBServicePlay::frontendInfo(ePtr &ptr) { ptr = this; return 0; @@ -998,6 +997,12 @@ RESULT eDVBServicePlay::info(ePtr &ptr) return 0; } +RESULT eDVBServicePlay::audioChannel(ePtr &ptr) +{ + ptr = this; + return 0; +} + RESULT eDVBServicePlay::audioTracks(ePtr &ptr) { ptr = this; @@ -1124,8 +1129,9 @@ int eDVBServicePlay::getInfo(int w) } } return -1; - case sIsCrypted: return program.isCrypted; + case sIsCrypted: return program.isCrypted(); case sVideoPID: if (program.videoStreams.empty()) return -1; return program.videoStreams[0].pid; + case sVideoType: if (program.videoStreams.empty()) return -1; return program.videoStreams[0].type; case sAudioPID: if (program.audioStreams.empty()) return -1; return program.audioStreams[m_current_audio_stream].pid; case sPCRPID: return program.pcrPid; case sPMTPID: return program.pmtPid; @@ -1197,6 +1203,8 @@ RESULT eDVBServicePlay::getTrackInfo(struct iAudioTrackInfo &info, unsigned int info.m_description = "MPEG"; else if (program.audioStreams[i].type == eDVBServicePMTHandler::audioStream::atAC3) info.m_description = "AC3"; + else if (program.audioStreams[i].type == eDVBServicePMTHandler::audioStream::atAAC) + info.m_description = "AAC"; else if (program.audioStreams[i].type == eDVBServicePMTHandler::audioStream::atDTS) info.m_description = "DTS"; else @@ -1239,12 +1247,12 @@ int eDVBServicePlay::selectAudioStream(int i) { if (program.audioStreams[i].type == eDVBAudio::aMPEG) { - m_dvb_service->setCachePID(eDVBService::cAPID, program.audioStreams[i].pid); - m_dvb_service->setCachePID(eDVBService::cAC3PID, -1); + m_dvb_service->setCacheEntry(eDVBService::cAPID, program.audioStreams[i].pid); + m_dvb_service->setCacheEntry(eDVBService::cAC3PID, -1); } else { - m_dvb_service->setCachePID(eDVBService::cAPID, -1); - m_dvb_service->setCachePID(eDVBService::cAC3PID, program.audioStreams[i].pid); + m_dvb_service->setCacheEntry(eDVBService::cAPID, -1); + m_dvb_service->setCacheEntry(eDVBService::cAC3PID, program.audioStreams[i].pid); } } @@ -1253,10 +1261,26 @@ int eDVBServicePlay::selectAudioStream(int i) return 0; } -int eDVBServicePlay::getFrontendInfo(int w) +int eDVBServicePlay::getCurrentChannel() +{ + int curChannel = m_dvb_service->getCacheEntry(eDVBService::cACHANNEL); + return curChannel == -1 ? STEREO : curChannel; +} + +RESULT eDVBServicePlay::selectChannel(int i) +{ + if (i < iAudioChannelSelection::LEFT || i > iAudioChannelSelection::RIGHT) + i = -1; // Stereo + if (m_dvb_service->getCacheEntry(eDVBService::cACHANNEL) != i) + { + m_dvb_service->setCacheEntry(eDVBService::cACHANNEL, i); + if (m_decoder) + m_decoder->setAudioChannel(i); + } +} + +int eDVBServiceBase::getFrontendInfo(int w) { - if (m_is_pvr) - return 0; eUsePtr channel; if(m_service_handler.getChannel(channel)) return 0; @@ -1266,7 +1290,7 @@ int eDVBServicePlay::getFrontendInfo(int w) return fe->readFrontendData(w); } -PyObject *eDVBServicePlay::getFrontendData(bool original) +PyObject *eDVBServiceBase::getFrontendData(bool original) { PyObject *ret=0; @@ -1526,6 +1550,8 @@ void eDVBServicePlay::switchToLive() m_cue = 0; m_decoder = 0; m_decode_demux = 0; + m_teletext_parser = 0; + /* free the timeshift service handler, we need the resources */ m_service_handler_timeshift.free(); m_timeshift_active = 0; @@ -1542,6 +1568,7 @@ void eDVBServicePlay::switchToTimeshift() m_decode_demux = 0; m_decoder = 0; + m_teletext_parser = 0; m_timeshift_active = 1; @@ -1557,9 +1584,15 @@ void eDVBServicePlay::switchToTimeshift() void eDVBServicePlay::updateDecoder() { - int vpid = -1, apid = -1, apidtype = -1, pcrpid = -1, tpid = -1; + int vpid = -1, vpidtype = -1, apid = -1, apidtype = -1, pcrpid = -1, tpid = -1, achannel = -1; eDVBServicePMTHandler &h = m_timeshift_active ? m_service_handler_timeshift : m_service_handler; + bool defaultac3=false; + std::string default_ac3; + + if (!ePythonConfigQuery::getConfigValue("config.av.defaultac3", default_ac3)) + defaultac3 = default_ac3 == "enable"; + eDVBServicePMTHandler::program program; if (h.getProgramInfo(program)) eDebug("getting program info failed."); @@ -1574,7 +1607,10 @@ void eDVBServicePlay::updateDecoder() i != program.videoStreams.end(); ++i) { if (vpid == -1) + { vpid = i->pid; + vpidtype = i->type; + } if (i != program.videoStreams.begin()) eDebugNoNewLine(", "); eDebugNoNewLine("%04x", i->pid); @@ -1589,10 +1625,13 @@ void eDVBServicePlay::updateDecoder() i(program.audioStreams.begin()); i != program.audioStreams.end(); ++i) { - if (apid == -1) + if (apid == -1 || (apidtype == eDVBAudio::aMPEG && defaultac3)) { - apid = i->pid; - apidtype = i->type; + if ( apid == -1 || (i->type != eDVBAudio::aMPEG) ) + { + apid = i->pid; + apidtype = i->type; + } } if (i != program.audioStreams.begin()) eDebugNoNewLine(", "); @@ -1604,6 +1643,7 @@ void eDVBServicePlay::updateDecoder() pcrpid = program.pcrPid; eDebug(", and the text pid is %04x", program.textPid); tpid = program.textPid; + achannel = program.audioChannel; } if (!m_decoder) @@ -1613,21 +1653,34 @@ void eDVBServicePlay::updateDecoder() m_decode_demux->getMPEGDecoder(m_decoder, m_is_primary); if (m_cue) m_cue->setDecodingDemux(m_decode_demux, m_decoder); +#ifdef INTERNAL_TELETEXT + m_teletext_parser = new eDVBTeletextParser(m_decode_demux); +#endif } if (m_decoder) { - m_decoder->setVideoPID(vpid); + m_decoder->setVideoPID(vpid, vpidtype); m_current_audio_stream = 0; m_decoder->setAudioPID(apid, apidtype); if (!(m_is_pvr || m_timeshift_active || !m_is_primary)) m_decoder->setSyncPCR(pcrpid); else m_decoder->setSyncPCR(-1); +#ifndef INTERNAL_TELETEXT m_decoder->setTextPID(tpid); +#else + if (m_teletext_parser) + m_teletext_parser->start(tpid); +#endif + if (!m_is_primary) m_decoder->setTrickmode(1); + m_decoder->start(); + + m_decoder->setAudioChannel(achannel); + // how we can do this better? // update cache pid when the user changed the audio track or video track // TODO handling of difference audio types.. default audio types.. @@ -1637,17 +1690,18 @@ void eDVBServicePlay::updateDecoder() { if (apidtype == eDVBAudio::aMPEG) { - m_dvb_service->setCachePID(eDVBService::cAPID, apid); - m_dvb_service->setCachePID(eDVBService::cAC3PID, -1); + m_dvb_service->setCacheEntry(eDVBService::cAPID, apid); + m_dvb_service->setCacheEntry(eDVBService::cAC3PID, -1); } else { - m_dvb_service->setCachePID(eDVBService::cAPID, -1); - m_dvb_service->setCachePID(eDVBService::cAC3PID, apid); + m_dvb_service->setCacheEntry(eDVBService::cAPID, -1); + m_dvb_service->setCacheEntry(eDVBService::cAC3PID, apid); } - m_dvb_service->setCachePID(eDVBService::cVPID, vpid); - m_dvb_service->setCachePID(eDVBService::cPCRPID, pcrpid); - m_dvb_service->setCachePID(eDVBService::cTPID, tpid); + m_dvb_service->setCacheEntry(eDVBService::cVPID, vpid); + m_dvb_service->setCacheEntry(eDVBService::cVTYPE, vpidtype == eDVBVideo::MPEG2 ? -1 : vpidtype); + m_dvb_service->setCacheEntry(eDVBService::cPCRPID, pcrpid); + m_dvb_service->setCacheEntry(eDVBService::cTPID, tpid); } } }