X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/bc2f8b7dcdacde72c1f06dcb5bd9672094b17ed5..55c2a88ecd94a2eb6aa00f1227912fcd2659932b:/lib/service/servicedvb.cpp diff --git a/lib/service/servicedvb.cpp b/lib/service/servicedvb.cpp index 7f17fc84..dcf11d23 100644 --- a/lib/service/servicedvb.cpp +++ b/lib/service/servicedvb.cpp @@ -40,6 +40,7 @@ public: RESULT getName(const eServiceReference &ref, std::string &name); int getLength(const eServiceReference &ref); int isPlayable(const eServiceReference &ref, const eServiceReference &ignore); + PyObject *getInfoObject(const eServiceReference &ref, int); }; DEFINE_REF(eStaticServiceDVBInformation); @@ -106,6 +107,270 @@ int eStaticServiceDVBInformation::isPlayable(const eServiceReference &ref, const return false; } +static void PutToDict(ePyObject &dict, const char*key, long value) +{ + ePyObject item = PyString_FromFormat("%d", value); + if (item) + { + if (PyDict_SetItemString(dict, key, item)) + eDebug("put %s to dict failed", key); + Py_DECREF(item); + } + else + eDebug("could not create PyObject for %s", key); +} + +extern void PutToDict(ePyObject &dict, const char*key, const char *value); + +void PutSatelliteDataToDict(ePyObject &dict, eDVBFrontendParametersSatellite &feparm) +{ + const char *tmp=0; + PutToDict(dict, "type", "satellite"); + PutToDict(dict, "frequency", feparm.frequency); + PutToDict(dict, "symbolrate", feparm.symbol_rate); + PutToDict(dict, "orbital position", feparm.orbital_position); + switch (feparm.inversion) + { + case eDVBFrontendParametersSatellite::Inversion::On: tmp="ON"; break; + case eDVBFrontendParametersSatellite::Inversion::Off: tmp="OFF"; break; + default: + case eDVBFrontendParametersSatellite::Inversion::Unknown: tmp="AUTO"; break; + } + PutToDict(dict, "inversion", tmp); + switch (feparm.fec) + { + case eDVBFrontendParametersSatellite::FEC::fNone: tmp="NONE"; break; + case eDVBFrontendParametersSatellite::FEC::f1_2: tmp="1/2"; break; + case eDVBFrontendParametersSatellite::FEC::f2_3: tmp="2/3"; break; + case eDVBFrontendParametersSatellite::FEC::f3_4: tmp="3/4"; break; + case eDVBFrontendParametersSatellite::FEC::f5_6: tmp="5/6"; break; + case eDVBFrontendParametersSatellite::FEC::f7_8: tmp="7/8"; break; + case eDVBFrontendParametersSatellite::FEC::f3_5: tmp="3/5"; break; + case eDVBFrontendParametersSatellite::FEC::f4_5: tmp="4/5"; break; + case eDVBFrontendParametersSatellite::FEC::f8_9: tmp="8/9"; break; + case eDVBFrontendParametersSatellite::FEC::f9_10: tmp="9/10"; break; + default: + case eDVBFrontendParametersSatellite::FEC::fAuto: tmp="AUTO"; break; + } + PutToDict(dict, "fec inner", tmp); + switch (feparm.modulation) + { + case eDVBFrontendParametersSatellite::Modulation::Auto: tmp="AUTO"; break; + case eDVBFrontendParametersSatellite::Modulation::QPSK: tmp="QPSK"; break; + case eDVBFrontendParametersSatellite::Modulation::M8PSK: tmp="8PSK"; break; + case eDVBFrontendParametersSatellite::Modulation::QAM_16: tmp="QAM16"; break; + } + PutToDict(dict, "modulation", tmp); + switch(feparm.polarisation) + { + case eDVBFrontendParametersSatellite::Polarisation::Horizontal: tmp="HORIZONTAL"; break; + case eDVBFrontendParametersSatellite::Polarisation::Vertical: tmp="VERTICAL"; break; + case eDVBFrontendParametersSatellite::Polarisation::CircularLeft: tmp="CIRCULAR LEFT"; break; + default: + case eDVBFrontendParametersSatellite::Polarisation::CircularRight: tmp="CIRCULAR RIGHT"; break; + } + PutToDict(dict, "polarization", tmp); + switch(feparm.system) + { + default: + case eDVBFrontendParametersSatellite::System::DVB_S: tmp="DVB-S"; break; + case eDVBFrontendParametersSatellite::System::DVB_S2: + switch(feparm.roll_off) + { + case eDVBFrontendParametersSatellite::RollOff::alpha_0_35: tmp="0.35"; break; + case eDVBFrontendParametersSatellite::RollOff::alpha_0_25: tmp="0.25"; break; + case eDVBFrontendParametersSatellite::RollOff::alpha_0_20: tmp="0.20"; break; + default: + case eDVBFrontendParametersSatellite::RollOff::alpha_auto: tmp="AUTO"; break; + } + PutToDict(dict, "roll off", tmp); + tmp="DVB-S2"; + break; + } + PutToDict(dict, "system", tmp); +} + +void PutTerrestrialDataToDict(ePyObject &dict, eDVBFrontendParametersTerrestrial &feparm) +{ + PutToDict(dict, "type", "terrestrial"); + PutToDict(dict, "frequency", feparm.frequency); + const char *tmp=0; + switch (feparm.bandwidth) + { + case eDVBFrontendParametersTerrestrial::Bandwidth::Bw8MHz: tmp="8 Mhz"; break; + case eDVBFrontendParametersTerrestrial::Bandwidth::Bw7MHz: tmp="7 Mhz"; break; + case eDVBFrontendParametersTerrestrial::Bandwidth::Bw6MHz: tmp="6 Mhz"; break; + default: + case eDVBFrontendParametersTerrestrial::Bandwidth::BwAuto: tmp="AUTO"; break; + } + PutToDict(dict, "bandwidth", tmp); + switch (feparm.code_rate_LP) + { + case eDVBFrontendParametersTerrestrial::FEC::f1_2: tmp="1/2"; break; + case eDVBFrontendParametersTerrestrial::FEC::f2_3: tmp="2/3"; break; + case eDVBFrontendParametersTerrestrial::FEC::f3_4: tmp="3/4"; break; + case eDVBFrontendParametersTerrestrial::FEC::f5_6: tmp="5/6"; break; + case eDVBFrontendParametersTerrestrial::FEC::f7_8: tmp="7/8"; break; + default: + case eDVBFrontendParametersTerrestrial::FEC::fAuto: tmp="AUTO"; break; + } + PutToDict(dict, "code rate lp", tmp); + switch (feparm.code_rate_HP) + { + case eDVBFrontendParametersTerrestrial::FEC::f1_2: tmp="1/2"; break; + case eDVBFrontendParametersTerrestrial::FEC::f2_3: tmp="2/3"; break; + case eDVBFrontendParametersTerrestrial::FEC::f3_4: tmp="3/4"; break; + case eDVBFrontendParametersTerrestrial::FEC::f5_6: tmp="5/6"; break; + case eDVBFrontendParametersTerrestrial::FEC::f7_8: tmp="7/8"; break; + default: + case eDVBFrontendParametersTerrestrial::FEC::fAuto: tmp="AUTO"; break; + } + PutToDict(dict, "code rate hp", tmp); + switch (feparm.modulation) + { + case eDVBFrontendParametersTerrestrial::Modulation::QPSK: tmp="QPSK"; break; + case eDVBFrontendParametersTerrestrial::Modulation::QAM16: tmp="QAM16"; break; + case eDVBFrontendParametersTerrestrial::Modulation::QAM64: tmp="QAM64"; break; + default: + case eDVBFrontendParametersTerrestrial::Modulation::Auto: tmp="AUTO"; break; + } + PutToDict(dict, "constellation", tmp); + switch (feparm.transmission_mode) + { + case eDVBFrontendParametersTerrestrial::TransmissionMode::TM2k: tmp="2k"; break; + case eDVBFrontendParametersTerrestrial::TransmissionMode::TM8k: tmp="8k"; break; + default: + case eDVBFrontendParametersTerrestrial::TransmissionMode::TMAuto: tmp="AUTO"; break; + } + PutToDict(dict, "transmission mode", tmp); + switch (feparm.guard_interval) + { + case eDVBFrontendParametersTerrestrial::GuardInterval::GI_1_32: tmp="1/32"; break; + case eDVBFrontendParametersTerrestrial::GuardInterval::GI_1_16: tmp="1/16"; break; + case eDVBFrontendParametersTerrestrial::GuardInterval::GI_1_8: tmp="1/8"; break; + case eDVBFrontendParametersTerrestrial::GuardInterval::GI_1_4: tmp="1/4"; break; + default: + case eDVBFrontendParametersTerrestrial::GuardInterval::GI_Auto: tmp="AUTO"; break; + } + PutToDict(dict, "guard interval", tmp); + switch (feparm.hierarchy) + { + case eDVBFrontendParametersTerrestrial::Hierarchy::HNone: tmp="NONE"; break; + case eDVBFrontendParametersTerrestrial::Hierarchy::H1: tmp="1"; break; + case eDVBFrontendParametersTerrestrial::Hierarchy::H2: tmp="2"; break; + case eDVBFrontendParametersTerrestrial::Hierarchy::H4: tmp="4"; break; + default: + case eDVBFrontendParametersTerrestrial::Hierarchy::HAuto: tmp="AUTO"; break; + } + PutToDict(dict, "hierarchy", tmp); + switch (feparm.inversion) + { + case eDVBFrontendParametersSatellite::Inversion::On: tmp="ON"; break; + case eDVBFrontendParametersSatellite::Inversion::Off: tmp="OFF"; break; + default: + case eDVBFrontendParametersSatellite::Inversion::Unknown: tmp="AUTO"; break; + } + PutToDict(dict, "inversion", tmp); +} + +void PutCableDataToDict(ePyObject &dict, eDVBFrontendParametersCable &feparm) +{ + const char *tmp=0; + PutToDict(dict, "type", "cable"); + PutToDict(dict, "frequency", feparm.frequency); + PutToDict(dict, "symbolrate", feparm.symbol_rate); + switch (feparm.modulation) + { + case eDVBFrontendParametersCable::Modulation::QAM16: tmp="QAM16"; break; + case eDVBFrontendParametersCable::Modulation::QAM32: tmp="QAM32"; break; + case eDVBFrontendParametersCable::Modulation::QAM64: tmp="QAM64"; break; + case eDVBFrontendParametersCable::Modulation::QAM128: tmp="QAM128"; break; + case eDVBFrontendParametersCable::Modulation::QAM256: tmp="QAM256"; break; + default: + case eDVBFrontendParametersCable::Modulation::Auto: tmp="AUTO"; break; + } + PutToDict(dict, "modulation", tmp); + switch (feparm.inversion) + { + case eDVBFrontendParametersCable::Inversion::On: tmp="ON"; break; + case eDVBFrontendParametersCable::Inversion::Off: tmp="OFF"; break; + default: + case eDVBFrontendParametersCable::Inversion::Unknown: tmp="AUTO"; break; + } + PutToDict(dict, "inversion", tmp); + switch (feparm.fec_inner) + { + case eDVBFrontendParametersCable::FEC::fNone: tmp="NONE"; break; + case eDVBFrontendParametersCable::FEC::f1_2: tmp="1/2"; break; + case eDVBFrontendParametersCable::FEC::f2_3: tmp="2/3"; break; + case eDVBFrontendParametersCable::FEC::f3_4: tmp="3/4"; break; + case eDVBFrontendParametersCable::FEC::f5_6: tmp="5/6"; break; + case eDVBFrontendParametersCable::FEC::f7_8: tmp="7/8"; break; + case eDVBFrontendParametersCable::FEC::f8_9: tmp="8/9"; break; + default: + case eDVBFrontendParametersCable::FEC::fAuto: tmp="AUTO"; break; + } + PutToDict(dict, "fec inner", tmp); +} + +PyObject *eStaticServiceDVBInformation::getInfoObject(const eServiceReference &r, int what) +{ + if (r.type == eServiceReference::idDVB) + { + const eServiceReferenceDVB &ref = (const eServiceReferenceDVB&)r; + switch(what) + { + case iServiceInformation::sTransponderData: + { + ePtr res; + if (!eDVBResourceManager::getInstance(res)) + { + ePtr db; + if (!res->getChannelList(db)) + { + eDVBChannelID chid; + ref.getChannelID(chid); + ePtr feparm; + if (!db->getChannelFrontendData(chid, feparm)) + { + int system; + if (!feparm->getSystem(system)) + { + ePyObject dict = PyDict_New(); + switch(system) + { + case iDVBFrontend::feSatellite: + { + eDVBFrontendParametersSatellite s; + feparm->getDVBS(s); + PutSatelliteDataToDict(dict, s); + break; + } + case iDVBFrontend::feTerrestrial: + { + eDVBFrontendParametersTerrestrial t; + feparm->getDVBT(t); + PutTerrestrialDataToDict(dict, t); + break; + } + case iDVBFrontend::feCable: + { + eDVBFrontendParametersCable c; + feparm->getDVBC(c); + PutCableDataToDict(dict, c); + break; + } + } + } + } + } + } + } + } + } + Py_RETURN_NONE; +} + DEFINE_REF(eStaticServiceDVBBouquetInformation); RESULT eStaticServiceDVBBouquetInformation::getName(const eServiceReference &ref, std::string &name) @@ -192,6 +457,13 @@ int eStaticServiceDVBBouquetInformation::getLength(const eServiceReference &ref) return -1; } +#include + +RESULT eStaticServiceDVBBouquetInformation::getEvent(const eServiceReference &ref, ePtr &ptr, time_t start_time) +{ + return eEPGCache::getInstance()->lookupEventTime(ref, start_time, ptr); +} + class eStaticServiceDVBPVRInformation: public iStaticServiceInformation { DECLARE_REF(eStaticServiceDVBPVRInformation); @@ -707,6 +979,7 @@ RESULT eServiceFactoryDVB::lookupService(ePtr &service, const eServ eDVBServicePlay::eDVBServicePlay(const eServiceReference &ref, eDVBService *service): m_reference(ref), m_dvb_service(service), m_have_video_pid(0), m_is_paused(0) { + memset(&m_videoEventData, 0, sizeof(struct iTSMPEGDecoder::videoEvent)); m_is_primary = 1; m_is_pvr = !m_reference.path.empty(); @@ -722,6 +995,8 @@ eDVBServicePlay::eDVBServicePlay(const eServiceReference &ref, eDVBService *serv m_subtitle_widget = 0; + m_tune_state = -1; + CONNECT(m_subtitle_sync_timer.timeout, eDVBServicePlay::checkSubtitleTiming); } @@ -748,6 +1023,8 @@ void eDVBServicePlay::gotNewEvent() void eDVBServicePlay::serviceEvent(int event) { + m_tune_state = event; + switch (event) { case eDVBServicePMTHandler::eventTuned: @@ -767,9 +1044,12 @@ void eDVBServicePlay::serviceEvent(int event) } break; } + case eDVBServicePMTHandler::eventNoPAT: + case eDVBServicePMTHandler::eventNoPATEntry: + case eDVBServicePMTHandler::eventNoPMT: case eDVBServicePMTHandler::eventTuneFailed: { - eDebug("DVB service failed to tune"); + eDebug("DVB service failed to tune - error %d", event); m_event((iPlayableService*)this, evTuneFailed); break; } @@ -1203,19 +1483,42 @@ RESULT eDVBServicePlay::getEvent(ePtr &evt, int nownext) int eDVBServicePlay::getInfo(int w) { eDVBServicePMTHandler::program program; - + if (w == sCAIDs) return resIsPyObject; eDVBServicePMTHandler &h = m_timeshift_active ? m_service_handler_timeshift : m_service_handler; + int no_program_info = 0; + if (h.getProgramInfo(program)) - return -1; + no_program_info = 1; switch (w) { +#if HAVE_DVB_API_VERSION >= 3 + case sVideoHeight: + if (m_videoEventData.type != iTSMPEGDecoder::videoEvent::eventUnknown) + return m_videoEventData.height; + return -1; + case sVideoWidth: + if (m_videoEventData.type != iTSMPEGDecoder::videoEvent::eventUnknown) + return m_videoEventData.width; + return -1; +#else +#warning "FIXMEE implement sVideoHeight, sVideoWidth for old DVB API" +#endif case sAspect: - if (!program.videoStreams.empty() && program.videoStreams[0].component_tag != -1) +#if HAVE_DVB_API_VERSION >= 3 + if (m_videoEventData.type != iTSMPEGDecoder::videoEvent::eventUnknown) + return m_videoEventData.aspect == VIDEO_FORMAT_4_3 ? 1 : 3; + else +#else +#warning "FIXMEE implement sAspect for old DVB API" +#endif + if (no_program_info) + return -1; + else if (!program.videoStreams.empty() && program.videoStreams[0].component_tag != -1) { ePtr evt; if (!m_event_handler.getEvent(evt, 0)) @@ -1253,19 +1556,20 @@ int eDVBServicePlay::getInfo(int w) } } return -1; - 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[0].pid; - case sPCRPID: return program.pcrPid; - case sPMTPID: return program.pmtPid; - case sTXTPID: return program.textPid; + case sIsCrypted: if (no_program_info) return -1; return program.isCrypted(); + case sVideoPID: if (no_program_info) return -1; if (program.videoStreams.empty()) return -1; return program.videoStreams[0].pid; + case sVideoType: if (no_program_info) return -1; if (program.videoStreams.empty()) return -1; return program.videoStreams[0].type; + case sAudioPID: if (no_program_info) return -1; if (program.audioStreams.empty()) return -1; return program.audioStreams[0].pid; + case sPCRPID: if (no_program_info) return -1; return program.pcrPid; + case sPMTPID: if (no_program_info) return -1; return program.pmtPid; + case sTXTPID: if (no_program_info) return -1; return program.textPid; case sSID: return ((const eServiceReferenceDVB&)m_reference).getServiceID().get(); case sONID: return ((const eServiceReferenceDVB&)m_reference).getOriginalNetworkID().get(); case sTSID: return ((const eServiceReferenceDVB&)m_reference).getTransportStreamID().get(); case sNamespace: return ((const eServiceReferenceDVB&)m_reference).getDVBNamespace().get(); case sProvider: if (!m_dvb_service) return -1; return -2; case sServiceref: return resIsString; + case sDVBState: return m_tune_state; default: return -1; } @@ -1292,6 +1596,8 @@ PyObject *eDVBServicePlay::getInfoObject(int w) { case sCAIDs: return m_service_handler.getCaIds(); + case sTransponderData: + return eStaticServiceDVBInformation().getInfoObject(m_reference, w); default: break; } @@ -1477,10 +1783,7 @@ PyObject *eDVBServiceBase::getFrontendData(bool original) } } if (!ret) - { - ret = Py_None; - Py_INCREF(ret); - } + Py_RETURN_NONE; return ret; } @@ -1810,7 +2113,11 @@ void eDVBServicePlay::updateDecoder() { h.getDecodeDemux(m_decode_demux); if (m_decode_demux) + { m_decode_demux->getMPEGDecoder(m_decoder, m_is_primary); + if (m_decoder) + m_decoder->connectVideoEvent(slot(*this, &eDVBServicePlay::video_event), m_video_event_connection); + } if (m_cue) m_cue->setDecodingDemux(m_decode_demux, m_decoder); m_teletext_parser = new eDVBTeletextParser(m_decode_demux); @@ -1916,7 +2223,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); } @@ -2182,17 +2489,13 @@ PyObject *eDVBServicePlay::getCachedSubtitle() } } } - Py_INCREF(Py_None); - return Py_None; + Py_RETURN_NONE; } PyObject *eDVBServicePlay::getSubtitleList() { if (!m_teletext_parser) - { - Py_INCREF(Py_None); - return Py_None; - } + Py_RETURN_NONE; ePyObject l = PyList_New(0); std::set added_ttx_pages; @@ -2390,6 +2693,13 @@ void eDVBServicePlay::setPCMDelay(int delay) m_decoder->setPCMDelay(delay); } +void eDVBServicePlay::video_event(struct iTSMPEGDecoder::videoEvent event) +{ + eDebug("!!!!!!!!!! Video Event type %d, aspect %d, %dx%d", event.type, event.aspect, event.width, event.height); + memcpy(&m_videoEventData, &event, sizeof(iTSMPEGDecoder::videoEvent)); + m_event((iPlayableService*)this, evVideoSizeChanged); +} + DEFINE_REF(eDVBServicePlay) eAutoInitPtr init_eServiceFactoryDVB(eAutoInitNumbers::service+1, "eServiceFactoryDVB");