X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fservice%2Fservicedvb.cpp;h=c3abb81bf6e37cbad04c0e526ede32d6dc5f9230;hp=8650989a49c501b9b514df9434e6eca326cc845c;hb=27e06ba9c8b055c20ea8c70a405deb0e4019edc5;hpb=dec9693d8437a31dab8e4010b33b57e1476a315c diff --git a/lib/service/servicedvb.cpp b/lib/service/servicedvb.cpp old mode 100644 new mode 100755 index 8650989..c3abb81 --- a/lib/service/servicedvb.cpp +++ b/lib/service/servicedvb.cpp @@ -17,6 +17,9 @@ #include #include #include // access to python config +#include + +#include /* for subtitles */ #include @@ -27,6 +30,8 @@ #include #include +#include + #ifndef BYTE_ORDER #error no byte order defined! #endif @@ -89,9 +94,10 @@ int eStaticServiceDVBInformation::isPlayable(const eServiceReference &ref, const else { eDVBChannelID chid, chid_ignore; + int system; ((const eServiceReferenceDVB&)ref).getChannelID(chid); ((const eServiceReferenceDVB&)ignore).getChannelID(chid_ignore); - return res_mgr->canAllocateChannel(chid, chid_ignore); + return res_mgr->canAllocateChannel(chid, chid_ignore, system); } return false; } @@ -239,23 +245,24 @@ int eStaticServiceDVBBouquetInformation::isPlayable(const eServiceReference &ref { 1, 2, 3 }, // -T -C -S { 2, 1, 3 } // -T -S -C }; + int system; ((const eServiceReferenceDVB&)*it).getChannelID(chid); - int tmp=res->canAllocateChannel(chid, chid_ignore, simulate); - switch(tmp) + int tmp = res->canAllocateChannel(chid, chid_ignore, system, simulate); + if (tmp > 0) { - case 0: - break; - case 30000: // cached DVB-T channel - case 1: // DVB-T frontend - tmp = prio_map[prio_order][2]; - break; - case 40000: // cached DVB-C channel - case 2: - tmp = prio_map[prio_order][1]; - break; - default: // DVB-S - tmp = prio_map[prio_order][0]; - break; + switch (system) + { + case iDVBFrontend::feTerrestrial: + tmp = prio_map[prio_order][2]; + break; + case iDVBFrontend::feCable: + tmp = prio_map[prio_order][1]; + break; + default: + case iDVBFrontend::feSatellite: + tmp = prio_map[prio_order][0]; + break; + } } if (tmp > cur) { @@ -292,7 +299,7 @@ public: RESULT getName(const eServiceReference &ref, std::string &name); int getLength(const eServiceReference &ref); RESULT getEvent(const eServiceReference &ref, ePtr &SWIG_OUTPUT, time_t start_time); - int isPlayable(const eServiceReference &ref, const eServiceReference &ignore) { return 1; } + int isPlayable(const eServiceReference &ref, const eServiceReference &ignore, bool simulate) { return 1; } int getInfo(const eServiceReference &ref, int w); std::string getInfoString(const eServiceReference &ref,int w); PyObject *getInfoObject(const eServiceReference &r, int what); @@ -404,14 +411,25 @@ RESULT eStaticServiceDVBPVRInformation::getEvent(const eServiceReference &ref, e { if (!ref.path.empty()) { - ePtr event = new eServiceEvent; - std::string filename = ref.path; - filename.erase(filename.length()-2, 2); - filename+="eit"; - if (!event->parseFrom(filename, (m_parser.m_ref.getTransportStreamID().get()<<16)|m_parser.m_ref.getOriginalNetworkID().get())) + if (ref.path.substr(0, 7) == "http://") { - evt = event; - return 0; + eServiceReference equivalentref(ref); + /* this might be a scrambled stream (id + 0x100), force equivalent dvb type */ + equivalentref.type = eServiceFactoryDVB::id; + equivalentref.path.clear(); + return eEPGCache::getInstance()->lookupEventTime(equivalentref, start_time, evt); + } + else + { + ePtr event = new eServiceEvent; + std::string filename = ref.path; + filename.erase(filename.length()-2, 2); + filename+="eit"; + if (!event->parseFrom(filename, (m_parser.m_ref.getTransportStreamID().get()<<16)|m_parser.m_ref.getOriginalNetworkID().get())) + { + evt = event; + return 0; + } } } evt = 0; @@ -800,11 +818,15 @@ RESULT eDVBServiceList::setListName(const std::string &name) RESULT eServiceFactoryDVB::play(const eServiceReference &ref, ePtr &ptr) { ePtr service; + int r = lookupService(service, ref); if (r) service = 0; // check resources... - ptr = new eDVBServicePlay(ref, service); + if (eFCCServiceManager::checkAvailable(ref)) + ptr = new eDVBServiceFCCPlay(ref, service); + else + ptr = new eDVBServicePlay(ref, service); return 0; } @@ -816,6 +838,12 @@ RESULT eServiceFactoryDVB::record(const eServiceReference &ref, ePtr &service, const eServ return 0; } -eDVBServicePlay::eDVBServicePlay(const eServiceReference &ref, eDVBService *service): +eDVBServicePlay::eDVBServicePlay(const eServiceReference &ref, eDVBService *service, bool connect_event): m_reference(ref), m_dvb_service(service), m_have_video_pid(0), m_is_paused(0) { m_is_primary = 1; - m_is_pvr = !m_reference.path.empty(); - + m_is_stream = m_reference.path.substr(0, 7) == "http://"; + m_is_pvr = (!m_reference.path.empty() && !m_is_stream); + m_timeshift_enabled = m_timeshift_active = 0, m_timeshift_changed = 0; m_skipmode = m_fastforward = m_slowmotion = 0; - - CONNECT(m_service_handler.serviceEvent, eDVBServicePlay::serviceEvent); + + if (connect_event) + CONNECT(m_service_handler.serviceEvent, eDVBServicePlay::serviceEvent); + CONNECT(m_service_handler_timeshift.serviceEvent, eDVBServicePlay::serviceEventTimeshift); CONNECT(m_event_handler.m_eit_changed, eDVBServicePlay::gotNewEvent); @@ -935,6 +966,8 @@ eDVBServicePlay::eDVBServicePlay(const eServiceReference &ref, eDVBService *serv m_subtitle_sync_timer = eTimer::create(eApp); + m_current_video_pid_type = 0; + CONNECT(m_subtitle_sync_timer->timeout, eDVBServicePlay::checkSubtitleTiming); } @@ -1042,6 +1075,9 @@ void eDVBServicePlay::serviceEvent(int event) case eDVBServicePMTHandler::eventSOF: m_event((iPlayableService*)this, evSOF); break; + case eDVBServicePMTHandler::eventHBBTVInfo: + m_event((iPlayableService*)this, evHBBTVInfo); + break; } } @@ -1158,7 +1194,7 @@ RESULT eDVBServicePlay::start() m_first_program_info = 1; ePtr source = createTsSource(service); - m_service_handler.tuneExt(service, m_is_pvr, source, service.path.c_str(), m_cue, false, m_dvb_service); + m_service_handler.tuneExt(service, m_is_pvr, source, service.path.c_str(), m_cue, false, m_dvb_service, m_is_stream); if (m_is_pvr) { @@ -1300,7 +1336,18 @@ RESULT eDVBServicePlay::setFastForward_internal(int ratio, bool final_seek) { eDebug("setting cue skipmode to %d", skipmode); if (m_cue) - m_cue->setSkipmode(skipmode * 90000); /* convert to 90000 per second */ + { + long long _skipmode = skipmode; + if (m_current_video_pid_type == eDVBServicePMTHandler::videoStream::vtH265_HEVC) + { + if (ratio < 0) + _skipmode = skipmode * 3; + else + _skipmode = skipmode * 4; + } + + m_cue->setSkipmode(_skipmode * 90000); /* convert to 90000 per second */ + } } m_skipmode = skipmode; @@ -1502,7 +1549,7 @@ RESULT eDVBServicePlay::timeshift(ePtr &ptr) { ptr = 0; if (m_have_video_pid && // HACK !!! FIXMEE !! temporary no timeshift on radio services !! - (m_timeshift_enabled || !m_is_pvr)) + (m_timeshift_enabled || (!m_is_pvr&&!m_is_stream))) { if (!m_timeshift_enabled) { @@ -1569,6 +1616,18 @@ RESULT eDVBServicePlay::getName(std::string &name) ePtr i = new eStaticServiceDVBPVRInformation(m_reference); return i->getName(m_reference, name); } + else if (m_is_stream) + { + name = m_reference.name; + if (name.empty()) + { + name = m_reference.path; + } + if (name.empty()) + { + name = "(...)"; + } + } else if (m_dvb_service) { m_dvb_service->getName(m_reference, name); @@ -1680,12 +1739,21 @@ int eDVBServicePlay::getInfo(int w) case sAudioPID: if (m_dvb_service) { - int apid = m_dvb_service->getCacheEntry(eDVBService::cAPID); + int apid = m_dvb_service->getCacheEntry(eDVBService::cMPEGAPID); if (apid != -1) return apid; apid = m_dvb_service->getCacheEntry(eDVBService::cAC3PID); if (apid != -1) return apid; + apid = m_dvb_service->getCacheEntry(eDVBService::cDDPPID); + if (apid != -1) + return apid; + apid = m_dvb_service->getCacheEntry(eDVBService::cAACHEAPID); + if (apid != -1) + return apid; + apid = m_dvb_service->getCacheEntry(eDVBService::cAACAPID); + if (apid != -1) + return apid; } if (no_program_info) return -1; if (program.audioStreams.empty()) return -1; return program.audioStreams[0].pid; case sPCRPID: @@ -1720,6 +1788,23 @@ std::string eDVBServicePlay::getInfoString(int w) return m_dvb_service->m_provider_name; case sServiceref: return m_reference.toString(); + case sHBBTVUrl: + { + std::string url; + eDVBServicePMTHandler &h = m_timeshift_active ? m_service_handler_timeshift : m_service_handler; + h.getHBBTVUrl(url); + return url; + } + case sLiveStreamDemuxId: + { + int id; + eDVBServicePMTHandler &h = m_timeshift_active ? m_service_handler_timeshift : m_service_handler; + h.getDemuxID(id); + + std::string demux; + demux += id + '0'; + return demux; + } default: break; } @@ -1736,6 +1821,11 @@ PyObject *eDVBServicePlay::getInfoObject(int w) return m_service_handler.getCaIds(true); case sTransponderData: return eStaticServiceDVBInformation().getInfoObject(m_reference, w); + case sHBBTVUrl: + { + eDVBServicePMTHandler &h = m_timeshift_active ? m_service_handler_timeshift : m_service_handler; + return h.getHbbTVApplications(); + } default: break; } @@ -1794,7 +1884,9 @@ RESULT eDVBServicePlay::getTrackInfo(struct iAudioTrackInfo &info, unsigned int if (program.audioStreams[i].type == eDVBServicePMTHandler::audioStream::atMPEG) info.m_description = "MPEG"; else if (program.audioStreams[i].type == eDVBServicePMTHandler::audioStream::atAC3) - info.m_description = "AC3"; + info.m_description = "Dolby Digital"; + else if (program.audioStreams[i].type == eDVBServicePMTHandler::audioStream::atDDP) + info.m_description = "Dolby Digital+"; else if (program.audioStreams[i].type == eDVBServicePMTHandler::audioStream::atAAC) info.m_description = "AAC"; else if (program.audioStreams[i].type == eDVBServicePMTHandler::audioStream::atAACHE) @@ -1893,23 +1985,17 @@ int eDVBServicePlay::selectAudioStream(int i) case the real default is not yet available.) */ if (m_dvb_service && ((i != -1) - || ((m_dvb_service->getCacheEntry(eDVBService::cAPID) == -1) && (m_dvb_service->getCacheEntry(eDVBService::cAC3PID)==-1)))) + || ((m_dvb_service->getCacheEntry(eDVBService::cMPEGAPID) == -1) + && (m_dvb_service->getCacheEntry(eDVBService::cAC3PID)==-1) + && (m_dvb_service->getCacheEntry(eDVBService::cDDPPID)==-1) + && (m_dvb_service->getCacheEntry(eDVBService::cAACHEAPID)==-1) + && (m_dvb_service->getCacheEntry(eDVBService::cAACAPID)==-1)))) { - if (apidtype == eDVBAudio::aMPEG) - { - m_dvb_service->setCacheEntry(eDVBService::cAPID, apid); - m_dvb_service->setCacheEntry(eDVBService::cAC3PID, -1); - } - else if (apidtype == eDVBAudio::aAC3) - { - m_dvb_service->setCacheEntry(eDVBService::cAPID, -1); - m_dvb_service->setCacheEntry(eDVBService::cAC3PID, apid); - } - else - { - m_dvb_service->setCacheEntry(eDVBService::cAPID, -1); - m_dvb_service->setCacheEntry(eDVBService::cAC3PID, -1); - } + m_dvb_service->setCacheEntry(eDVBService::cMPEGAPID, apidtype == eDVBAudio::aMPEG ? apid : -1); + m_dvb_service->setCacheEntry(eDVBService::cAC3PID, apidtype == eDVBAudio::aAC3 ? apid : -1); + m_dvb_service->setCacheEntry(eDVBService::cDDPPID, apidtype == eDVBAudio::aDDP ? apid : -1); + m_dvb_service->setCacheEntry(eDVBService::cAACHEAPID, apidtype == eDVBAudio::aAACHE ? apid : -1); + m_dvb_service->setCacheEntry(eDVBService::cAACAPID, apidtype == eDVBAudio::aAAC ? apid : -1); } h.resetCachedProgram(); @@ -2155,6 +2241,8 @@ RESULT eDVBServicePlay::startTimeshift() } m_record->setTargetFD(m_timeshift_fd); + m_record->setTargetFilename(m_timeshift_file.c_str()); + m_record->enableAccessPoints(false); m_timeshift_enabled = 1; @@ -2180,6 +2268,11 @@ RESULT eDVBServicePlay::stopTimeshift(bool swToLive) close(m_timeshift_fd); eDebug("remove timeshift file"); eBackgroundFileEraser::getInstance()->erase(m_timeshift_file.c_str()); + + { + std::string timeshift_file_sc = m_timeshift_file + ".sc"; + eBackgroundFileEraser::getInstance()->erase(timeshift_file_sc.c_str()); + } return 0; } @@ -2276,6 +2369,8 @@ void eDVBServicePlay::updateTimeshiftPids() return; else { + int timing_pid = -1; + int timing_pid_type = -1; std::set pids_to_record; pids_to_record.insert(0); // PAT if (program.pmtPid != -1) @@ -2287,12 +2382,28 @@ void eDVBServicePlay::updateTimeshiftPids() for (std::vector::const_iterator i(program.videoStreams.begin()); i != program.videoStreams.end(); ++i) + { pids_to_record.insert(i->pid); + if (timing_pid == -1) + { + timing_pid = i->pid; + timing_pid_type = i->type; + } + } + for (std::vector::const_iterator i(program.audioStreams.begin()); i != program.audioStreams.end(); ++i) - pids_to_record.insert(i->pid); + { + pids_to_record.insert(i->pid); + + if (timing_pid == -1) + { + timing_pid = i->pid; + timing_pid_type = -1; + } + } for (std::vector::const_iterator i(program.subtitleStreams.begin()); @@ -2316,6 +2427,9 @@ void eDVBServicePlay::updateTimeshiftPids() for (std::set::iterator i(obsolete_pids.begin()); i != obsolete_pids.end(); ++i) m_record->removePID(*i); + + if (timing_pid != -1) + m_record->setTimingPID(timing_pid, timing_pid_type); } } @@ -2368,9 +2482,18 @@ void eDVBServicePlay::resetTimeshift(int start) ePtr eDVBServicePlay::createTsSource(eServiceReferenceDVB &ref) { - eRawFile *f = new eRawFile(); - f->open(ref.path.c_str()); - return ePtr(f); + if (m_is_stream) + { + eHttpStream *f = new eHttpStream(); + f->open(ref.path.c_str()); + return ePtr(f); + } + else + { + eRawFile *f = new eRawFile(); + f->open(ref.path.c_str()); + return ePtr(f); + } } void eDVBServicePlay::switchToTimeshift() @@ -2522,9 +2645,11 @@ void eDVBServicePlay::updateDecoder(bool sendSeekableStateChanged) setPCMDelay(pcm_delay == -1 ? 0 : pcm_delay); m_decoder->setVideoPID(vpid, vpidtype); + m_current_video_pid_type = vpidtype; selectAudioStream(); - if (!(m_is_pvr || m_timeshift_active || !m_is_primary)) + //if (!(m_is_pvr || m_is_stream || m_timeshift_active || !m_is_primary)) + if (!(m_is_pvr || m_is_stream || m_timeshift_active)) m_decoder->setSyncPCR(pcrpid); else m_decoder->setSyncPCR(-1); @@ -2936,11 +3061,30 @@ void eDVBServicePlay::newSubtitlePage(const eDVBTeletextSubtitlePage &page) { if (m_subtitle_widget) { + int subtitledelay = 0; pts_t pos = 0; if (m_decoder) m_decoder->getPTS(0, pos); + if (m_is_pvr || m_timeshift_enabled) + { + eDebug("Subtitle in recording/timeshift"); + subtitledelay = ePythonConfigQuery::getConfigIntValue("config.subtitles.subtitle_noPTSrecordingdelay", 315000); + } + else + { + /* check the setting for subtitle delay in live playback, either with pos, or without pos */ + subtitledelay = ePythonConfigQuery::getConfigIntValue("config.subtitles.subtitle_bad_timing_delay", 0); + } + eDebug("got new subtitle page %lld %lld %d", pos, page.m_pts, page.m_have_pts); - m_subtitle_pages.push_back(page); + eDVBTeletextSubtitlePage tmppage = page; + tmppage.m_have_pts = true; + + if (abs(tmppage.m_pts - pos) > 20*90000) + tmppage.m_pts = pos; // fix abnormal pos diffs + + tmppage.m_pts += subtitledelay; + m_subtitle_pages.push_back(tmppage); checkSubtitleTiming(); } } @@ -3024,7 +3168,29 @@ void eDVBServicePlay::newDVBSubtitlePage(const eDVBSubtitlePage &p) if (m_decoder) m_decoder->getPTS(0, pos); eDebug("got new subtitle page %lld %lld", pos, p.m_show_time); - m_dvb_subtitle_pages.push_back(p); + if ( abs(pos-p.m_show_time)>1800000 && (m_is_pvr || m_timeshift_enabled)) + { + eDebug("[eDVBServicePlay] Subtitle without PTS and recording"); + int subtitledelay = ePythonConfigQuery::getConfigIntValue("config.subtitles.subtitle_noPTSrecordingdelay", 315000); + + eDVBSubtitlePage tmppage; + tmppage = p; + tmppage.m_show_time = pos + subtitledelay; + m_dvb_subtitle_pages.push_back(tmppage); + } + else + { + int subtitledelay = ePythonConfigQuery::getConfigIntValue("config.subtitles.subtitle_bad_timing_delay", 0); + if (subtitledelay != 0) + { + eDVBSubtitlePage tmppage; + tmppage = p; + tmppage.m_show_time += subtitledelay; + m_dvb_subtitle_pages.push_back(tmppage); + } + else + m_dvb_subtitle_pages.push_back(p); + } checkSubtitleTiming(); } }