X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/4e8cae716ad3fdf29a7b2a45e5eec0a530f93277..24a93dcd3c096ef9a46d545c89050f0076911816:/lib/service/servicedvb.cpp diff --git a/lib/service/servicedvb.cpp b/lib/service/servicedvb.cpp index 0ec488fe..fe9398cb 100644 --- a/lib/service/servicedvb.cpp +++ b/lib/service/servicedvb.cpp @@ -17,12 +17,16 @@ #include #include + /* for subtitles */ +#include + #include +#include #include #include -#include +#define INTERNAL_TELETEXT #ifndef BYTE_ORDER #error no byte order defined! @@ -144,7 +148,8 @@ public: eStaticServiceDVBPVRInformation(const eServiceReference &ref); 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 getInfo(const eServiceReference &ref, int w); std::string getInfoString(const eServiceReference &ref,int w); }; @@ -211,6 +216,24 @@ std::string eStaticServiceDVBPVRInformation::getInfoString(const eServiceReferen } } +RESULT eStaticServiceDVBPVRInformation::getEvent(const eServiceReference &ref, ePtr &evt, time_t start_time) +{ + 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())) + { + evt = event; + return 0; + } + } + evt = 0; + return -1; +} + class eDVBPVRServiceOfflineOperations: public iServiceOfflineOperations { DECLARE_REF(eDVBPVRServiceOfflineOperations); @@ -290,6 +313,9 @@ eServiceFactoryDVB::eServiceFactoryDVB() eServiceCenter::getPrivInstance(sc); if (sc) sc->addServiceFactory(eServiceFactoryDVB::id, this); + + m_StaticServiceDVBInfo = new eStaticServiceDVBInformation; + m_StaticServiceDVBBouquetInfo = new eStaticServiceDVBBouquetInformation; } eServiceFactoryDVB::~eServiceFactoryDVB() @@ -370,6 +396,7 @@ RESULT eDVBServiceList::getContent(std::list &list, bool sort // useable format options are // R = Service Reference (as swig object .. this is very slow) // S = Service Reference (as python string object .. same as ref.toString()) +// C = Service Reference (as python string object .. same as ref.toCompareString()) // N = Service Name (as python string object) // when exactly one return value per service is selected in the format string, // then each value is directly a list entry @@ -409,6 +436,9 @@ PyObject *eDVBServiceList::getContent(const char* format, bool sorted) case 'R': // service reference (swig)object tmp = New_eServiceReference(ref); break; + case 'C': // service reference compare string + tmp = PyString_FromString(ref.toCompareString().c_str()); + break; case 'S': // service reference string tmp = PyString_FromString(ref.toString().c_str()); break; @@ -484,11 +514,11 @@ RESULT eDVBServiceList::startEdit(ePtr &res) return -1; } -RESULT eDVBServiceList::addService(eServiceReference &ref) +RESULT eDVBServiceList::addService(eServiceReference &ref, eServiceReference before) { if (!m_bouquet) return -1; - return m_bouquet->addService(ref); + return m_bouquet->addService(ref, before); } RESULT eDVBServiceList::removeService(eServiceReference &ref) @@ -562,9 +592,9 @@ RESULT eServiceFactoryDVB::info(const eServiceReference &ref, ePtr service; if (lookupService(service, ref)) // no eDVBService avail for this reference ( Linkage Services... ) - ptr = new eStaticServiceDVBInformation; + ptr = m_StaticServiceDVBInfo; else /* eDVBService has the iStaticServiceInformation interface, so we pass it here. */ ptr = service; @@ -625,7 +655,7 @@ RESULT eServiceFactoryDVB::lookupService(ePtr &service, const eServ } eDVBServicePlay::eDVBServicePlay(const eServiceReference &ref, eDVBService *service): - m_reference(ref), m_dvb_service(service), m_is_paused(0) + 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(); @@ -639,10 +669,15 @@ eDVBServicePlay::eDVBServicePlay(const eServiceReference &ref, eDVBService *serv m_cuesheet_changed = 0; m_cutlist_enabled = 1; + + m_subtitle_widget = 0; + + CONNECT(m_subtitle_sync_timer.timeout, eDVBServicePlay::checkSubtitleTiming); } eDVBServicePlay::~eDVBServicePlay() { + delete m_subtitle_widget; } void eDVBServicePlay::gotNewEvent() @@ -741,32 +776,22 @@ RESULT eDVBServicePlay::start() m_first_program_info = 1; eServiceReferenceDVB &service = (eServiceReferenceDVB&)m_reference; r = m_service_handler.tune(service, m_is_pvr, m_cue); - + /* inject EIT if there is a stored one */ if (m_is_pvr) { std::string filename = service.path; filename.erase(filename.length()-2, 2); filename+="eit"; - int fd = ::open( filename.c_str(), O_RDONLY ); - if ( fd > -1 ) + ePtr event = new eServiceEvent; + if (!event->parseFrom(filename, (service.getTransportStreamID().get()<<16)|service.getOriginalNetworkID().get())) { - __u8 buf[4096]; - int rd = ::read(fd, buf, 4096); - ::close(fd); - if ( rd > 12 /*EIT_LOOP_SIZE*/ ) - { - Event ev(buf); - ePtr event = new eServiceEvent; - ePtr empty; - event->parseFrom(&ev, (service.getTransportStreamID().get()<<16)|service.getOriginalNetworkID().get()); - m_event_handler.inject(event, 0); - m_event_handler.inject(empty, 1); - eDebug("injected"); - } + ePtr empty; + m_event_handler.inject(event, 0); + m_event_handler.inject(empty, 1); } } - + if (m_is_pvr) loadCuesheet(); @@ -777,13 +802,41 @@ RESULT eDVBServicePlay::start() RESULT eDVBServicePlay::stop() { + /* add bookmark for last play position */ + if (m_is_pvr) + { + pts_t play_position; + if (!getPlayPosition(play_position)) + { + /* remove last position */ + for (std::multiset::iterator i(m_cue_entries.begin()); i != m_cue_entries.end();) + { + if (i->what == 3) /* current play position */ + { + m_cue_entries.erase(i); + i = m_cue_entries.begin(); + continue; + } else + ++i; + } + + m_cue_entries.insert(cueEntry(play_position, 3)); /* last play position */ + m_cuesheet_changed = 1; + } + } + stopTimeshift(); /* in case timeshift was enabled, remove buffer etc. */ m_service_handler_timeshift.free(); m_service_handler.free(); if (m_is_pvr && m_cuesheet_changed) - saveCuesheet(); + { + struct stat s; + /* save cuesheet only when main file is accessible. */ + if (!::stat(m_reference.path.c_str(), &s)) + saveCuesheet(); + } return 0; } @@ -985,7 +1038,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; @@ -1018,7 +1071,8 @@ RESULT eDVBServicePlay::subServices(ePtr &ptr) RESULT eDVBServicePlay::timeshift(ePtr &ptr) { ptr = 0; - if (m_timeshift_enabled || !m_is_pvr) + if (m_have_video_pid && // HACK !!! FIXMEE !! temporary no timeshift on radio services !! + (m_timeshift_enabled || !m_is_pvr)) { if (!m_timeshift_enabled) { @@ -1053,6 +1107,24 @@ RESULT eDVBServicePlay::cueSheet(ePtr &ptr) return -1; } +RESULT eDVBServicePlay::subtitle(ePtr &ptr) +{ + ptr = this; + return 0; +} + +RESULT eDVBServicePlay::audioDelay(ePtr &ptr) +{ + ptr = this; + return 0; +} + +RESULT eDVBServicePlay::radioText(ePtr &ptr) +{ + ptr = this; + return 0; +} + RESULT eDVBServicePlay::getName(std::string &name) { if (m_is_pvr) @@ -1085,7 +1157,9 @@ int eDVBServicePlay::getInfo(int w) if (w == sCAIDs) return resIsPyObject; - if (m_service_handler.getProgramInfo(program)) + eDVBServicePMTHandler &h = m_timeshift_active ? m_service_handler_timeshift : m_service_handler; + + if (h.getProgramInfo(program)) return -1; switch (w) @@ -1129,10 +1203,10 @@ 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 sAudioPID: if (program.audioStreams.empty()) return -1; return program.audioStreams[0].pid; case sPCRPID: return program.pcrPid; case sPMTPID: return program.pmtPid; case sTXTPID: return program.textPid; @@ -1174,7 +1248,8 @@ PyObject *eDVBServicePlay::getInfoObject(int w) int eDVBServicePlay::getNumberOfTracks() { eDVBServicePMTHandler::program program; - if (m_service_handler.getProgramInfo(program)) + eDVBServicePMTHandler &h = m_timeshift_active ? m_service_handler_timeshift : m_service_handler; + if (h.getProgramInfo(program)) return 0; return program.audioStreams.size(); } @@ -1192,8 +1267,9 @@ RESULT eDVBServicePlay::selectTrack(unsigned int i) RESULT eDVBServicePlay::getTrackInfo(struct iAudioTrackInfo &info, unsigned int i) { eDVBServicePMTHandler::program program; + eDVBServicePMTHandler &h = m_timeshift_active ? m_service_handler_timeshift : m_service_handler; - if (m_service_handler.getProgramInfo(program)) + if (h.getProgramInfo(program)) return -1; if (i >= program.audioStreams.size()) @@ -1203,6 +1279,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 @@ -1228,8 +1306,9 @@ RESULT eDVBServicePlay::getTrackInfo(struct iAudioTrackInfo &info, unsigned int int eDVBServicePlay::selectAudioStream(int i) { eDVBServicePMTHandler::program program; + eDVBServicePMTHandler &h = m_timeshift_active ? m_service_handler_timeshift : m_service_handler; - if (m_service_handler.getProgramInfo(program)) + if (h.getProgramInfo(program)) return -1; if ((unsigned int)i >= program.audioStreams.size()) @@ -1241,46 +1320,62 @@ int eDVBServicePlay::selectAudioStream(int i) if (m_decoder->setAudioPID(program.audioStreams[i].pid, program.audioStreams[i].type)) return -4; + if (m_radiotext_parser) + m_radiotext_parser->start(program.audioStreams[i].pid); + if (m_dvb_service && !m_is_pvr) { if (program.audioStreams[i].type == eDVBAudio::aMPEG) { m_dvb_service->setCacheEntry(eDVBService::cAPID, program.audioStreams[i].pid); m_dvb_service->setCacheEntry(eDVBService::cAC3PID, -1); - } else + } + else { m_dvb_service->setCacheEntry(eDVBService::cAPID, -1); m_dvb_service->setCacheEntry(eDVBService::cAC3PID, program.audioStreams[i].pid); } } - m_current_audio_stream = i; + h.resetCachedProgram(); return 0; } int eDVBServicePlay::getCurrentChannel() { - int curChannel = m_dvb_service->getCacheEntry(eDVBService::cACHANNEL); - return curChannel == -1 ? STEREO : curChannel; + return m_decoder ? m_decoder->getAudioChannel() : STEREO; } RESULT eDVBServicePlay::selectChannel(int i) { - if (i < iAudioChannelSelection::LEFT || i > iAudioChannelSelection::RIGHT) + if (i < LEFT || i > RIGHT || i == STEREO) i = -1; // Stereo - if (m_dvb_service->getCacheEntry(eDVBService::cACHANNEL) != i) - { + if (m_dvb_service) m_dvb_service->setCacheEntry(eDVBService::cACHANNEL, i); - if (m_decoder) - m_decoder->setAudioChannel(i); - } + if (m_decoder) + m_decoder->setAudioChannel(i); + return 0; } -int eDVBServicePlay::getFrontendInfo(int w) +std::string eDVBServicePlay::getRadioText(int x) +{ + if (m_radiotext_parser) + switch(x) + { + case 0: + return m_radiotext_parser->getCurrentText(); + } + return ""; +} + +void eDVBServicePlay::radioTextUpdated() +{ + m_event((iPlayableService*)this, evUpdatedRadioText); +} + +int eDVBServiceBase::getFrontendInfo(int w) { - if (m_is_pvr) - return 0; eUsePtr channel; if(m_service_handler.getChannel(channel)) return 0; @@ -1290,7 +1385,7 @@ int eDVBServicePlay::getFrontendInfo(int w) return fe->readFrontendData(w); } -PyObject *eDVBServicePlay::getFrontendData(bool original) +PyObject *eDVBServiceBase::getFrontendData(bool original) { PyObject *ret=0; @@ -1500,7 +1595,9 @@ void eDVBServicePlay::updateTimeshiftPids() return; eDVBServicePMTHandler::program program; - if (m_service_handler.getProgramInfo(program)) + eDVBServicePMTHandler &h = m_timeshift_active ? m_service_handler_timeshift : m_service_handler; + + if (h.getProgramInfo(program)) return; else { @@ -1551,13 +1648,18 @@ void eDVBServicePlay::switchToLive() m_decoder = 0; m_decode_demux = 0; m_teletext_parser = 0; - + m_radiotext_parser = 0; + m_subtitle_parser = 0; + m_new_dvb_subtitle_page_connection = 0; + m_new_subtitle_page_connection = 0; + m_radiotext_updated_connection = 0; + /* free the timeshift service handler, we need the resources */ m_service_handler_timeshift.free(); m_timeshift_active = 0; - + m_event((iPlayableService*)this, evSeekableStatusChanged); - + updateDecoder(); } @@ -1565,18 +1667,23 @@ void eDVBServicePlay::switchToTimeshift() { if (m_timeshift_active) return; - + m_decode_demux = 0; m_decoder = 0; m_teletext_parser = 0; - + m_radiotext_parser = 0; + m_subtitle_parser = 0; + m_new_subtitle_page_connection = 0; + m_new_dvb_subtitle_page_connection = 0; + m_radiotext_updated_connection = 0; + m_timeshift_active = 1; m_event((iPlayableService*)this, evSeekableStatusChanged); - + eServiceReferenceDVB r = (eServiceReferenceDVB&)m_reference; r.path = m_timeshift_file; - + m_cue = new eCueSheet(); m_service_handler_timeshift.tune(r, 1, m_cue); /* use the decoder demux for everything */ updateDecoder(); /* mainly to switch off PCR */ @@ -1584,14 +1691,15 @@ void eDVBServicePlay::switchToTimeshift() void eDVBServicePlay::updateDecoder() { - int vpid = -1, vpidtype = -1, apid = -1, apidtype = -1, pcrpid = -1, tpid = -1, achannel = -1; + int vpid = -1, vpidtype = -1, apid = -1, apidtype = -1, pcrpid = -1, tpid = -1, achannel = -1, ac3_delay=-1, pcm_delay=-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"; + defaultac3 = default_ac3 == "True"; eDVBServicePMTHandler::program program; if (h.getProgramInfo(program)) @@ -1603,7 +1711,7 @@ void eDVBServicePlay::updateDecoder() { eDebugNoNewLine(" ("); for (std::vector::const_iterator - i(program.videoStreams.begin()); + i(program.videoStreams.begin()); i != program.videoStreams.end(); ++i) { if (vpid == -1) @@ -1622,7 +1730,7 @@ void eDVBServicePlay::updateDecoder() { eDebugNoNewLine(" ("); for (std::vector::const_iterator - i(program.audioStreams.begin()); + i(program.audioStreams.begin()); i != program.audioStreams.end(); ++i) { if (apid == -1 || (apidtype == eDVBAudio::aMPEG && defaultac3)) @@ -1643,7 +1751,6 @@ void eDVBServicePlay::updateDecoder() pcrpid = program.pcrPid; eDebug(", and the text pid is %04x", program.textPid); tpid = program.textPid; - achannel = program.audioChannel; } if (!m_decoder) @@ -1655,30 +1762,85 @@ void eDVBServicePlay::updateDecoder() m_cue->setDecodingDemux(m_decode_demux, m_decoder); #ifdef INTERNAL_TELETEXT m_teletext_parser = new eDVBTeletextParser(m_decode_demux); + m_teletext_parser->connectNewPage(slot(*this, &eDVBServicePlay::newSubtitlePage), m_new_subtitle_page_connection); #endif + m_subtitle_parser = new eDVBSubtitleParser(m_decode_demux); + m_subtitle_parser->connectNewPage(slot(*this, &eDVBServicePlay::newDVBSubtitlePage), m_new_dvb_subtitle_page_connection); } if (m_decoder) { + if (m_dvb_service) + { + achannel = m_dvb_service->getCacheEntry(eDVBService::cACHANNEL); + ac3_delay = m_dvb_service->getCacheEntry(eDVBService::cAC3DELAY); + pcm_delay = m_dvb_service->getCacheEntry(eDVBService::cPCMDELAY); + } + else // subservice or recording + { + eServiceReferenceDVB ref; + m_service_handler.getServiceReference(ref); + eServiceReferenceDVB parent = ref.getParentServiceReference(); + if (!parent) + parent = ref; + if (parent) + { + ePtr res_mgr; + if (!eDVBResourceManager::getInstance(res_mgr)) + { + ePtr db; + if (!res_mgr->getChannelList(db)) + { + ePtr origService; + if (!db->getService(parent, origService)) + { + ac3_delay = origService->getCacheEntry(eDVBService::cAC3DELAY); + pcm_delay = origService->getCacheEntry(eDVBService::cPCMDELAY); + } + } + } + } + } + m_decoder->setAC3Delay(ac3_delay == -1 ? 0 : ac3_delay); + m_decoder->setPCMDelay(pcm_delay == -1 ? 0 : pcm_delay); + 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); + if (apid != -1) + { + ePtr data_demux; + if (!h.getDataDemux(data_demux)) + { + m_radiotext_parser = new eDVBRadioTextParser(data_demux); + m_radiotext_parser->connectUpdatedRadiotext(slot(*this, &eDVBServicePlay::radioTextUpdated), m_radiotext_updated_connection); + m_radiotext_parser->start(apid); + } + } + } else m_decoder->setSyncPCR(-1); -#ifndef INTERNAL_TELETEXT + m_decoder->setTextPID(tpid); -#else - if (m_teletext_parser) - m_teletext_parser->start(tpid); -#endif + + m_teletext_parser->start(program.textPid); if (!m_is_primary) m_decoder->setTrickmode(1); m_decoder->start(); + if (vpid > 0 && vpid < 0x2000) + ; + else + { + std::string radio_pic; + if (!ePythonConfigQuery::getConfigValue("config.misc.radiopic", radio_pic)) + m_decoder->setRadioPic(radio_pic); + } + m_decoder->setAudioChannel(achannel); // how we can do this better? @@ -1699,11 +1861,12 @@ void eDVBServicePlay::updateDecoder() m_dvb_service->setCacheEntry(eDVBService::cAC3PID, apid); } m_dvb_service->setCacheEntry(eDVBService::cVPID, vpid); - m_dvb_service->setCacheEntry(eDVBService::cVTYPE, vpidtype); + 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); } } + m_have_video_pid = (vpid > 0 && vpid < 0x2000); } void eDVBServicePlay::loadCuesheet() @@ -1732,7 +1895,7 @@ void eDVBServicePlay::loadCuesheet() #endif what = ntohl(what); - if (what > 2) + if (what > 3) break; m_cue_entries.insert(cueEntry(where, what)); @@ -1788,7 +1951,7 @@ void eDVBServicePlay::cutlistToCuesheet() if (!m_cutlist_enabled) { m_cue->commitSpans(); - eDebug("cutlists where disabled"); + eDebug("cutlists were disabled"); return; } @@ -1809,7 +1972,7 @@ void eDVBServicePlay::cutlistToCuesheet() continue; } else if (i->what == 1) /* out */ out = i++->where; - else /* mark */ + else /* mark (2) or last play position (3) */ { i++; continue; @@ -1827,6 +1990,227 @@ void eDVBServicePlay::cutlistToCuesheet() m_cue->commitSpans(); } +RESULT eDVBServicePlay::enableSubtitles(eWidget *parent, PyObject *entry) +{ + if (m_subtitle_widget) + disableSubtitles(parent); + + if (!PyInt_Check(entry)) + return -1; + + int page = PyInt_AsLong(entry); + + if (page > 0 && !m_teletext_parser) + return -1; + if (page < 0 && !m_subtitle_parser) + return -1; + + m_subtitle_widget = new eSubtitleWidget(parent); + m_subtitle_widget->resize(parent->size()); /* full size */ + + if (page > 0) + { +/* eDVBServicePMTHandler &h = m_timeshift_active ? m_service_handler_timeshift : m_service_handler; + eDVBServicePMTHandler::program program; + if (h.getProgramInfo(program)) + eDebug("getting program info failed."); + else + { + eDebug("start teletext on pid %04x, page %d", program.textPid, page); + m_teletext_parser->start(program.textPid);*/ + m_teletext_parser->setPage(page); +// } + } + else + { + int pid = -page; + m_subtitle_parser->start(pid); + } + + return 0; +} + +RESULT eDVBServicePlay::disableSubtitles(eWidget *parent) +{ + delete m_subtitle_widget; + m_subtitle_widget = 0; + if (m_subtitle_parser) + { + m_subtitle_parser->stop(); + m_dvb_subtitle_pages.clear(); + } + if (m_teletext_parser) + { + m_teletext_parser->setPage(-1); + m_subtitle_pages.clear(); + } + return 0; +} + +PyObject *eDVBServicePlay::getSubtitleList() +{ + if (!m_teletext_parser) + { + Py_INCREF(Py_None); + return Py_None; + } + + PyObject *l = PyList_New(0); + + for (std::set::iterator i(m_teletext_parser->m_found_subtitle_pages.begin()); i != m_teletext_parser->m_found_subtitle_pages.end(); ++i) + { + PyObject *tuple = PyTuple_New(2); + char desc[20]; + sprintf(desc, "Page %x", *i); + PyTuple_SetItem(tuple, 0, PyString_FromString(desc)); + PyTuple_SetItem(tuple, 1, PyInt_FromLong(*i)); + PyList_Append(l, tuple); + Py_DECREF(tuple); + } + + eDVBServicePMTHandler &h = m_timeshift_active ? m_service_handler_timeshift : m_service_handler; + eDVBServicePMTHandler::program program; + if (h.getProgramInfo(program)) + eDebug("getting program info failed."); + else + { + for (std::vector::iterator it(program.subtitleStreams.begin()); + it != program.subtitleStreams.end(); ++it) + { + PyObject *tuple = PyTuple_New(2); + char desc[20]; + sprintf(desc, "DVB %s", it->language_code.c_str()); + PyTuple_SetItem(tuple, 0, PyString_FromString(desc)); + PyTuple_SetItem(tuple, 1, PyInt_FromLong(-it->pid)); + PyList_Append(l, tuple); + Py_DECREF(tuple); + } + } + + return l; +} + +void eDVBServicePlay::newSubtitlePage(const eDVBTeletextSubtitlePage &page) +{ + if (m_subtitle_widget) + { + m_subtitle_pages.push_back(page); + checkSubtitleTiming(); + } +} + +void eDVBServicePlay::checkSubtitleTiming() +{ +// eDebug("checkSubtitleTiming"); + if (!m_subtitle_widget) + return; + while (1) + { + enum { TELETEXT, DVB } type; + eDVBTeletextSubtitlePage page; + eDVBSubtitlePage dvb_page; + pts_t show_time; + if (!m_subtitle_pages.empty()) + { + page = m_subtitle_pages.front(); + type = TELETEXT; + show_time = page.m_pts; + } + else if (!m_dvb_subtitle_pages.empty()) + { + dvb_page = m_dvb_subtitle_pages.front(); + type = DVB; + show_time = dvb_page.m_show_time; + } + else + return; + + pts_t pos = 0; + + if (m_decoder) + m_decoder->getPTS(0, pos); + +// eDebug("%lld %lld", pos, show_time); + int diff = show_time - pos; + if (diff < 0) + { + eDebug("[late (%d ms)]", -diff / 90); + diff = 0; + } + if (diff > 900000) + { + eDebug("[invalid]"); + diff = 0; + } + + if (!diff) + { + if (type == TELETEXT) + { + eDebug("display teletext subtitle page"); + m_subtitle_widget->setPage(page); + m_subtitle_pages.pop_front(); + } + else + { + eDebug("display dvb subtitle Page"); + m_subtitle_widget->setPage(dvb_page); + m_dvb_subtitle_pages.pop_front(); + } + } else + { + eDebug("start subtitle delay %d", diff / 90); + m_subtitle_sync_timer.start(diff / 90, 1); + break; + } + } +} + +void eDVBServicePlay::newDVBSubtitlePage(const eDVBSubtitlePage &p) +{ + if (m_subtitle_widget) + { + m_dvb_subtitle_pages.push_back(p); + checkSubtitleTiming(); + } +} + +int eDVBServicePlay::getAC3Delay() +{ + if (m_dvb_service) + return m_dvb_service->getCacheEntry(eDVBService::cAC3DELAY); + else if (m_decoder) + return m_decoder->getAC3Delay(); + else + return 0; +} + +int eDVBServicePlay::getPCMDelay() +{ + if (m_dvb_service) + return m_dvb_service->getCacheEntry(eDVBService::cPCMDELAY); + else if (m_decoder) + return m_decoder->getPCMDelay(); + else + return 0; +} + +void eDVBServicePlay::setAC3Delay(int delay) +{ + if (m_dvb_service) + m_dvb_service->setCacheEntry(eDVBService::cAC3DELAY, delay ? delay : -1); + if (m_decoder) + m_decoder->setAC3Delay(delay); +} + +void eDVBServicePlay::setPCMDelay(int delay) +{ + if (m_dvb_service) + m_dvb_service->setCacheEntry(eDVBService::cPCMDELAY, delay ? delay : -1); + if (m_decoder) + m_decoder->setPCMDelay(delay); +} + DEFINE_REF(eDVBServicePlay) eAutoInitPtr init_eServiceFactoryDVB(eAutoInitNumbers::service+1, "eServiceFactoryDVB");