X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/77728f576114383a70a7126d88cd7b31e1588aa5..d59ce3f9c60c4466006ad1e148cec9a6e3a29cb2:/lib/dvb/dvb.cpp diff --git a/lib/dvb/dvb.cpp b/lib/dvb/dvb.cpp index ac5c1a5e..32e19308 100644 --- a/lib/dvb/dvb.cpp +++ b/lib/dvb/dvb.cpp @@ -380,7 +380,10 @@ RESULT eDVBResourceManager::allocateRawChannel(eUsePtr &channel, in RESULT eDVBResourceManager::allocatePVRChannel(eUsePtr &channel) { ePtr demux; - + + if (m_cached_channel) + m_cached_channel=0; + eDVBChannel *ch; ch = new eDVBChannel(this, 0); @@ -437,6 +440,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) @@ -445,11 +456,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) { @@ -468,6 +480,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; } } @@ -477,23 +491,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; } @@ -545,8 +591,9 @@ void eDVBChannel::frontendStateChanged(iDVBFrontend*fe) ourstate = state_tuning; } else if (state == iDVBFrontend::stateLostLock) { - eDebug("OURSTATE: lost lock"); - ourstate = state_unavailable; + eDebug("OURSTATE: lost lock.. retune"); + ourstate = state_tuning; + m_frontend->get().tune(*m_feparm); } else if (state == iDVBFrontend::stateFailed) { eDebug("OURSTATE: failed"); @@ -561,6 +608,17 @@ 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; + } +} + void eDVBChannel::AddUse() { ++m_use_count; @@ -595,6 +653,7 @@ RESULT eDVBChannel::setChannel(const eDVBChannelID &channelid, ePtrget().tune(*feparm); + m_feparm = feparm; if (res) { @@ -612,6 +671,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; @@ -625,7 +690,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) @@ -634,14 +698,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; } @@ -677,7 +739,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); @@ -689,7 +751,9 @@ RESULT eDVBChannel::playFile(const char *file) m_stateChanged(this); m_pvr_thread = new eFilePushThread(); + m_pvr_thread->enablePVRCommit(1); m_pvr_thread->start(m_pvr_fd_src, m_pvr_fd_dst); + CONNECT(m_pvr_thread->m_event, eDVBChannel::pvrEvent); return 0; } @@ -699,7 +763,7 @@ RESULT eDVBChannel::getLength(pts_t &len) return m_tstools.calcLen(len); } -RESULT eDVBChannel::getCurrentPosition(iDVBDemux *decoding_demux, pts_t &pos) +RESULT eDVBChannel::getCurrentPosition(iDVBDemux *decoding_demux, pts_t &pos, int mode) { if (!decoding_demux) return -1; @@ -715,7 +779,8 @@ RESULT eDVBChannel::getCurrentPosition(iDVBDemux *decoding_demux, pts_t &pos) pts_t now; - r = decoding_demux->getSTC(now); + /* TODO: this is a gross hack. */ + r = decoding_demux->getSTC(now, mode ? 128 : 0); if (r) { @@ -750,7 +815,7 @@ RESULT eDVBChannel::seekTo(iDVBDemux *decoding_demux, int relative, pts_t &pts) if (relative) { pts_t now; - if (getCurrentPosition(decoding_demux, now)) + if (getCurrentPosition(decoding_demux, now, 0)) { eDebug("seekTo: getCurrentPosition failed!"); return -1;