X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/7e3fc622d3a9dfcec4009d3fff223c6303e497ab..d58ca4cf34b7621aea4e2c1ff07bed6b2cd6b763:/lib/service/servicedvb.cpp diff --git a/lib/service/servicedvb.cpp b/lib/service/servicedvb.cpp index b97104a1..14c849db 100644 --- a/lib/service/servicedvb.cpp +++ b/lib/service/servicedvb.cpp @@ -31,8 +31,6 @@ #error no byte order defined! #endif -#define TSPATH "/media/hdd" - class eStaticServiceDVBInformation: public iStaticServiceInformation { DECLARE_REF(eStaticServiceDVBInformation); @@ -98,210 +96,50 @@ 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); +extern void PutToDict(ePyObject &dict, const char*key, long value); // defined in dvb/frontend.cpp +extern void PutToDict(ePyObject &dict, const char*key, ePyObject item); // defined in dvb/frontend.cpp +extern void PutToDict(ePyObject &dict, const char*key, const char *value); // defined in dvb/frontend.cpp void PutSatelliteDataToDict(ePyObject &dict, eDVBFrontendParametersSatellite &feparm) { - const char *tmp=0; - PutToDict(dict, "type", "Satellite"); + PutToDict(dict, "tuner_type", "DVB-S"); PutToDict(dict, "frequency", feparm.frequency); - PutToDict(dict, "symbolrate", feparm.symbol_rate); - PutToDict(dict, "orbital position", feparm.orbital_position); - switch (feparm.inversion) + PutToDict(dict, "symbol_rate", feparm.symbol_rate); + PutToDict(dict, "orbital_position", feparm.orbital_position); + PutToDict(dict, "inversion", feparm.inversion); + PutToDict(dict, "fec_inner", feparm.fec); + PutToDict(dict, "modulation", feparm.modulation); + PutToDict(dict, "polarization", feparm.polarisation); + if (feparm.system == eDVBFrontendParametersSatellite::System_DVB_S2) { - 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, "rolloff", feparm.rolloff); + PutToDict(dict, "pilot", feparm.pilot); } - PutToDict(dict, "system", tmp); + PutToDict(dict, "system", feparm.system); } void PutTerrestrialDataToDict(ePyObject &dict, eDVBFrontendParametersTerrestrial &feparm) { - PutToDict(dict, "type", "Terrestrial"); + PutToDict(dict, "tuner_type", "DVB-T"); 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); + PutToDict(dict, "bandwidth", feparm.bandwidth); + PutToDict(dict, "code_rate_lp", feparm.code_rate_LP); + PutToDict(dict, "code_rate_hp", feparm.code_rate_HP); + PutToDict(dict, "constellation", feparm.modulation); + PutToDict(dict, "transmission_mode", feparm.transmission_mode); + PutToDict(dict, "guard_interval", feparm.guard_interval); + PutToDict(dict, "hierarchy_information", feparm.hierarchy); + PutToDict(dict, "inversion", feparm.inversion); } void PutCableDataToDict(ePyObject &dict, eDVBFrontendParametersCable &feparm) { - const char *tmp=0; - PutToDict(dict, "type", "Cable"); + PutToDict(dict, "tuner_type", "DVB-C"); 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); + PutToDict(dict, "symbol_rate", feparm.symbol_rate); + PutToDict(dict, "modulation", feparm.modulation); + PutToDict(dict, "inversion", feparm.inversion); + PutToDict(dict, "fec_inner", feparm.fec_inner); } PyObject *eStaticServiceDVBInformation::getInfoObject(const eServiceReference &r, int what) @@ -402,7 +240,7 @@ RESULT eStaticServiceDVBBouquetInformation::getName(const eServiceReference &ref return -1; } -int eStaticServiceDVBBouquetInformation::isPlayable(const eServiceReference &ref, const eServiceReference &ignore) +int eStaticServiceDVBBouquetInformation::isPlayable(const eServiceReference &ref, const eServiceReference &ignore, bool simulate) { if (ref.flags & eServiceReference::isGroup) { @@ -428,13 +266,38 @@ int eStaticServiceDVBBouquetInformation::isPlayable(const eServiceReference &ref return 0; } + int prio_order = eDVBFrontend::getTypePriorityOrder(); int cur=0; eDVBChannelID chid, chid_ignore; ((const eServiceReferenceDVB&)ignore).getChannelID(chid_ignore); for (std::list::iterator it(bouquet->m_services.begin()); it != bouquet->m_services.end(); ++it) { + static unsigned char prio_map[6][3] = { + { 3, 2, 1 }, // -S -C -T + { 3, 1, 2 }, // -S -T -C + { 2, 3, 1 }, // -C -S -T + { 1, 3, 2 }, // -C -T -S + { 1, 2, 3 }, // -T -C -S + { 2, 1, 3 } // -T -S -C + }; ((const eServiceReferenceDVB&)*it).getChannelID(chid); - int tmp=res->canAllocateChannel(chid, chid_ignore); + int tmp=res->canAllocateChannel(chid, chid_ignore, simulate); + switch(tmp) + { + 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; + } if (tmp > cur) { m_playable_service = *it; @@ -504,14 +367,29 @@ int eStaticServiceDVBPVRInformation::getLength(const eServiceReference &ref) eDVBTSTools tstools; + struct stat s; + stat(ref.path.c_str(), &s); + + 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)) return 0; - return len / 90000; + m_parser.m_length = len; + m_parser.m_filesize = s.st_size; + m_parser.updateMeta(ref.path); + return m_parser.m_length / 90000; } int eStaticServiceDVBPVRInformation::getInfo(const eServiceReference &ref, int w) @@ -628,6 +506,7 @@ RESULT eDVBPVRServiceOfflineOperations::getListOfFilenames(std::listaddServiceFactory(eServiceFactoryDVB::id, this); + { + std::list extensions; + extensions.push_back("ts"); + extensions.push_back("trp"); + sc->addServiceFactory(eServiceFactoryDVB::id, this, extensions); + } m_StaticServiceDVBInfo = new eStaticServiceDVBInformation; m_StaticServiceDVBBouquetInfo = new eStaticServiceDVBBouquetInformation; @@ -784,7 +668,7 @@ PyObject *eDVBServiceList::getContent(const char* format, bool sorted) sptr->getName(ref, name); // filter short name brakets - unsigned int pos; + size_t pos; while((pos = name.find("\xc2\x86")) != std::string::npos) name.erase(pos,2); while((pos = name.find("\xc2\x87")) != std::string::npos) @@ -1008,7 +892,6 @@ 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(); @@ -1025,8 +908,10 @@ eDVBServicePlay::eDVBServicePlay(const eServiceReference &ref, eDVBService *serv m_subtitle_widget = 0; m_tune_state = -1; - - CONNECT(m_subtitle_sync_timer.timeout, eDVBServicePlay::checkSubtitleTiming); + + m_subtitle_sync_timer = eTimer::create(eApp); + + CONNECT(m_subtitle_sync_timer->timeout, eDVBServicePlay::checkSubtitleTiming); } eDVBServicePlay::~eDVBServicePlay() @@ -1071,6 +956,7 @@ void eDVBServicePlay::serviceEvent(int event) else m_event_handler.start(m_demux, sid); } + m_event((iPlayableService*)this, evTunedIn); break; } case eDVBServicePMTHandler::eventNoResources: @@ -1078,6 +964,7 @@ void eDVBServicePlay::serviceEvent(int event) case eDVBServicePMTHandler::eventNoPATEntry: case eDVBServicePMTHandler::eventNoPMT: case eDVBServicePMTHandler::eventTuneFailed: + case eDVBServicePMTHandler::eventMisconfiguration: { eDebug("DVB service failed to tune - error %d", event); m_event((iPlayableService*)this, evTuneFailed); @@ -1120,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; } } @@ -1190,8 +1080,8 @@ RESULT eDVBServicePlay::stop() { int perc = play_position * 100LL / length; - /* only store last play position when between 5% and 95% */ - if ((5 < perc) && (perc < 95)) + /* only store last play position when between 1% and 99% */ + if ((1 < perc) && (perc < 99)) m_cue_entries.insert(cueEntry(play_position, 3)); /* last play position */ } m_cuesheet_changed = 1; @@ -1243,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 @@ -1250,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; @@ -1282,8 +1182,13 @@ RESULT eDVBServicePlay::setFastForward(int ratio) if (!m_decoder) return -1; - - return m_decoder->setFastForward(ffratio); + + if (ffratio == 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) @@ -1311,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; } @@ -1406,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() @@ -1454,9 +1362,16 @@ RESULT eDVBServicePlay::timeshift(ePtr &ptr) { if (!m_timeshift_enabled) { - /* we need enough diskspace */ + /* query config path */ + std::string tspath; + if(ePythonConfigQuery::getConfigValue("config.usage.timeshift_path", tspath) == -1){ + eDebug("could not query ts path from config"); + return -4; + } + tspath.append("/"); + /* we need enough diskspace */ struct statfs fs; - if (statfs(TSPATH "/.", &fs) < 0) + if (statfs(tspath.c_str(), &fs) < 0) { eDebug("statfs failed!"); return -2; @@ -1531,42 +1446,43 @@ 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)) 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; + if (m_decoder) + return m_decoder->getVideoHeight(); + break; 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 + if (m_decoder) + return m_decoder->getVideoWidth(); + break; + case sFrameRate: + if (m_decoder) + return m_decoder->getVideoFrameRate(); + break; + case sProgressive: + if (m_decoder) + return m_decoder->getVideoProgressive(); + break; case sAspect: -#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 + { + int aspect = -1; + if (m_decoder) + aspect = m_decoder->getVideoAspect(); if (no_program_info) - return -1; - else if (!program.videoStreams.empty() && program.videoStreams[0].component_tag != -1) + break; + else if (aspect == -1 && !program.videoStreams.empty() && program.videoStreams[0].component_tag != -1) { ePtr evt; if (!m_event_handler.getEvent(evt, 0)) @@ -1603,7 +1519,10 @@ int eDVBServicePlay::getInfo(int w) } } } - return -1; + else + return aspect; + break; + } 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; @@ -1619,8 +1538,9 @@ int eDVBServicePlay::getInfo(int w) case sServiceref: return resIsString; case sDVBState: return m_tune_state; default: - return -1; + break; } + return -1; } std::string eDVBServicePlay::getInfoString(int w) @@ -1682,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; @@ -1707,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 @@ -1786,7 +1708,8 @@ int eDVBServicePlay::selectAudioStream(int i) anything in the best case, or destroy the default setting in case the real default is not yet available.) */ - if (m_dvb_service && !m_is_pvr && (i != -1)) + if (m_dvb_service && !m_is_pvr && ((i != -1) + || ((m_dvb_service->getCacheEntry(eDVBService::cAPID) == -1) && (m_dvb_service->getCacheEntry(eDVBService::cAC3PID)==-1)))) { if (apidtype == eDVBAudio::aMPEG) { @@ -1955,31 +1878,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)) - { - void PutToDict(ePyObject &, const char*, long); - void PutToDict(ePyObject &, const char*, const char*); - PutToDict(ret, "orbital_position", osat.orbital_position); - const char *tmp = "UNKNOWN"; - switch(osat.polarisation) - { - case eDVBFrontendParametersSatellite::Polarisation::Horizontal: tmp="HORIZONTAL"; break; - case eDVBFrontendParametersSatellite::Polarisation::Vertical: tmp="VERTICAL"; break; - case eDVBFrontendParametersSatellite::Polarisation::CircularLeft: tmp="CIRCULAR_LEFT"; break; - case eDVBFrontendParametersSatellite::Polarisation::CircularRight: tmp="CIRCULAR_RIGHT"; break; - default:break; - } - PutToDict(ret, "polarization", tmp); - } - } - } } } else @@ -2043,12 +1942,23 @@ RESULT eDVBServicePlay::startTimeshift() if (!m_record) return -3; - char templ[]=TSPATH "/timeshift.XXXXXX"; + std::string tspath; + if(ePythonConfigQuery::getConfigValue("config.usage.timeshift_path", tspath) == -1){ + eDebug("could not query ts path"); + return -5; + } + tspath.append("/timeshift.XXXXXX"); + char* templ; + templ = new char[tspath.length() + 1]; + strcpy(templ, tspath.c_str()); + m_timeshift_fd = mkstemp(templ); - m_timeshift_file = templ; - + m_timeshift_file = std::string(templ); + eDebug("recording to %s", templ); - + + delete [] templ; + if (m_timeshift_fd < 0) { m_record = 0; @@ -2110,8 +2020,8 @@ PyObject *eDVBServicePlay::getCutList() for (std::multiset::iterator i(m_cue_entries.begin()); i != m_cue_entries.end(); ++i) { ePyObject tuple = PyTuple_New(2); - PyTuple_SetItem(tuple, 0, PyLong_FromLongLong(i->where)); - PyTuple_SetItem(tuple, 1, PyInt_FromLong(i->what)); + PyTuple_SET_ITEM(tuple, 0, PyLong_FromLongLong(i->where)); + PyTuple_SET_ITEM(tuple, 1, PyInt_FromLong(i->what)); PyList_Append(list, tuple); Py_DECREF(tuple); } @@ -2224,6 +2134,8 @@ void eDVBServicePlay::switchToLive() if (!m_timeshift_active) return; + eDebug("SwitchToLive"); + m_cue = 0; m_decoder = 0; m_decode_demux = 0; @@ -2265,7 +2177,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(); @@ -2394,13 +2306,12 @@ void eDVBServicePlay::updateDecoder() m_teletext_parser->start(program.textPid); - if (!m_is_primary) - m_decoder->setTrickmode(1); - - if (m_is_paused) - m_decoder->preroll(); +/* if (!m_is_primary) + m_decoder->setTrickmode(); + else */ if (m_is_paused) + m_decoder->pause(); else - m_decoder->start(); + m_decoder->play(); if (vpid > 0 && vpid < 0x2000) ; @@ -2422,7 +2333,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); } @@ -2536,7 +2447,16 @@ void eDVBServicePlay::cutlistToCuesheet() } } - if (in != out) + if (in < 0) + in = 0; + if (out < 0) + out = 0; + if (in > length) + in = length; + if (out > length) + out = length; + + if (in < out) m_cue->addSourceSpan(in, out); in = length; @@ -2775,6 +2695,10 @@ void eDVBServicePlay::newSubtitlePage(const eDVBTeletextSubtitlePage &page) { if (m_subtitle_widget) { + pts_t pos = 0; + if (m_decoder) + m_decoder->getPTS(0, pos); + eDebug("got new subtitle page %lld %lld %d", pos, page.m_pts, page.m_have_pts); m_subtitle_pages.push_back(page); checkSubtitleTiming(); } @@ -2782,7 +2706,7 @@ void eDVBServicePlay::newSubtitlePage(const eDVBTeletextSubtitlePage &page) void eDVBServicePlay::checkSubtitleTiming() { -// eDebug("checkSubtitleTiming"); + eDebug("checkSubtitleTiming"); if (!m_subtitle_widget) return; while (1) @@ -2811,11 +2735,11 @@ void eDVBServicePlay::checkSubtitleTiming() if (m_decoder) m_decoder->getPTS(0, pos); -// eDebug("%lld %lld", pos, show_time); + eDebug("%lld %lld", pos, show_time); int diff = show_time - pos; if (diff < 0) { -// eDebug("[late (%d ms)]", -diff / 90); + eDebug("[late (%d ms)]", -diff / 90); diff = 0; } // if (diff > 900000) @@ -2824,24 +2748,24 @@ void eDVBServicePlay::checkSubtitleTiming() // diff = 0; // } - if (!diff) + if ((diff/90)<20) { if (type == TELETEXT) { -// eDebug("display teletext subtitle page"); + eDebug("display teletext subtitle page %lld", show_time); m_subtitle_widget->setPage(page); m_subtitle_pages.pop_front(); } else { -// eDebug("display dvb subtitle Page %lld", show_time); + eDebug("display dvb subtitle Page %lld", show_time); 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); + eDebug("start subtitle delay %d", diff / 90); + m_subtitle_sync_timer->start(diff / 90, 1); break; } } @@ -2851,6 +2775,10 @@ void eDVBServicePlay::newDVBSubtitlePage(const eDVBSubtitlePage &p) { if (m_subtitle_widget) { + pts_t pos = 0; + 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); checkSubtitleTiming(); } @@ -2894,8 +2822,19 @@ void eDVBServicePlay::setPCMDelay(int delay) void eDVBServicePlay::video_event(struct iTSMPEGDecoder::videoEvent event) { - memcpy(&m_videoEventData, &event, sizeof(iTSMPEGDecoder::videoEvent)); - m_event((iPlayableService*)this, evVideoSizeChanged); + switch(event.type) { + case iTSMPEGDecoder::videoEvent::eventSizeChanged: + m_event((iPlayableService*)this, evVideoSizeChanged); + break; + case iTSMPEGDecoder::videoEvent::eventFrameRateChanged: + m_event((iPlayableService*)this, evVideoFramerateChanged); + break; + case iTSMPEGDecoder::videoEvent::eventProgressiveChanged: + m_event((iPlayableService*)this, evVideoProgressiveChanged); + break; + default: + break; + } } RESULT eDVBServicePlay::stream(ePtr &ptr) @@ -2909,18 +2848,16 @@ PyObject *eDVBServicePlay::getStreamingData() eDVBServicePMTHandler::program program; if (m_service_handler.getProgramInfo(program)) { - Py_INCREF(Py_None); - return Py_None; + Py_RETURN_NONE; } - PyObject *r = program.createPythonObject(); + ePyObject r = program.createPythonObject(); ePtr demux; if (!m_service_handler.getDataDemux(demux)) { uint8_t demux_id; - demux->getCADemuxID(demux_id); - - PyDict_SetItemString(r, "demux", PyInt_FromLong(demux_id)); + if (!demux->getCADemuxID(demux_id)) + PutToDict(r, "demux", demux_id); } return r;