X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/9eea8eab34e64901920309548a5c05e636b25625..5eb41508927a7f48d09d52e158e136fa07252dac:/lib/service/servicedvb.cpp diff --git a/lib/service/servicedvb.cpp b/lib/service/servicedvb.cpp index a3450b89..4141236a 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); @@ -166,15 +164,22 @@ void PutSatelliteDataToDict(ePyObject &dict, eDVBFrontendParametersSatellite &fe default: case eDVBFrontendParametersSatellite::System::DVB_S: tmp="DVB-S"; break; case eDVBFrontendParametersSatellite::System::DVB_S2: - switch(feparm.roll_off) + switch(feparm.rolloff) { + default: 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); + switch(feparm.pilot) + { + case eDVBFrontendParametersSatellite::Pilot::On: tmp="ON"; break; + case eDVBFrontendParametersSatellite::Pilot::Off: tmp="OFF"; break; + default: + case eDVBFrontendParametersSatellite::Pilot::Unknown: tmp="AUTO"; break; + } + PutToDict(dict, "pilot", tmp); tmp="DVB-S2"; break; } @@ -402,7 +407,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 +433,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; @@ -643,7 +673,11 @@ eServiceFactoryDVB::eServiceFactoryDVB() eServiceCenter::getPrivInstance(sc); if (sc) - sc->addServiceFactory(eServiceFactoryDVB::id, this); + { + std::list extensions; + extensions.push_back("ts"); + sc->addServiceFactory(eServiceFactoryDVB::id, this, extensions); + } m_StaticServiceDVBInfo = new eStaticServiceDVBInformation; m_StaticServiceDVBBouquetInfo = new eStaticServiceDVBBouquetInformation; @@ -784,7 +818,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) @@ -1026,7 +1060,9 @@ eDVBServicePlay::eDVBServicePlay(const eServiceReference &ref, eDVBService *serv 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 +1107,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 +1115,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); @@ -1190,8 +1228,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; @@ -1454,9 +1492,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; @@ -1528,38 +1573,67 @@ RESULT eDVBServicePlay::getEvent(ePtr &evt, int nownext) return m_event_handler.getEvent(evt, nownext); } +static int readMpegProc(char *str, int decoder) +{ + int val = -1; + char tmp[64]; + sprintf(tmp, "/proc/stb/vmpeg/%d/%s", decoder, str); + FILE *f = fopen(tmp, "r"); + if (f) + { + fscanf(f, "%x", &val); + fclose(f); + } + return val; +} + 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) + if (m_videoEventData.type == iTSMPEGDecoder::videoEvent::eventSizeChanged) return m_videoEventData.height; - return -1; + else + return readMpegProc("yres", !m_is_primary); case sVideoWidth: - if (m_videoEventData.type != iTSMPEGDecoder::videoEvent::eventUnknown) + if (m_videoEventData.type == iTSMPEGDecoder::videoEvent::eventSizeChanged) return m_videoEventData.width; - return -1; + else + return readMpegProc("xres", !m_is_primary); + case sFrameRate: + if (m_videoEventData.type == iTSMPEGDecoder::videoEvent::eventFrameRateChanged) + return m_videoEventData.framerate; + else + return readMpegProc("framerate", !m_is_primary); + case sProgressive: + if (m_videoEventData.type == iTSMPEGDecoder::videoEvent::eventProgressiveChanged) + return m_videoEventData.progressive; + return readMpegProc("progressive", !m_is_primary); #else -#warning "FIXMEE implement sVideoHeight, sVideoWidth for old DVB API" +#warning "FIXMEE implement sFrameRate, sProgressive, sVideoHeight, sVideoWidth for old DVB API" #endif case sAspect: + { + int val; #if HAVE_DVB_API_VERSION >= 3 - if (m_videoEventData.type != iTSMPEGDecoder::videoEvent::eventUnknown) + if (m_videoEventData.type == iTSMPEGDecoder::videoEvent::eventSizeChanged) return m_videoEventData.aspect == VIDEO_FORMAT_4_3 ? 1 : 3; + else if ((val=readMpegProc("aspect", !m_is_primary)) != -1) + return val; else #else #warning "FIXMEE implement sAspect for old DVB API" @@ -1604,6 +1678,7 @@ int eDVBServicePlay::getInfo(int w) } } return -1; + } 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; @@ -1786,7 +1861,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) { @@ -2043,12 +2119,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; @@ -2536,7 +2623,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; @@ -2828,11 +2924,11 @@ 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(); } @@ -2845,7 +2941,7 @@ void eDVBServicePlay::checkSubtitleTiming() } else { eDebug("start subtitle delay %d", diff / 90); - m_subtitle_sync_timer.start(diff / 90, 1); + m_subtitle_sync_timer->start(diff / 90, 1); break; } } @@ -2902,8 +2998,20 @@ 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); + memcpy(&m_videoEventData, &event, sizeof(event)); + 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)