X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/a5ca28275e50221cd77962aac185dc9db360c2bf..80a43808a277db246fd679ab7e84b5b932bacfd7:/lib/dvb/dvb.cpp diff --git a/lib/dvb/dvb.cpp b/lib/dvb/dvb.cpp index deb5042b..dcdac7ef 100644 --- a/lib/dvb/dvb.cpp +++ b/lib/dvb/dvb.cpp @@ -18,12 +18,12 @@ DEFINE_REF(eDVBAllocatedFrontend); eDVBAllocatedFrontend::eDVBAllocatedFrontend(eDVBRegisteredFrontend *fe): m_fe(fe) { - m_fe->m_inuse++; + m_fe->inc_use(); } eDVBAllocatedFrontend::~eDVBAllocatedFrontend() { - --m_fe->m_inuse; + m_fe->dec_use(); } DEFINE_REF(eDVBAllocatedDemux); @@ -46,7 +46,7 @@ eDVBResourceManager::eDVBResourceManager() { avail = 1; busy = 0; - m_sec = new eDVBSatelliteEquipmentControl; + m_sec = new eDVBSatelliteEquipmentControl(m_frontend); if (!instance) instance = this; @@ -197,20 +197,52 @@ void eDVBResourceManager::addAdapter(iDVBAdapter *adapter) for (i=0; i frontend; + if (!adapter->getFrontend(frontend, i)) + { + frontend->setSEC(m_sec); m_frontend.push_back(new eDVBRegisteredFrontend(frontend, adapter)); + } } } -RESULT eDVBResourceManager::allocateFrontend(const eDVBChannelID &chid, ePtr &fe) +RESULT eDVBResourceManager::allocateFrontend(ePtr &fe, ePtr &feparm) { - /* find first unused frontend. we ignore compatibility for now. */ + ePtr best; + int bestval = 0; + for (eSmartPtrList::iterator i(m_frontend.begin()); i != m_frontend.end(); ++i) if (!i->m_inuse) + { + int c = i->m_frontend->isCompatibleWith(feparm); + if (c > bestval) + { + bestval = c; + best = i; + } + } + + if (best) + { + fe = new eDVBAllocatedFrontend(best); + return 0; + } + + fe = 0; + + return -1; +} + +RESULT eDVBResourceManager::allocateFrontendByIndex(ePtr &fe, int nr) +{ + for (eSmartPtrList::iterator i(m_frontend.begin()); i != m_frontend.end(); ++i, --nr) + if ((!nr) && !i->m_inuse) { fe = new eDVBAllocatedFrontend(i); return 0; } + + fe = 0; return -1; } @@ -262,11 +294,22 @@ RESULT eDVBResourceManager::getChannelList(ePtr &list) return -ENOENT; } - RESULT eDVBResourceManager::allocateChannel(const eDVBChannelID &channelid, eUsePtr &channel) { /* first, check if a channel is already existing. */ - + + if (m_cached_channel) + { + eDVBChannel *cache_chan = (eDVBChannel*)&(*m_cached_channel); + if(channelid==cache_chan->getChannelID()) + { + eDebug("use cached_channel"); + channel = m_cached_channel; + return 0; + } + m_cached_channel=0; + } + // 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) { @@ -279,59 +322,56 @@ RESULT eDVBResourceManager::allocateChannel(const eDVBChannelID &channelid, eUse } } - /* no currently available channel is tuned to this channelid. create a new one, if possible. */ - - /* allocate a frontend. */ + /* no currently available channel is tuned to this channelid. create a new one, if possible. */ + + if (!m_list) + { + eDebug("no channel list set!"); + return -ENOENT; + } + + ePtr feparm; + if (m_list->getChannelFrontendData(channelid, feparm)) + { + eDebug("channel not found!"); + return -ENOENT; + } + + /* allocate a frontend. */ ePtr fe; - if (allocateFrontend(channelid, fe)) + if (allocateFrontend(fe, feparm)) return errNoFrontend; - -// will be allocated on demand: -// ePtr demux; -// -// if (allocateDemux(*fe, demux)) -// return errNoDemux; - + RESULT res; ePtr ch; ch = new eDVBChannel(this, fe); - ePtr myfe; - if (!ch->getFrontend(myfe)) - myfe->setSEC(m_sec); - - res = ch->setChannel(channelid); + res = ch->setChannel(channelid, feparm); if (res) { channel = 0; return errChidNotFound; } - - channel = ch; + m_cached_channel = channel = ch; + return 0; } -RESULT eDVBResourceManager::allocateRawChannel(eUsePtr &channel) +RESULT eDVBResourceManager::allocateRawChannel(eUsePtr &channel, int frontend_index) { ePtr fe; - - if (allocateFrontend(eDVBChannelID(), fe)) + + if (m_cached_channel) + m_cached_channel=0; + + if (allocateFrontendByIndex(fe, frontend_index)) return errNoFrontend; -// ePtr demux; - // -// if (allocateDemux(*fe, demux)) -// return errNoDemux; - eDVBChannel *ch; ch = new eDVBChannel(this, fe); - ePtr myfe; - if (!ch->getFrontend(myfe)) - myfe->setSEC(m_sec); - channel = ch; return 0; } @@ -340,10 +380,10 @@ RESULT eDVBResourceManager::allocateRawChannel(eUsePtr &channel) RESULT eDVBResourceManager::allocatePVRChannel(eUsePtr &channel) { ePtr demux; - -// if (allocateDemux(0, demux)) -// return errNoDemux; - + + if (m_cached_channel) + m_cached_channel=0; + eDVBChannel *ch; ch = new eDVBChannel(this, 0); @@ -354,7 +394,7 @@ RESULT eDVBResourceManager::allocatePVRChannel(eUsePtr &channel) RESULT eDVBResourceManager::addChannel(const eDVBChannelID &chid, eDVBChannel *ch) { m_active_channels.push_back(active_channel(chid, ch)); -// /* emit */ m_channelAdded(ch); + /* emit */ m_channelAdded(ch); return 0; } @@ -382,6 +422,128 @@ RESULT eDVBResourceManager::connectChannelAdded(const Slot1 & return 0; } +bool eDVBResourceManager::canAllocateFrontend(ePtr &feparm) +{ + ePtr best; + int bestval = 0; + + for (eSmartPtrList::iterator i(m_frontend.begin()); i != m_frontend.end(); ++i) + if (!i->m_inuse) + { + int c = i->m_frontend->isCompatibleWith(feparm); + if (c > bestval) + bestval = c; + } + + return bestval>0; +} + +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) + { +// eDebug("available channel.. %04x:%04x", i->m_channel_id.transport_stream_id.get(), i->m_channel_id.original_network_id.get()); + if (i->m_channel_id == channelid) + { +// eDebug("found shared channel.."); + return ret; + } + } + + 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) + { +// eDebug("available channel.. %04x:%04x", i->m_channel_id.transport_stream_id.get(), i->m_channel_id.original_network_id.get()); + 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.. + { + ePtr fe; + if (!i->m_channel->getFrontend(fe)) + { + for (eSmartPtrList::iterator ii(m_frontend.begin()); ii != m_frontend.end(); ++ii) + { + if ( &(*fe) == &(*ii->m_frontend) ) + { + --ii->m_inuse; + decremented_fe_usecount = &ii->m_inuse; + if (channel == &(*m_cached_channel)) + decremented_cached_channel_fe_usecount = decremented_fe_usecount; + break; + } + } + } + } + break; + } + } + + 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!"); + ret = false; + goto error; + } + + if (m_list->getChannelFrontendData(channelid, feparm)) + { + eDebug("channel not found!"); + ret = false; + goto error; + } + + ret = canAllocateFrontend(feparm); + +error: + if (decremented_fe_usecount) + ++(*decremented_fe_usecount); + if (decremented_cached_channel_fe_usecount) + ++(*decremented_cached_channel_fe_usecount); + + return ret; +} + DEFINE_REF(eDVBChannel); eDVBChannel::eDVBChannel(eDVBResourceManager *mgr, eDVBAllocatedFrontend *frontend): m_state(state_idle), m_mgr(mgr) @@ -429,8 +591,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"); @@ -445,6 +617,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; @@ -459,7 +642,7 @@ void eDVBChannel::ReleaseUse() } } -RESULT eDVBChannel::setChannel(const eDVBChannelID &channelid) +RESULT eDVBChannel::setChannel(const eDVBChannelID &channelid, ePtr &feparm) { if (m_channel_id) m_mgr->removeChannel(this); @@ -467,24 +650,6 @@ RESULT eDVBChannel::setChannel(const eDVBChannelID &channelid) if (!channelid) return 0; - ePtr list; - - if (m_mgr->getChannelList(list)) - { - eDebug("no channel list set!"); - return -ENOENT; - } - - eDebug("tuning to chid: ns: %08x tsid %04x onid %04x", - channelid.dvbnamespace.get(), channelid.transport_stream_id.get(), channelid.original_network_id.get()); - - ePtr feparm; - if (list->getChannelFrontendData(channelid, feparm)) - { - eDebug("channel not found!"); - return -ENOENT; - } - if (!m_frontend) { eDebug("no frontend to tune!"); @@ -497,6 +662,7 @@ RESULT eDVBChannel::setChannel(const eDVBChannelID &channelid) /* if tuning fails, shutdown the channel immediately. */ int res; res = m_frontend->get().tune(*feparm); + m_feparm = feparm; if (res) { @@ -514,6 +680,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; @@ -527,7 +699,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) @@ -536,14 +707,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; } @@ -575,11 +744,11 @@ RESULT eDVBChannel::playFile(const char *file) m_pvr_fd_dst = open("/dev/misc/pvr", O_WRONLY); if (m_pvr_fd_dst < 0) { - eDebug("can't open /dev/misc/pvr - you need to buy the new(!) $$$ box! (%m)"); + 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); + 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); @@ -591,7 +760,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; } @@ -601,9 +772,9 @@ RESULT eDVBChannel::getLength(pts_t &len) return m_tstools.calcLen(len); } -RESULT eDVBChannel::getCurrentPosition(pts_t &pos) +RESULT eDVBChannel::getCurrentPosition(iDVBDemux *decoding_demux, pts_t &pos, int mode) { - if (!m_decoder_demux) + if (!decoding_demux) return -1; off_t begin = 0; @@ -617,7 +788,8 @@ RESULT eDVBChannel::getCurrentPosition(pts_t &pos) pts_t now; - r = m_decoder_demux->get().getSTC(now); + /* TODO: this is a gross hack. */ + r = decoding_demux->getSTC(now, mode ? 128 : 0); if (r) { @@ -642,7 +814,7 @@ RESULT eDVBChannel::getCurrentPosition(pts_t &pos) return 0; } -RESULT eDVBChannel::seekTo(int relative, pts_t &pts) +RESULT eDVBChannel::seekTo(iDVBDemux *decoding_demux, int relative, pts_t &pts) { int bitrate = m_tstools.calcBitrate(); /* in bits/s */ @@ -652,7 +824,7 @@ RESULT eDVBChannel::seekTo(int relative, pts_t &pts) if (relative) { pts_t now; - if (getCurrentPosition(now)) + if (getCurrentPosition(decoding_demux, now, 0)) { eDebug("seekTo: getCurrentPosition failed!"); return -1; @@ -665,11 +837,11 @@ RESULT eDVBChannel::seekTo(int relative, pts_t &pts) off_t offset = (pts * (pts_t)bitrate) / 8ULL / 90000ULL; - seekToPosition(offset); + seekToPosition(decoding_demux, offset); return 0; } -RESULT eDVBChannel::seekToPosition(const off_t &r) +RESULT eDVBChannel::seekToPosition(iDVBDemux *decoding_demux, const off_t &r) { /* when seeking, we have to ensure that all buffers are flushed. there are basically 3 buffers: @@ -691,8 +863,8 @@ RESULT eDVBChannel::seekToPosition(const off_t &r) ::ioctl(m_pvr_fd_dst, 0); /* flush ratebuffers (video, audio) */ - if (m_decoder_demux) - m_decoder_demux->get().flush(); + if (decoding_demux) + decoding_demux->flush(); /* demux will also flush all decoder.. */ m_pvr_thread->seek(SEEK_SET, r);