X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/06d78eb689babb22f1a315203a8c6871d9ae121d..6a4d3199f96849af7ef9fae324f34ec4d1b7412b:/lib/dvb/dvb.cpp diff --git a/lib/dvb/dvb.cpp b/lib/dvb/dvb.cpp index 7e937e6f..8b442e3d 100644 --- a/lib/dvb/dvb.cpp +++ b/lib/dvb/dvb.cpp @@ -43,6 +43,7 @@ DEFINE_REF(eDVBResourceManager); eDVBResourceManager *eDVBResourceManager::instance; eDVBResourceManager::eDVBResourceManager() + :m_releaseCachedChannelTimer(eApp) { avail = 1; busy = 0; @@ -63,6 +64,8 @@ eDVBResourceManager::eDVBResourceManager() eDebug("found %d adapter, %d frontends and %d demux", m_adapter.size(), m_frontend.size(), m_demux.size()); + + CONNECT(m_releaseCachedChannelTimer.timeout, eDVBResourceManager::releaseCachedChannel); } @@ -304,7 +307,7 @@ RESULT eDVBResourceManager::allocateChannel(const eDVBChannelID &channelid, eUse if(channelid==cache_chan->getChannelID()) { eDebug("use cached_channel"); - channel=m_cached_channel; + channel = m_cached_channel; return 0; } m_cached_channel=0; @@ -355,10 +358,40 @@ RESULT eDVBResourceManager::allocateChannel(const eDVBChannelID &channelid, eUse return errChidNotFound; } m_cached_channel = channel = ch; + CONNECT(ch->m_stateChanged,eDVBResourceManager::DVBChannelStateChanged); return 0; } +void eDVBResourceManager::DVBChannelStateChanged(iDVBChannel *chan) +{ + int state=0; + chan->getState(state); + switch (state) + { + case iDVBChannel::state_ok: + { + eDebug("stop release channel timer"); + m_releaseCachedChannelTimer.stop(); + break; + } + case iDVBChannel::state_last_instance: + { + eDebug("start release channel timer"); + m_releaseCachedChannelTimer.start(3000, true); + break; + } + default: // ignore all other events + break; + } +} + +void eDVBResourceManager::releaseCachedChannel() +{ + eDebug("release cached channel"); + m_cached_channel=0; +} + RESULT eDVBResourceManager::allocateRawChannel(eUsePtr &channel, int frontend_index) { ePtr fe; @@ -440,6 +473,14 @@ bool eDVBResourceManager::canAllocateFrontend(ePtr &fepa bool eDVBResourceManager::canAllocateChannel(const eDVBChannelID &channelid, const eDVBChannelID& ignore) { + bool ret=true; + if (m_cached_channel) + { + eDVBChannel *cache_chan = (eDVBChannel*)&(*m_cached_channel); + if(channelid==cache_chan->getChannelID()) + return ret; + } + /* first, check if a channel is already existing. */ // eDebug("allocate channel.. %04x:%04x", channelid.transport_stream_id.get(), channelid.original_network_id.get()); for (std::list::iterator i(m_active_channels.begin()); i != m_active_channels.end(); ++i) @@ -448,11 +489,12 @@ bool eDVBResourceManager::canAllocateChannel(const eDVBChannelID &channelid, con if (i->m_channel_id == channelid) { // eDebug("found shared channel.."); - return true; + return ret; } } - int *decremented_fe_usecount=NULL; + int *decremented_cached_channel_fe_usecount=NULL, + *decremented_fe_usecount=NULL; for (std::list::iterator i(m_active_channels.begin()); i != m_active_channels.end(); ++i) { @@ -471,6 +513,8 @@ bool eDVBResourceManager::canAllocateChannel(const eDVBChannelID &channelid, con { --ii->m_inuse; decremented_fe_usecount = &ii->m_inuse; + if (channel == &(*m_cached_channel)) + decremented_cached_channel_fe_usecount = decremented_fe_usecount; break; } } @@ -480,23 +524,55 @@ bool eDVBResourceManager::canAllocateChannel(const eDVBChannelID &channelid, con } } + if (!decremented_cached_channel_fe_usecount) + { + if (m_cached_channel) + { + eDVBChannel *channel = (eDVBChannel*) &(*m_cached_channel); + if (channel->getUseCount() == 1) + { + ePtr fe; + if (!channel->getFrontend(fe)) + { + for (eSmartPtrList::iterator ii(m_frontend.begin()); ii != m_frontend.end(); ++ii) + { + if ( &(*fe) == &(*ii->m_frontend) ) + { + --ii->m_inuse; + decremented_cached_channel_fe_usecount = &ii->m_inuse; + break; + } + } + } + } + } + } + else + decremented_cached_channel_fe_usecount=NULL; + + ePtr feparm; + if (!m_list) { eDebug("no channel list set!"); - return false; + ret = false; + goto error; } - ePtr feparm; if (m_list->getChannelFrontendData(channelid, feparm)) { eDebug("channel not found!"); - return false; + ret = false; + goto error; } - bool ret = canAllocateFrontend(feparm); + ret = canAllocateFrontend(feparm); +error: if (decremented_fe_usecount) ++(*decremented_fe_usecount); + if (decremented_cached_channel_fe_usecount) + ++(*decremented_cached_channel_fe_usecount); return ret; } @@ -509,6 +585,8 @@ eDVBChannel::eDVBChannel(eDVBResourceManager *mgr, eDVBAllocatedFrontend *fronte m_pvr_thread = 0; + m_skipmode_n = m_skipmode_m = 0; + if (m_frontend) m_frontend->get().connectStateChange(slot(*this, &eDVBChannel::frontendStateChanged), m_conn_frontendStateChanged); } @@ -517,14 +595,8 @@ eDVBChannel::~eDVBChannel() { if (m_channel_id) m_mgr->removeChannel(this); - - if (m_pvr_thread) - { - m_pvr_thread->stop(); - ::close(m_pvr_fd_src); - ::close(m_pvr_fd_dst); - delete m_pvr_thread; - } + + stopFile(); } void eDVBChannel::frontendStateChanged(iDVBFrontend*fe) @@ -548,8 +620,18 @@ void eDVBChannel::frontendStateChanged(iDVBFrontend*fe) ourstate = state_tuning; } else if (state == iDVBFrontend::stateLostLock) { - eDebug("OURSTATE: lost lock"); - ourstate = state_unavailable; + /* on managed channels, we try to retune in order to re-acquire lock. */ + if (m_feparm) + { + eDebug("OURSTATE: lost lock, trying to retune"); + ourstate = state_tuning; + m_frontend->get().tune(*m_feparm); + } else + /* on unmanaged channels, we don't do this. the client will do this. */ + { + eDebug("OURSTATE: lost lock, unavailable now."); + ourstate = state_unavailable; + } } else if (state == iDVBFrontend::stateFailed) { eDebug("OURSTATE: failed"); @@ -564,9 +646,175 @@ void eDVBChannel::frontendStateChanged(iDVBFrontend*fe) } } +void eDVBChannel::pvrEvent(int event) +{ + switch (event) + { + case eFilePushThread::evtEOF: + eDebug("eDVBChannel: End of file!"); + m_event(this, evtEOF); + break; + case eFilePushThread::evtUser: /* start */ + eDebug("SOF"); + m_event(this, evtSOF); + break; + } +} + +void eDVBChannel::cueSheetEvent(int event) +{ + switch (event) + { + case eCueSheet::evtSeek: + eDebug("seek."); + flushPVR(m_cue->m_decoding_demux); + break; + case eCueSheet::evtSkipmode: + { + { + eSingleLocker l(m_cue->m_lock); + m_cue->m_seek_requests.push_back(std::pair(1, 0)); /* resync */ + if (m_cue->m_skipmode_ratio) + { + int bitrate = m_tstools.calcBitrate(); /* in bits/s */ + eDebug("skipmode ratio is %lld:90000, bitrate is %d bit/s", m_cue->m_skipmode_ratio, bitrate); + /* i agree that this might look a bit like black magic. */ + m_skipmode_n = 512*1024; /* must be 1 iframe at least. */ + m_skipmode_m = bitrate / 8 / 90000 * m_cue->m_skipmode_ratio; + + eDebug("resolved to: %d %d", m_skipmode_m, m_skipmode_n); + + if (abs(m_skipmode_m) < abs(m_skipmode_n)) + { + eFatal("damn, something is wrong with this calculation"); + m_skipmode_n = m_skipmode_m = 0; + } + + } else + { + eDebug("skipmode ratio is 0, normal play"); + m_skipmode_n = m_skipmode_m = 0; + } + } + flushPVR(m_cue->m_decoding_demux); + break; + } + case eCueSheet::evtSpanChanged: + eDebug("source span translation not yet supported"); + // recheckCuesheetSpans(); + break; + } +} + + /* remember, this gets called from another thread. */ +void eDVBChannel::getNextSourceSpan(off_t current_offset, size_t bytes_read, off_t &start, size_t &size) +{ + unsigned int max = 10*1024*1024; + + if (!m_cue) + { + eDebug("no cue sheet. forcing normal play"); + start = current_offset; + size = max; + return; + } + + eSingleLocker l(m_cue->m_lock); + + if (!m_cue->m_decoding_demux) + { + start = current_offset; + size = max; + eDebug("getNextSourceSpan, no decoding demux. forcing normal play"); + return; + } + + if (m_skipmode_n) + { + eDebug("skipmode %d:%d", m_skipmode_m, m_skipmode_n); + max = m_skipmode_n; + } + + eDebug("getNextSourceSpan, current offset is %08llx!", current_offset); + + if ((current_offset < -m_skipmode_m) && (m_skipmode_m < 0)) + { + eDebug("reached SOF"); + m_skipmode_m = 0; + m_pvr_thread->sendEvent(eFilePushThread::evtUser); + } + + current_offset += m_skipmode_m; + + while (!m_cue->m_seek_requests.empty()) + { + std::pair seek = m_cue->m_seek_requests.front(); + m_cue->m_seek_requests.pop_front(); + int relative = seek.first; + pts_t pts = seek.second; + + int bitrate = m_tstools.calcBitrate(); /* in bits/s */ + + if (bitrate == -1) + continue; + + if (relative) + { + pts_t now; + /* we're using the decoder's timestamp here. this + won't work for radio (ouch). */ + if (getCurrentPosition(m_cue->m_decoding_demux, now, 1)) + { + eDebug("seekTo: getCurrentPosition failed!"); + continue; + } + pts += now; + } + + if (pts < 0) + pts = 0; + + off_t offset = (pts * (pts_t)bitrate) / 8ULL / 90000ULL; + + eDebug("ok, resolved skip (rel: %d, diff %lld), now at %08llx", relative, pts, offset); + current_offset = offset; + } + + for (std::list >::const_iterator i(m_source_span.begin()); i != m_source_span.end(); ++i) + { + if ((current_offset >= i->first) && (current_offset < i->second)) + { + start = current_offset; + size = i->second - current_offset; + if (size > max) + size = max; + eDebug("HIT, %lld < %lld < %lld", i->first, current_offset, i->second); + return; + } + if (current_offset < i->first) + { + start = i->first; + size = i->second - i->first; + if (size > max) + size = max; + eDebug("skip"); + return; + } + } + + start = current_offset; + size = max; + eDebug("END OF CUESHEET. (%08llx, %d)", start, size); + + if (size < 4096) + eFatal("blub"); + return; +} + void eDVBChannel::AddUse() { - ++m_use_count; + if (++m_use_count > 1 && m_state == state_last_instance) + m_state = state_ok; } void eDVBChannel::ReleaseUse() @@ -576,6 +824,11 @@ void eDVBChannel::ReleaseUse() m_state = state_release; m_stateChanged(this); } + else if (m_use_count == 1) + { + m_state = state_last_instance; + m_stateChanged(this); + } } RESULT eDVBChannel::setChannel(const eDVBChannelID &channelid, ePtr &feparm) @@ -598,6 +851,7 @@ RESULT eDVBChannel::setChannel(const eDVBChannelID &channelid, ePtrget().tune(*feparm); + m_feparm = feparm; if (res) { @@ -615,6 +869,12 @@ RESULT eDVBChannel::connectStateChange(const Slot1 &stateChan return 0; } +RESULT eDVBChannel::connectEvent(const Slot2 &event, ePtr &connection) +{ + connection = new eConnection((iDVBChannel*)this, m_event.connect(event)); + return 0; +} + RESULT eDVBChannel::getState(int &state) { state = m_state; @@ -628,7 +888,6 @@ RESULT eDVBChannel::setCIRouting(const eDVBCIRouting &routing) RESULT eDVBChannel::getDemux(ePtr &demux, int cap) { - eDebug("get %d demux", cap); ePtr &our_demux = (cap & capDecode) ? m_decoder_demux : m_demux; if (!our_demux) @@ -637,14 +896,12 @@ RESULT eDVBChannel::getDemux(ePtr &demux, int cap) if (m_mgr->allocateDemux(m_frontend ? (eDVBRegisteredFrontend*)*m_frontend : (eDVBRegisteredFrontend*)0, our_demux, cap)) return -1; - } demux = *our_demux; + /* don't hold a reference to the decoding demux, we don't need it. */ if (cap & capDecode) - { our_demux = 0; - } return 0; } @@ -680,7 +937,7 @@ RESULT eDVBChannel::playFile(const char *file) return -ENODEV; } - m_pvr_fd_src = open(file, O_RDONLY); + m_pvr_fd_src = open(file, O_RDONLY|O_LARGEFILE); if (m_pvr_fd_src < 0) { eDebug("can't open PVR m_pvr_fd_src file %s (%m)", file); @@ -692,11 +949,35 @@ RESULT eDVBChannel::playFile(const char *file) m_stateChanged(this); m_pvr_thread = new eFilePushThread(); + m_pvr_thread->enablePVRCommit(1); + m_pvr_thread->setScatterGather(this); + m_pvr_thread->start(m_pvr_fd_src, m_pvr_fd_dst); + CONNECT(m_pvr_thread->m_event, eDVBChannel::pvrEvent); return 0; } +void eDVBChannel::stopFile() +{ + if (m_pvr_thread) + { + m_pvr_thread->stop(); + ::close(m_pvr_fd_src); + ::close(m_pvr_fd_dst); + delete m_pvr_thread; + m_pvr_thread = 0; + } +} + +void eDVBChannel::setCueSheet(eCueSheet *cuesheet) +{ + m_conn_cueSheetEvent = 0; + m_cue = cuesheet; + if (m_cue) + m_cue->connectEvent(slot(*this, &eDVBChannel::cueSheetEvent), m_conn_cueSheetEvent); +} + RESULT eDVBChannel::getLength(pts_t &len) { return m_tstools.calcLen(len); @@ -744,34 +1025,7 @@ RESULT eDVBChannel::getCurrentPosition(iDVBDemux *decoding_demux, pts_t &pos, in return 0; } -RESULT eDVBChannel::seekTo(iDVBDemux *decoding_demux, int relative, pts_t &pts) -{ - int bitrate = m_tstools.calcBitrate(); /* in bits/s */ - - if (bitrate == -1) - return -1; - - if (relative) - { - pts_t now; - if (getCurrentPosition(decoding_demux, now, 0)) - { - eDebug("seekTo: getCurrentPosition failed!"); - return -1; - } - pts += now; - } - - if (pts < 0) - pts = 0; - - off_t offset = (pts * (pts_t)bitrate) / 8ULL / 90000ULL; - - seekToPosition(decoding_demux, offset); - return 0; -} - -RESULT eDVBChannel::seekToPosition(iDVBDemux *decoding_demux, const off_t &r) +void eDVBChannel::flushPVR(iDVBDemux *decoding_demux) { /* when seeking, we have to ensure that all buffers are flushed. there are basically 3 buffers: @@ -783,12 +1037,10 @@ RESULT eDVBChannel::seekToPosition(iDVBDemux *decoding_demux, const off_t &r) the ratebuffer (for example) would immediately refill from the not-yet-flushed PVR buffer. */ - eDebug("eDVBChannel: seekToPosition .. %llx", r); - m_pvr_thread->pause(); + m_pvr_thread->pause(); /* flush internal filepush buffer */ m_pvr_thread->flush(); - /* HACK: flush PVR buffer */ ::ioctl(m_pvr_fd_dst, 0); @@ -797,7 +1049,57 @@ RESULT eDVBChannel::seekToPosition(iDVBDemux *decoding_demux, const off_t &r) decoding_demux->flush(); /* demux will also flush all decoder.. */ - m_pvr_thread->seek(SEEK_SET, r); + /* resume will re-query the SG */ m_pvr_thread->resume(); +} + +DEFINE_REF(eCueSheet); + +eCueSheet::eCueSheet() +{ + m_skipmode_ratio = 0; +} + +void eCueSheet::seekTo(int relative, const pts_t &pts) +{ + { + eSingleLock l(m_lock); + m_seek_requests.push_back(std::pair(relative, pts)); + } + m_event(evtSeek); +} + +void eCueSheet::clear() +{ + eSingleLock l(m_lock); + m_spans.clear(); +} + +void eCueSheet::addSourceSpan(const pts_t &begin, const pts_t &end) +{ + { + eSingleLock l(m_lock); + m_spans.push_back(std::pair(begin, end)); + } + m_event(evtSpanChanged); +} + +void eCueSheet::setSkipmode(const pts_t &ratio) +{ + { + eSingleLock l(m_lock); + m_skipmode_ratio = ratio; + } + m_event(evtSkipmode); +} + +void eCueSheet::setDecodingDemux(iDVBDemux *demux) +{ + m_decoding_demux = demux; +} + +RESULT eCueSheet::connectEvent(const Slot1 &event, ePtr &connection) +{ + connection = new eConnection(this, m_event.connect(event)); return 0; }