X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/bfcc745e958a34a457086f003013ca9b69959dea..2d7f4e102ee3231bdb600b0ac7e2d8f898034b78:/lib/service/servicedvb.cpp diff --git a/lib/service/servicedvb.cpp b/lib/service/servicedvb.cpp index 0dbc8be0..44a22ea9 100644 --- a/lib/service/servicedvb.cpp +++ b/lib/service/servicedvb.cpp @@ -102,7 +102,7 @@ extern void PutToDict(ePyObject &dict, const char*key, const char *value); // de void PutSatelliteDataToDict(ePyObject &dict, eDVBFrontendParametersSatellite &feparm) { - PutToDict(dict, "type", "DVB-S"); + PutToDict(dict, "tuner_type", "DVB-S"); PutToDict(dict, "frequency", feparm.frequency); PutToDict(dict, "symbol_rate", feparm.symbol_rate); PutToDict(dict, "orbital_position", feparm.orbital_position); @@ -120,7 +120,7 @@ void PutSatelliteDataToDict(ePyObject &dict, eDVBFrontendParametersSatellite &fe void PutTerrestrialDataToDict(ePyObject &dict, eDVBFrontendParametersTerrestrial &feparm) { - PutToDict(dict, "type", "DVB-T"); + PutToDict(dict, "tuner_type", "DVB-T"); PutToDict(dict, "frequency", feparm.frequency); PutToDict(dict, "bandwidth", feparm.bandwidth); PutToDict(dict, "code_rate_lp", feparm.code_rate_LP); @@ -134,7 +134,7 @@ void PutTerrestrialDataToDict(ePyObject &dict, eDVBFrontendParametersTerrestrial void PutCableDataToDict(ePyObject &dict, eDVBFrontendParametersCable &feparm) { - PutToDict(dict, "type", "DVB-C"); + PutToDict(dict, "tuner_type", "DVB-C"); PutToDict(dict, "frequency", feparm.frequency); PutToDict(dict, "symbol_rate", feparm.symbol_rate); PutToDict(dict, "modulation", feparm.modulation); @@ -370,13 +370,17 @@ int eStaticServiceDVBPVRInformation::getLength(const eServiceReference &ref) struct stat s; stat(ref.path.c_str(), &s); - if (tstools.openFile(ref.path.c_str())) + if (tstools.openFile(ref.path.c_str(), 1)) return 0; /* check if cached data is still valid */ if (m_parser.m_data_ok && (s.st_size == m_parser.m_filesize) && (m_parser.m_length)) return m_parser.m_length / 90000; + /* open again, this time with stream info */ + if (tstools.openFile(ref.path.c_str())) + return 0; + /* otherwise, re-calc length and update meta file */ pts_t len; if (tstools.calcLen(len)) @@ -502,6 +506,7 @@ RESULT eDVBPVRServiceOfflineOperations::getListOfFilenames(std::list extensions; extensions.push_back("ts"); + extensions.push_back("trp"); sc->addServiceFactory(eServiceFactoryDVB::id, this, extensions); } @@ -1001,7 +1007,10 @@ void eDVBServicePlay::serviceEventTimeshift(int event) break; case eDVBServicePMTHandler::eventEOF: if ((!m_is_paused) && (m_skipmode >= 0)) + { + eDebug("timeshift EOF, so let's go live"); switchToLive(); + } break; } } @@ -1124,6 +1133,9 @@ RESULT eDVBServicePlay::pause(ePtr &ptr) RESULT eDVBServicePlay::setSlowMotion(int ratio) { + ASSERT(ratio); /* The API changed: instead of calling setSlowMotion(0), call play! */ + eDebug("eDVBServicePlay::setSlowMotion(%d)", ratio); + setFastForward_internal(0); if (m_decoder) return m_decoder->setSlowMotion(ratio); else @@ -1131,6 +1143,13 @@ RESULT eDVBServicePlay::setSlowMotion(int ratio) } RESULT eDVBServicePlay::setFastForward(int ratio) +{ + eDebug("eDVBServicePlay::setFastForward(%d)", ratio); + ASSERT(ratio); + return setFastForward_internal(ratio); +} + +RESULT eDVBServicePlay::setFastForward_internal(int ratio) { int skipmode, ffratio; @@ -1163,8 +1182,13 @@ RESULT eDVBServicePlay::setFastForward(int ratio) if (!m_decoder) return -1; - - return m_decoder->setFastForward(ffratio); + + if (ffratio == 0) + return 0; /* return m_decoder->play(); is done in caller*/ + else if (ffratio != 1) + return m_decoder->setFastForward(ffratio); + else + return m_decoder->setTrickmode(); } RESULT eDVBServicePlay::seek(ePtr &ptr) @@ -1192,20 +1216,24 @@ RESULT eDVBServicePlay::getLength(pts_t &len) RESULT eDVBServicePlay::pause() { - if (!m_is_paused && m_decoder) + eDebug("eDVBServicePlay::pause"); + setFastForward_internal(0); + if (m_decoder) { m_is_paused = 1; - return m_decoder->freeze(0); + return m_decoder->pause(); } else return -1; } RESULT eDVBServicePlay::unpause() { - if (m_is_paused && m_decoder) + eDebug("eDVBServicePlay::unpause"); + setFastForward_internal(0); + if (m_decoder) { m_is_paused = 0; - return m_decoder->unfreeze(); + return m_decoder->play(); } else return -1; } @@ -1287,9 +1315,8 @@ RESULT eDVBServicePlay::getPlayPosition(pts_t &pos) RESULT eDVBServicePlay::setTrickmode(int trick) { - if (m_decoder) - m_decoder->setTrickmode(trick); - return 0; + /* currently unimplemented */ + return -1; } RESULT eDVBServicePlay::isCurrentlySeekable() @@ -1575,7 +1602,7 @@ RESULT eDVBServicePlay::selectTrack(unsigned int i) { int ret = selectAudioStream(i); - if (m_decoder->start()) + if (m_decoder->play()) return -5; return ret; @@ -1600,6 +1627,8 @@ RESULT eDVBServicePlay::getTrackInfo(struct iAudioTrackInfo &info, unsigned int 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::atAACHE) + info.m_description = "AAC-HE"; else if (program.audioStreams[i].type == eDVBServicePMTHandler::audioStream::atDTS) info.m_description = "DTS"; else @@ -1655,6 +1684,8 @@ int eDVBServicePlay::selectAudioStream(int i) eDebug("set audio pid failed"); return -4; } + + m_decoder->set(); /* if we are not in PVR mode, timeshift is not active and we are not in pip mode, check if we need to enable the rds reader */ if (!(m_is_pvr || m_timeshift_active || !m_is_primary)) @@ -1849,20 +1880,7 @@ PyObject *eDVBServiceBase::getTransponderData(bool original) { ePtr fe; if(!channel->getFrontend(fe)) - { fe->getTransponderData(ret, original); - ePtr feparm; - channel->getCurrentFrontendParameters(feparm); - if (feparm) - { - eDVBFrontendParametersSatellite osat; - if (!feparm->getDVBS(osat)) - { - PutToDict(ret, "orbital_position", osat.orbital_position); - PutToDict(ret, "polarization", osat.polarisation); - } - } - } } } else @@ -2118,6 +2136,8 @@ void eDVBServicePlay::switchToLive() if (!m_timeshift_active) return; + eDebug("SwitchToLive"); + m_cue = 0; m_decoder = 0; m_decode_demux = 0; @@ -2159,7 +2179,7 @@ void eDVBServicePlay::switchToTimeshift() r.path = m_timeshift_file; m_cue = new eCueSheet(); - m_service_handler_timeshift.tune(r, 1, m_cue); /* use the decoder demux for everything */ + m_service_handler_timeshift.tune(r, 1, m_cue, 0, m_dvb_service); /* use the decoder demux for everything */ eDebug("eDVBServicePlay::switchToTimeshift, in pause mode now."); pause(); @@ -2273,8 +2293,18 @@ void eDVBServicePlay::updateDecoder() } } } - m_decoder->setAC3Delay(ac3_delay == -1 ? 0 : ac3_delay); - m_decoder->setPCMDelay(pcm_delay == -1 ? 0 : pcm_delay); + + std::string config_delay; + int config_delay_int = 0; + if(ePythonConfigQuery::getConfigValue("config.av.generalAC3delay", config_delay) == 0) + config_delay_int = atoi(config_delay.c_str()); + m_decoder->setAC3Delay(ac3_delay == -1 ? config_delay_int : ac3_delay + config_delay_int); + + if(ePythonConfigQuery::getConfigValue("config.av.generalPCMdelay", config_delay) == 0) + config_delay_int = atoi(config_delay.c_str()); + else + config_delay_int = 0; + m_decoder->setPCMDelay(pcm_delay == -1 ? config_delay_int : pcm_delay + config_delay_int); m_decoder->setVideoPID(vpid, vpidtype); selectAudioStream(); @@ -2288,14 +2318,6 @@ void eDVBServicePlay::updateDecoder() m_teletext_parser->start(program.textPid); - if (!m_is_primary) - m_decoder->setTrickmode(1); - - if (m_is_paused) - m_decoder->preroll(); - else - m_decoder->start(); - if (vpid > 0 && vpid < 0x2000) ; else @@ -2305,6 +2327,13 @@ void eDVBServicePlay::updateDecoder() m_decoder->setRadioPic(radio_pic); } +/* if (!m_is_primary) + m_decoder->setTrickmode(); + else */ if (m_is_paused) + m_decoder->pause(); + else + m_decoder->play(); + m_decoder->setAudioChannel(achannel); /* don't worry about non-existing services, nor pvr services */ @@ -2316,7 +2345,7 @@ void eDVBServicePlay::updateDecoder() m_dvb_service->setCacheEntry(eDVBService::cPCRPID, pcrpid); m_dvb_service->setCacheEntry(eDVBService::cTPID, tpid); } - } + } m_have_video_pid = (vpid > 0 && vpid < 0x2000); } @@ -2412,11 +2441,16 @@ void eDVBServicePlay::cutlistToCuesheet() std::multiset::iterator i(m_cue_entries.begin()); + int have_any_span = 0; + while (1) { if (i == m_cue_entries.end()) + { + if (!have_any_span) + break; out = length; - else { + } else { if (i->what == 0) /* in */ { in = i++->where; @@ -2440,7 +2474,10 @@ void eDVBServicePlay::cutlistToCuesheet() out = length; if (in < out) + { + have_any_span = 1; m_cue->addSourceSpan(in, out); + } in = length;