X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/06d78eb689babb22f1a315203a8c6871d9ae121d..28ddb2c21514dc49826847b38f60bf3a663be551:/lib/service/servicedvb.cpp diff --git a/lib/service/servicedvb.cpp b/lib/service/servicedvb.cpp index 4b7ee85c..650b609e 100644 --- a/lib/service/servicedvb.cpp +++ b/lib/service/servicedvb.cpp @@ -8,10 +8,16 @@ #include #include +#include #include #include #include +#include + +#include + +#define TSPATH "/media/hdd" class eStaticServiceDVBInformation: public iStaticServiceInformation { @@ -304,7 +310,32 @@ RESULT eDVBServiceList::startQuery() return 0; } -RESULT eDVBServiceList::getContent(std::list &list) +RESULT eDVBServiceList::getContent(PyObject *list, bool sorted) +{ + eServiceReferenceDVB ref; + + if (!m_query || !list || !PyList_Check(list)) + return -1; + + std::list tmplist; + + while (!m_query->getNextResult(ref)) + tmplist.push_back(ref); + + if (sorted) + tmplist.sort(iListableServiceCompare(this)); + + for (std::list::iterator it(tmplist.begin()); + it != tmplist.end(); ++it) + { + PyObject *refobj = New_eServiceReference(*it); + PyList_Append(list, refobj); + Py_DECREF(refobj); + } + return 0; +} + +RESULT eDVBServiceList::getContent(std::list &list, bool sorted) { eServiceReferenceDVB ref; @@ -313,6 +344,10 @@ RESULT eDVBServiceList::getContent(std::list &list) while (!m_query->getNextResult(ref)) list.push_back(ref); + + if (sorted) + list.sort(iListableServiceCompare(this)); + return 0; } @@ -378,6 +413,13 @@ RESULT eDVBServiceList::flushChanges() return m_bouquet->flushChanges(); } +RESULT eDVBServiceList::setListName(const std::string &name) +{ + if (!m_bouquet) + return -1; + return m_bouquet->setListName(name); +} + RESULT eServiceFactoryDVB::play(const eServiceReference &ref, ePtr &ptr) { ePtr service; @@ -484,12 +526,14 @@ RESULT eServiceFactoryDVB::lookupService(ePtr &service, const eServ } eDVBServicePlay::eDVBServicePlay(const eServiceReference &ref, eDVBService *service): - m_reference(ref), m_dvb_service(service), m_service_handler(0), m_is_paused(0) + m_reference(ref), m_dvb_service(service), m_is_paused(0) { m_is_pvr = !ref.path.empty(); - m_timeshift_enabled = 0; + m_timeshift_enabled = m_timeshift_active = 0; + m_skipmode = 0; CONNECT(m_service_handler.serviceEvent, eDVBServicePlay::serviceEvent); + CONNECT(m_service_handler_timeshift.serviceEvent, eDVBServicePlay::serviceEventTimeshift); CONNECT(m_event_handler.m_eit_changed, eDVBServicePlay::gotNewEvent); } @@ -520,7 +564,7 @@ void eDVBServicePlay::serviceEvent(int event) case eDVBServicePMTHandler::eventTuned: { ePtr m_demux; - if (!m_service_handler.getDemux(m_demux)) + if (!m_service_handler.getDataDemux(m_demux)) { eServiceReferenceDVB &ref = (eServiceReferenceDVB&) m_reference; int sid = ref.getParentServiceID().get(); @@ -542,101 +586,61 @@ void eDVBServicePlay::serviceEvent(int event) } case eDVBServicePMTHandler::eventNewProgramInfo: { - int vpid = -1, apid = -1, apidtype = -1, pcrpid = -1; - eDVBServicePMTHandler::program program; - if (m_service_handler.getProgramInfo(program)) - eDebug("getting program info failed."); - else - { - eDebugNoNewLine("have %d video stream(s)", program.videoStreams.size()); - if (!program.videoStreams.empty()) - { - eDebugNoNewLine(" ("); - for (std::vector::const_iterator - i(program.videoStreams.begin()); - i != program.videoStreams.end(); ++i) - { - if (vpid == -1) - vpid = i->pid; - if (i != program.videoStreams.begin()) - eDebugNoNewLine(", "); - eDebugNoNewLine("%04x", i->pid); - } - eDebugNoNewLine(")"); - } - eDebugNoNewLine(", and %d audio stream(s)", program.audioStreams.size()); - if (!program.audioStreams.empty()) - { - eDebugNoNewLine(" ("); - for (std::vector::const_iterator - i(program.audioStreams.begin()); - i != program.audioStreams.end(); ++i) - { - if (apid == -1) - { - apid = i->pid; - apidtype = i->type; - } - if (i != program.audioStreams.begin()) - eDebugNoNewLine(", "); - eDebugNoNewLine("%04x", i->pid); - } - eDebugNoNewLine(")"); - } - eDebug(", and the pcr pid is %04x", program.pcrPid); - if (program.pcrPid != 0x1fff) - pcrpid = program.pcrPid; - } - - if (!m_decoder) - { - ePtr demux; - m_service_handler.getDemux(demux); - if (demux) - demux->getMPEGDecoder(m_decoder); - } - - if (m_decoder) - { - m_decoder->setVideoPID(vpid); - m_current_audio_stream = 0; - m_decoder->setAudioPID(apid, apidtype); - if (!m_is_pvr) - m_decoder->setSyncPCR(pcrpid); - else - m_decoder->setSyncPCR(-1); - m_decoder->start(); -// how we can do this better? -// update cache pid when the user changed the audio track or video track -// TODO handling of difference audio types.. default audio types.. - - /* don't worry about non-existing services, nor pvr services */ - if (m_dvb_service && !m_is_pvr) - { - m_dvb_service->setCachePID(eDVBService::cVPID, vpid); - m_dvb_service->setCachePID(eDVBService::cAPID, apid); - m_dvb_service->setCachePID(eDVBService::cPCRPID, pcrpid); - } - } - + eDebug("eventNewProgramInfo %d %d", m_timeshift_enabled, m_timeshift_active); + if (m_timeshift_enabled) + updateTimeshiftPids(); + if (!m_timeshift_active) + updateDecoder(); + m_event((iPlayableService*)this, evUpdatedInfo); break; } + case eDVBServicePMTHandler::eventEOF: + m_event((iPlayableService*)this, evEOF); + break; + case eDVBServicePMTHandler::eventSOF: + m_event((iPlayableService*)this, evSOF); + break; + } +} + +void eDVBServicePlay::serviceEventTimeshift(int event) +{ + switch (event) + { + case eDVBServicePMTHandler::eventNewProgramInfo: + if (m_timeshift_active) + updateDecoder(); + break; + case eDVBServicePMTHandler::eventEOF: + switchToLive(); + break; } } RESULT eDVBServicePlay::start() { int r; - eDebug("starting DVB service"); - r = m_service_handler.tune((eServiceReferenceDVB&)m_reference); - eDebug("tune result: %d", r); + /* in pvr mode, we only want to use one demux. in tv mode, we're using + two (one for decoding, one for data source), as we must be prepared + to start recording from the data demux. */ + m_cue = new eCueSheet(); + r = m_service_handler.tune((eServiceReferenceDVB&)m_reference, m_is_pvr, m_cue); m_event(this, evStart); + m_event((iPlayableService*)this, evSeekableStatusChanged); return 0; } RESULT eDVBServicePlay::stop() { - eDebug("stopping.."); + eDebug("stop timeshift"); + stopTimeshift(); /* in case timeshift was enabled, remove buffer etc. */ + + eDebug("free ts handler"); + m_service_handler_timeshift.free(); + eDebug("stop service handler"); + m_service_handler.free(); + eDebug("ok"); + return 0; } @@ -648,7 +652,10 @@ RESULT eDVBServicePlay::connectEvent(const Slot2 &ev RESULT eDVBServicePlay::pause(ePtr &ptr) { - if (!m_is_pvr) + /* note: we check for timeshift to be enabled, + not neccessary active. if you pause when timeshift + is not active, you should activate it when unpausing */ + if ((!m_is_pvr) && (!m_timeshift_enabled)) { ptr = 0; return -1; @@ -668,15 +675,44 @@ RESULT eDVBServicePlay::setSlowMotion(int ratio) RESULT eDVBServicePlay::setFastForward(int ratio) { - if (m_decoder) - return m_decoder->setFastForward(ratio); - else + int skipmode, ffratio; + + if (ratio > 8) + { + skipmode = ratio; + ffratio = 1; + } else if (ratio > 0) + { + skipmode = 0; + ffratio = ratio; + } else if (!ratio) + { + skipmode = 0; + ffratio = 0; + } else // if (ratio < 0) + { + skipmode = ratio; + ffratio = 1; + } + + if (m_skipmode != skipmode) + { + eDebug("setting cue skipmode to %d", skipmode); + if (m_cue) + m_cue->setSkipmode(skipmode * 90000); /* convert to 90000 per second */ + } + + m_skipmode = skipmode; + + if (!m_decoder) return -1; + + return m_decoder->setFastForward(ffratio); } RESULT eDVBServicePlay::seek(ePtr &ptr) { - if (m_is_pvr) + if (m_is_pvr || m_timeshift_enabled) { ptr = this; return 0; @@ -686,15 +722,13 @@ RESULT eDVBServicePlay::seek(ePtr &ptr) return -1; } + /* TODO: when timeshift is enabled but not active, this doesn't work. */ RESULT eDVBServicePlay::getLength(pts_t &len) { ePtr pvr_channel; - if (m_service_handler.getPVRChannel(pvr_channel)) - { - eDebug("getPVRChannel failed!"); + if ((m_timeshift_enabled ? m_service_handler_timeshift : m_service_handler).getPVRChannel(pvr_channel)) return -1; - } return pvr_channel->getLength(len); } @@ -722,52 +756,54 @@ RESULT eDVBServicePlay::unpause() RESULT eDVBServicePlay::seekTo(pts_t to) { eDebug("eDVBServicePlay::seekTo: jump %lld", to); + + if (!m_decode_demux) + return -1; ePtr pvr_channel; - if (m_service_handler.getPVRChannel(pvr_channel)) + if ((m_timeshift_enabled ? m_service_handler_timeshift : m_service_handler).getPVRChannel(pvr_channel)) return -1; - ePtr demux; - m_service_handler.getDemux(demux); - if (!demux) + if (!m_cue) return -1; - return pvr_channel->seekTo(demux, 0, to); + m_cue->seekTo(0, to); + return 0; } RESULT eDVBServicePlay::seekRelative(int direction, pts_t to) { eDebug("eDVBServicePlay::seekRelative: jump %d, %lld", direction, to); + + if (!m_decode_demux) + return -1; ePtr pvr_channel; - if (m_service_handler.getPVRChannel(pvr_channel)) + if ((m_timeshift_enabled ? m_service_handler_timeshift : m_service_handler).getPVRChannel(pvr_channel)) return -1; to *= direction; - ePtr demux; - m_service_handler.getDemux(demux); - if (!demux) - return -1; + if (!m_cue) + return 0; - return pvr_channel->seekTo(demux, 1, to); + m_cue->seekTo(1, to); + return 0; } RESULT eDVBServicePlay::getPlayPosition(pts_t &pos) { ePtr pvr_channel; - if (m_service_handler.getPVRChannel(pvr_channel)) + if (!m_decode_demux) return -1; - ePtr demux; - m_service_handler.getDemux(demux); - if (!demux) + if ((m_timeshift_enabled ? m_service_handler_timeshift : m_service_handler).getPVRChannel(pvr_channel)) return -1; - return pvr_channel->getCurrentPosition(demux, pos, 1); + return pvr_channel->getCurrentPosition(m_decode_demux, pos, 1); } RESULT eDVBServicePlay::setTrickmode(int trick) @@ -777,6 +813,11 @@ RESULT eDVBServicePlay::setTrickmode(int trick) return 0; } +RESULT eDVBServicePlay::isCurrentlySeekable() +{ + return m_is_pvr || m_timeshift_active; +} + RESULT eDVBServicePlay::frontendStatusInfo(ePtr &ptr) { ptr = this; @@ -803,17 +844,38 @@ RESULT eDVBServicePlay::subServices(ePtr &ptr) RESULT eDVBServicePlay::timeshift(ePtr &ptr) { + ptr = 0; if (m_timeshift_enabled || !m_is_pvr) { + if (!m_timeshift_enabled) + { + /* we need enough diskspace */ + struct statfs fs; + if (statfs(TSPATH "/.", &fs) < 0) + { + eDebug("statfs failed!"); + return -2; + } + + if (((off_t)fs.f_bavail) * ((off_t)fs.f_bsize) < 1024*1024*1024LL) + { + eDebug("not enough diskspace for timeshift! (less than 1GB)"); + return -3; + } + } ptr = this; return 0; } - ptr = 0; return -1; } RESULT eDVBServicePlay::getName(std::string &name) { + if (m_is_pvr) + { + ePtr i = new eStaticServiceDVBPVRInformation(m_reference); + return i->getName(m_reference, name); + } if (m_dvb_service) { m_dvb_service->getName(m_reference, name); @@ -841,12 +903,51 @@ int eDVBServicePlay::getInfo(int w) switch (w) { + case sAspect: + if (!program.videoStreams.empty() && program.videoStreams[0].component_tag != -1) + { + ePtr evt; + if (!m_event_handler.getEvent(evt, 0)) + { + ePtr data; + if (!evt->getComponentData(data, program.videoStreams[0].component_tag)) + { + if ( data->getStreamContent() == 1 ) + { + switch(data->getComponentType()) + { + // SD + case 1: // 4:3 SD PAL + case 2: + case 3: // 16:9 SD PAL + case 4: // > 16:9 PAL + case 5: // 4:3 SD NTSC + case 6: + case 7: // 16:9 SD NTSC + case 8: // > 16:9 NTSC + + // HD + case 9: // 4:3 HD PAL + case 0xA: + case 0xB: // 16:9 HD PAL + case 0xC: // > 16:9 HD PAL + case 0xD: // 4:3 HD NTSC + case 0xE: + case 0xF: // 16:9 HD NTSC + case 0x10: // > 16:9 HD PAL + return data->getComponentType(); + } + } + } + } + } + return -1; + case sIsCrypted: return program.isCrypted; case sVideoPID: if (program.videoStreams.empty()) return -1; return program.videoStreams[0].pid; case sAudioPID: if (program.audioStreams.empty()) return -1; return program.audioStreams[m_current_audio_stream].pid; case sPCRPID: return program.pcrPid; case sPMTPID: return program.pmtPid; - case sTXTPID: return -1; - + case sTXTPID: 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(); @@ -939,6 +1040,19 @@ int eDVBServicePlay::selectAudioStream(int i) if (m_decoder->setAudioPID(program.audioStreams[i].pid, program.audioStreams[i].type)) return -4; + if (m_dvb_service && !m_is_pvr) + { + if (program.audioStreams[i].type == eDVBAudio::aMPEG) + { + m_dvb_service->setCachePID(eDVBService::cAPID, program.audioStreams[i].pid); + m_dvb_service->setCachePID(eDVBService::cAC3PID, -1); + } else + { + m_dvb_service->setCachePID(eDVBService::cAPID, -1); + m_dvb_service->setCachePID(eDVBService::cAC3PID, program.audioStreams[i].pid); + } + } + m_current_audio_stream = i; return 0; @@ -970,29 +1084,8 @@ RESULT eDVBServicePlay::getSubservice(eServiceReference &sub, unsigned int n) ePtr evt; if (!m_event_handler.getEvent(evt, 0)) { - if (!evt->getLinkageService(sub, n)) - { - eServiceReferenceDVB &subservice = (eServiceReferenceDVB&) sub; - eServiceReferenceDVB ¤t = (eServiceReferenceDVB&) m_reference; - subservice.setDVBNamespace(current.getDVBNamespace()); - if ( current.getParentTransportStreamID().get() ) - { - subservice.setParentTransportStreamID( current.getParentTransportStreamID() ); - subservice.setParentServiceID( current.getParentServiceID() ); - } - else - { - subservice.setParentTransportStreamID( current.getTransportStreamID() ); - subservice.setParentServiceID( current.getServiceID() ); - } - if ( subservice.getParentTransportStreamID() == subservice.getTransportStreamID() && - subservice.getParentServiceID() == subservice.getServiceID() ) - { - subservice.setParentTransportStreamID( eTransportStreamID(0) ); - subservice.setParentServiceID( eServiceID(0) ); - } + if (!evt->getLinkageService(sub, m_reference, n)) return 0; - } } sub.type=eServiceReference::idInvalid; return -1; @@ -1000,9 +1093,40 @@ RESULT eDVBServicePlay::getSubservice(eServiceReference &sub, unsigned int n) RESULT eDVBServicePlay::startTimeshift() { + ePtr demux; + + eDebug("Start timeshift!"); + if (m_timeshift_enabled) return -1; - eDebug("TIMESHIFT - start!"); + + /* start recording with the data demux. */ + if (m_service_handler.getDataDemux(demux)) + return -2; + + demux->createTSRecorder(m_record); + if (!m_record) + return -3; + + char templ[]=TSPATH "/timeshift.XXXXXX"; + m_timeshift_fd = mkstemp(templ); + m_timeshift_file = templ; + + eDebug("recording to %s", templ); + + if (m_timeshift_fd < 0) + { + m_record = 0; + return -4; + } + + m_record->setTargetFD(m_timeshift_fd); + + m_timeshift_enabled = 1; + + updateTimeshiftPids(); + m_record->start(); + return 0; } @@ -1010,11 +1134,217 @@ RESULT eDVBServicePlay::stopTimeshift() { if (!m_timeshift_enabled) return -1; + + switchToLive(); + m_timeshift_enabled = 0; - eDebug("timeshift disabled"); + + m_record->stop(); + m_record = 0; + + close(m_timeshift_fd); + eDebug("remove timeshift file"); + remove(m_timeshift_file.c_str()); + return 0; } +int eDVBServicePlay::isTimeshiftActive() +{ + return m_timeshift_enabled && m_timeshift_active; +} + +RESULT eDVBServicePlay::activateTimeshift() +{ + if (!m_timeshift_enabled) + return -1; + + if (!m_timeshift_active) + { + switchToTimeshift(); + return 0; + } + + return -2; +} + +void eDVBServicePlay::updateTimeshiftPids() +{ + if (!m_record) + return; + + eDVBServicePMTHandler::program program; + if (m_service_handler.getProgramInfo(program)) + return; + else + { + std::set pids_to_record; + pids_to_record.insert(0); // PAT + if (program.pmtPid != -1) + pids_to_record.insert(program.pmtPid); // PMT + + if (program.textPid != -1) + pids_to_record.insert(program.textPid); // Videotext + + for (std::vector::const_iterator + i(program.videoStreams.begin()); + i != program.videoStreams.end(); ++i) + pids_to_record.insert(i->pid); + + for (std::vector::const_iterator + i(program.audioStreams.begin()); + i != program.audioStreams.end(); ++i) + pids_to_record.insert(i->pid); + + std::set new_pids, obsolete_pids; + + std::set_difference(pids_to_record.begin(), pids_to_record.end(), + m_pids_active.begin(), m_pids_active.end(), + std::inserter(new_pids, new_pids.begin())); + + std::set_difference( + m_pids_active.begin(), m_pids_active.end(), + pids_to_record.begin(), pids_to_record.end(), + std::inserter(new_pids, new_pids.begin()) + ); + + for (std::set::iterator i(new_pids.begin()); i != new_pids.end(); ++i) + m_record->addPID(*i); + + for (std::set::iterator i(obsolete_pids.begin()); i != obsolete_pids.end(); ++i) + m_record->removePID(*i); + } +} + +void eDVBServicePlay::switchToLive() +{ + if (!m_timeshift_active) + return; + + m_decoder = 0; + m_decode_demux = 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(); +} + +void eDVBServicePlay::switchToTimeshift() +{ + if (m_timeshift_active) + return; + + m_decode_demux = 0; + m_decoder = 0; + + m_timeshift_active = 1; + + m_event((iPlayableService*)this, evSeekableStatusChanged); + + eServiceReferenceDVB r = (eServiceReferenceDVB&)m_reference; + r.path = m_timeshift_file; + + m_service_handler_timeshift.tune(r, 1, m_cue); /* use the decoder demux for everything */ +} + +void eDVBServicePlay::updateDecoder() +{ + int vpid = -1, apid = -1, apidtype = -1, pcrpid = -1, tpid = -1; + 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 + { + eDebugNoNewLine("have %d video stream(s)", program.videoStreams.size()); + if (!program.videoStreams.empty()) + { + eDebugNoNewLine(" ("); + for (std::vector::const_iterator + i(program.videoStreams.begin()); + i != program.videoStreams.end(); ++i) + { + if (vpid == -1) + vpid = i->pid; + if (i != program.videoStreams.begin()) + eDebugNoNewLine(", "); + eDebugNoNewLine("%04x", i->pid); + } + eDebugNoNewLine(")"); + } + eDebugNoNewLine(", and %d audio stream(s)", program.audioStreams.size()); + if (!program.audioStreams.empty()) + { + eDebugNoNewLine(" ("); + for (std::vector::const_iterator + i(program.audioStreams.begin()); + i != program.audioStreams.end(); ++i) + { + if (apid == -1) + { + apid = i->pid; + apidtype = i->type; + } + if (i != program.audioStreams.begin()) + eDebugNoNewLine(", "); + eDebugNoNewLine("%04x", i->pid); + } + eDebugNoNewLine(")"); + } + eDebugNoNewLine(", and the pcr pid is %04x", program.pcrPid); + pcrpid = program.pcrPid; + eDebug(", and the text pid is %04x", program.textPid); + tpid = program.textPid; + } + + if (!m_decoder) + { + h.getDecodeDemux(m_decode_demux); + if (m_decode_demux) + m_decode_demux->getMPEGDecoder(m_decoder); + if (m_cue) + m_cue->setDecodingDemux(m_decode_demux); + } + + if (m_decoder) + { + m_decoder->setVideoPID(vpid); + m_current_audio_stream = 0; + m_decoder->setAudioPID(apid, apidtype); + if (!(m_is_pvr || m_timeshift_active)) + m_decoder->setSyncPCR(pcrpid); + else + m_decoder->setSyncPCR(-1); + m_decoder->setTextPID(tpid); + m_decoder->start(); +// how we can do this better? +// update cache pid when the user changed the audio track or video track +// TODO handling of difference audio types.. default audio types.. + + /* don't worry about non-existing services, nor pvr services */ + if (m_dvb_service && !m_is_pvr) + { + if (apidtype == eDVBAudio::aMPEG) + { + m_dvb_service->setCachePID(eDVBService::cAPID, apid); + m_dvb_service->setCachePID(eDVBService::cAC3PID, -1); + } + else + { + m_dvb_service->setCachePID(eDVBService::cAPID, -1); + m_dvb_service->setCachePID(eDVBService::cAC3PID, apid); + } + m_dvb_service->setCachePID(eDVBService::cVPID, vpid); + m_dvb_service->setCachePID(eDVBService::cPCRPID, pcrpid); + m_dvb_service->setCachePID(eDVBService::cTPID, tpid); + } + } +} + DEFINE_REF(eDVBServicePlay) eAutoInitPtr init_eServiceFactoryDVB(eAutoInitNumbers::service+1, "eServiceFactoryDVB");