X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/41c90671f123813d65bbcc877fb3659e889e0376..06ca56e60c8d3e13d161b481b7716303bd3aa9f2:/lib/dvb/dvb.cpp diff --git a/lib/dvb/dvb.cpp b/lib/dvb/dvb.cpp index f215b906..09c9f5f6 100644 --- a/lib/dvb/dvb.cpp +++ b/lib/dvb/dvb.cpp @@ -42,6 +42,16 @@ DEFINE_REF(eDVBResourceManager); eDVBResourceManager *eDVBResourceManager::instance; +RESULT eDVBResourceManager::getInstance(ePtr &ptr) +{ + if (instance) + { + ptr = instance; + return 0; + } + return -1; +} + eDVBResourceManager::eDVBResourceManager() :m_releaseCachedChannelTimer(eApp) { @@ -263,12 +273,23 @@ RESULT eDVBResourceManager::allocateDemux(eDVBRegisteredFrontend *fe, ePtr 2) /* assumed to be true, otherwise we have lost anyway */ + { + ++i, ++n; + ++i, ++n; + } + } for (; i != m_demux.end(); ++i, ++n) - if ((!i->m_inuse) && ((!fe) || (i->m_adapter == fe->m_adapter))) + { + int is_decode = n < 2; + + int in_use = is_decode ? (i->m_demux->getRefCount() != 2) : i->m_inuse; + + if ((!in_use) && ((!fe) || (i->m_adapter == fe->m_adapter))) { - if ((cap & iDVBChannel::capDecode) && n) + if ((cap & iDVBChannel::capDecode) && !is_decode) continue; demux = new eDVBAllocatedDemux(i); @@ -278,6 +299,7 @@ RESULT eDVBResourceManager::allocateDemux(eDVBRegisteredFrontend *fe, ePtrget().setSourcePVR(0); return 0; } + } eDebug("demux not found"); return -1; } @@ -422,9 +444,16 @@ RESULT eDVBResourceManager::allocatePVRChannel(eUsePtr &channel) { ePtr demux; + if (m_cached_channel && m_releaseCachedChannelTimer.isActive()) + { + m_cached_channel_state_changed_conn.disconnect(); + m_cached_channel=0; + m_releaseCachedChannelTimer.stop(); + } + eDVBChannel *ch; ch = new eDVBChannel(this, 0); - + channel = ch; return 0; } @@ -507,7 +536,11 @@ bool eDVBResourceManager::canAllocateChannel(const eDVBChannelID &channelid, con if (i->m_channel_id == ignore) { eDVBChannel *channel = (eDVBChannel*) &(*i->m_channel); - if (channel == &(*m_cached_channel) ? channel->getUseCount() == 2 : channel->getUseCount() == 1) // channel only used once.. + // one eUsePtr is used in eDVBServicePMTHandler + // another on eUsePtr is used in the eDVBScan instance used in eDVBServicePMTHandler (for SDT scan) + // so we must check here if usecount is 3 (when the channel is equal to the cached channel) + // or 2 when the cached channel is not equal to the compared channel + if (channel == &(*m_cached_channel) ? channel->getUseCount() == 3 : channel->getUseCount() == 2) // channel only used once.. { ePtr fe; if (!i->m_channel->getFrontend(fe)) @@ -626,11 +659,11 @@ void eDVBChannel::frontendStateChanged(iDVBFrontend*fe) } else if (state == iDVBFrontend::stateLostLock) { /* on managed channels, we try to retune in order to re-acquire lock. */ - if (m_feparm) + if (m_current_frontend_parameters) { eDebug("OURSTATE: lost lock, trying to retune"); ourstate = state_tuning; - m_frontend->get().tune(*m_feparm); + m_frontend->get().tune(*m_current_frontend_parameters); } else /* on unmanaged channels, we don't do this. the client will do this. */ { @@ -708,10 +741,23 @@ void eDVBChannel::cueSheetEvent(int event) break; } case eCueSheet::evtSpanChanged: - eDebug("source span translation not yet supported"); - // recheckCuesheetSpans(); + { + m_source_span.clear(); + for (std::list >::const_iterator i(m_cue->m_spans.begin()); i != m_cue->m_spans.end(); ++i) + { + off_t offset_in, offset_out; + pts_t pts_in = i->first, pts_out = i->second; + if (m_tstools.getOffset(offset_in, pts_in) || m_tstools.getOffset(offset_out, pts_out)) + { + eDebug("span translation failed.\n"); + continue; + } + eDebug("source span: %llx .. %llx, translated to %llx..%llx", pts_in, pts_out, offset_in, offset_out); + m_source_span.push_back(std::pair(offset_in, offset_out)); + } break; } + } } /* remember, this gets called from another thread. */ @@ -745,13 +791,6 @@ void eDVBChannel::getNextSourceSpan(off_t current_offset, size_t bytes_read, off 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()) @@ -761,14 +800,9 @@ void eDVBChannel::getNextSourceSpan(off_t current_offset, size_t bytes_read, off int relative = seek.first; pts_t pts = seek.second; - int bitrate = m_tstools.calcBitrate(); /* in bits/s */ - - if (bitrate == -1) - continue; - + pts_t now = 0; if (relative) { - pts_t now; if (!m_cue->m_decoder) { eDebug("no decoder - can't seek relative"); @@ -784,14 +818,38 @@ void eDVBChannel::getNextSourceSpan(off_t current_offset, size_t bytes_read, off eDebug("seekTo: getCurrentPosition failed!"); continue; } + } + + if (relative == 1) /* pts relative */ + { pts += now; + if (pts < 0) + pts = 0; } - - if (pts < 0) - pts = 0; - - off_t offset = (pts * (pts_t)bitrate) / 8ULL / 90000ULL; + + if (relative != 2) + if (pts < 0) + pts = 0; + if (relative == 2) /* AP relative */ + { + eDebug("AP relative seeking: %lld, at %lld", pts, now); + pts_t nextap; + if (m_tstools.getNextAccessPoint(nextap, now, pts)) + { + pts = now; + eDebug("AP relative seeking failed!"); + } else + { + eDebug("next ap is %llx\n", pts); + pts = nextap; + } + } + + off_t offset = 0; + if (m_tstools.getOffset(offset, pts)) + continue; + eDebug("ok, resolved skip (rel: %d, diff %lld), now at %08llx", relative, pts, offset); current_offset = offset; } @@ -801,29 +859,65 @@ void eDVBChannel::getNextSourceSpan(off_t current_offset, size_t bytes_read, off if ((current_offset >= i->first) && (current_offset < i->second)) { start = current_offset; - size = i->second - current_offset; - if (size > max) + /* max can not exceed max(size_t). i->second - current_offset, however, can. */ + if ((i->second - current_offset) > max) size = max; - eDebug("HIT, %lld < %lld < %lld", i->first, current_offset, i->second); + else + size = i->second - current_offset; + eDebug("HIT, %lld < %lld < %lld, size: %d", i->first, current_offset, i->second, size); return; } if (current_offset < i->first) { - start = i->first; - size = i->second - i->first; - if (size > max) - size = max; - eDebug("skip"); + /* ok, our current offset is in an 'out' zone. */ + if ((m_skipmode_m >= 0) || (i == m_source_span.begin())) + { + /* in normal playback, just start at the next zone. */ + start = i->first; + + /* size is not 64bit! */ + if ((i->second - i->first) > max) + size = max; + else + size = i->second - i->first; + + eDebug("skip"); + if (m_skipmode_m < 0) + { + eDebug("reached SOF"); + /* reached SOF */ + m_skipmode_m = 0; + m_pvr_thread->sendEvent(eFilePushThread::evtUser); + } + } else + { + /* when skipping reverse, however, choose the zone before. */ + --i; + eDebug("skip to previous block, which is %llx..%llx", i->first, i->second); + size_t len; + + if ((i->second - i->first) > max) + len = max; + else + len = i->second - i->first; + + start = i->second - len; + eDebug("skipping to %llx, %d", start, len); + } return; } } + if ((current_offset < -m_skipmode_m) && (m_skipmode_m < 0)) + { + eDebug("reached SOF"); + m_skipmode_m = 0; + m_pvr_thread->sendEvent(eFilePushThread::evtUser); + } + start = current_offset; size = max; eDebug("END OF CUESHEET. (%08llx, %d)", start, size); - - if (size < 4096) - eFatal("blub"); return; } @@ -870,7 +964,7 @@ RESULT eDVBChannel::setChannel(const eDVBChannelID &channelid, ePtrget().tune(*feparm); - m_feparm = feparm; + m_current_frontend_parameters = feparm; if (res) { @@ -919,6 +1013,11 @@ RESULT eDVBChannel::getDemux(ePtr &demux, int cap) demux = *our_demux; /* don't hold a reference to the decoding demux, we don't need it. */ + + /* FIXME: by dropping the 'allocated demux' in favour of the 'iDVBDemux', + the refcount is lost. thus, decoding demuxes are never allocated. + + this poses a big problem for PiP. */ if (cap & capDecode) our_demux = 0; return 0; @@ -926,11 +1025,19 @@ RESULT eDVBChannel::getDemux(ePtr &demux, int cap) RESULT eDVBChannel::getFrontend(ePtr &frontend) { + frontend = 0; + if (!m_frontend) + return -ENODEV; frontend = &m_frontend->get(); if (frontend) return 0; - else - return -ENODEV; + return -ENODEV; +} + +RESULT eDVBChannel::getCurrentFrontendParameters(ePtr ¶m) +{ + param = m_current_frontend_parameters; + return 0; } RESULT eDVBChannel::playFile(const char *file) @@ -959,25 +1066,23 @@ RESULT eDVBChannel::playFile(const char *file) eDebug("can't open /dev/misc/pvr - you need to buy the new(!) $$$ box! (%m)"); // or wait for the driver to be improved. return -ENODEV; } - - 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); - close(m_pvr_fd_dst); - return -ENOENT; - } - - m_state = state_ok; - 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); + if (m_pvr_thread->start(file, m_pvr_fd_dst)) + { + delete m_pvr_thread; + m_pvr_thread = 0; + eDebug("can't open PVR file %s (%m)", file); + return -ENOENT; + } CONNECT(m_pvr_thread->m_event, eDVBChannel::pvrEvent); + m_state = state_ok; + m_stateChanged(this); + return 0; } @@ -986,7 +1091,6 @@ 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; @@ -1095,6 +1199,10 @@ void eCueSheet::addSourceSpan(const pts_t &begin, const pts_t &end) eSingleLock l(m_lock); m_spans.push_back(std::pair(begin, end)); } +} + +void eCueSheet::commitSpans() +{ m_event(evtSpanChanged); }