X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/87bfe5dfced0fb7a4e9839fdafa898261a39c86c..afb996e31e73607e2ef25ba679a15f15c94701e4:/lib/dvb/dvb.cpp diff --git a/lib/dvb/dvb.cpp b/lib/dvb/dvb.cpp index 90df7267..78cef639 100644 --- a/lib/dvb/dvb.cpp +++ b/lib/dvb/dvb.cpp @@ -9,6 +9,7 @@ #include #include #include +#include DEFINE_REF(eDVBRegisteredFrontend); DEFINE_REF(eDVBRegisteredDemux); @@ -176,7 +177,6 @@ eDVBResourceManager::~eDVBResourceManager() { if (instance == this) instance = 0; - } void eDVBResourceManager::addAdapter(iDVBAdapter *adapter) @@ -214,15 +214,29 @@ RESULT eDVBResourceManager::allocateFrontend(const eDVBChannelID &chid, ePtr &demux) +RESULT eDVBResourceManager::allocateDemux(eDVBRegisteredFrontend *fe, ePtr &demux, int cap) { - /* find first unused demux which is on same adapter as frontend (or any, if PVR) */ - for (eSmartPtrList::iterator i(m_demux.begin()); i != m_demux.end(); ++i) + /* find first unused demux which is on same adapter as frontend (or any, if PVR) + never use the first one unless we need a decoding demux. */ + + eDebug("allocate demux"); + eSmartPtrList::iterator i(m_demux.begin()); + + if (i == m_demux.end()) + return -1; + + /* FIXME: hardware demux policy */ + if (!(cap & iDVBChannel::capDecode)) + ++i; + + for (; i != m_demux.end(); ++i) if ((!i->m_inuse) && ((!fe) || (i->m_adapter == fe->m_adapter))) { demux = new eDVBAllocatedDemux(i); + eDebug("demux found"); return 0; } + eDebug("demux not found"); return -1; } @@ -267,14 +281,15 @@ RESULT eDVBResourceManager::allocateChannel(const eDVBChannelID &channelid, eUse if (allocateFrontend(channelid, fe)) return errNoFrontend; - ePtr demux; - - if (allocateDemux(*fe, demux)) - return errNoDemux; +// will be allocated on demand: +// ePtr demux; +// +// if (allocateDemux(*fe, demux)) +// return errNoDemux; RESULT res; - eDVBChannel *ch; - ch = new eDVBChannel(this, fe, demux); + ePtr ch; + ch = new eDVBChannel(this, fe); ePtr myfe; if (!ch->getFrontend(myfe)) @@ -298,13 +313,13 @@ RESULT eDVBResourceManager::allocateRawChannel(eUsePtr &channel) if (allocateFrontend(eDVBChannelID(), fe)) return errNoFrontend; - ePtr demux; - - if (allocateDemux(*fe, demux)) - return errNoDemux; +// ePtr demux; + // +// if (allocateDemux(*fe, demux)) +// return errNoDemux; eDVBChannel *ch; - ch = new eDVBChannel(this, fe, demux); + ch = new eDVBChannel(this, fe); ePtr myfe; if (!ch->getFrontend(myfe)) @@ -319,11 +334,11 @@ RESULT eDVBResourceManager::allocatePVRChannel(eUsePtr &channel) { ePtr demux; - if (allocateDemux(0, demux)) - return errNoDemux; +// if (allocateDemux(0, demux)) +// return errNoDemux; eDVBChannel *ch; - ch = new eDVBChannel(this, 0, demux); + ch = new eDVBChannel(this, 0); channel = ch; return 0; @@ -331,7 +346,6 @@ RESULT eDVBResourceManager::allocatePVRChannel(eUsePtr &channel) RESULT eDVBResourceManager::addChannel(const eDVBChannelID &chid, eDVBChannel *ch) { - eDebug("add channel %p", ch); m_active_channels.push_back(active_channel(chid, ch)); /* emit */ m_channelAdded(ch); return 0; @@ -363,10 +377,9 @@ RESULT eDVBResourceManager::connectChannelAdded(const Slot1 & DEFINE_REF(eDVBChannel); -eDVBChannel::eDVBChannel(eDVBResourceManager *mgr, eDVBAllocatedFrontend *frontend, eDVBAllocatedDemux *demux): m_state(state_idle), m_mgr(mgr) +eDVBChannel::eDVBChannel(eDVBResourceManager *mgr, eDVBAllocatedFrontend *frontend): m_state(state_idle), m_mgr(mgr) { m_frontend = frontend; - m_demux = demux; m_pvr_thread = 0; @@ -390,7 +403,6 @@ eDVBChannel::~eDVBChannel() void eDVBChannel::frontendStateChanged(iDVBFrontend*fe) { - eDebug("fe state changed!"); int state, ourstate = 0; /* if we are already in shutdown, don't change state. */ @@ -408,10 +420,14 @@ void eDVBChannel::frontendStateChanged(iDVBFrontend*fe) { eDebug("OURSTATE: tuning"); ourstate = state_tuning; - } else if (state == iDVBFrontend::stateFailed) + } else if (state == iDVBFrontend::stateLostLock) { - eDebug("OURSTATE: failed/unavailable"); + eDebug("OURSTATE: lost lock"); ourstate = state_unavailable; + } else if (state == iDVBFrontend::stateFailed) + { + eDebug("OURSTATE: failed"); + ourstate = state_failed; } else eFatal("state unknown"); @@ -461,7 +477,6 @@ RESULT eDVBChannel::setChannel(const eDVBChannelID &channelid) eDebug("channel not found!"); return -ENOENT; } - eDebug("allocateChannel: channel found.."); if (!m_frontend) { @@ -492,9 +507,19 @@ RESULT eDVBChannel::setCIRouting(const eDVBCIRouting &routing) return -1; } -RESULT eDVBChannel::getDemux(ePtr &demux) +RESULT eDVBChannel::getDemux(ePtr &demux, int cap) { - demux = &m_demux->get(); + ePtr &our_demux = (cap & capDecode) ? m_decoder_demux : m_demux; + + if (!our_demux) + { + demux = 0; + + if (m_mgr->allocateDemux(m_frontend ? (eDVBRegisteredFrontend*)*m_frontend : (eDVBRegisteredFrontend*)0, our_demux, cap)) + return 0; + } + + demux = *our_demux; return 0; } @@ -543,6 +568,8 @@ RESULT eDVBChannel::playFile(const char *file) m_pvr_thread = new eFilePushThread(); m_pvr_thread->start(m_pvr_fd_src, m_pvr_fd_dst); + + return 0; } RESULT eDVBChannel::getLength(pts_t &len) @@ -552,6 +579,9 @@ RESULT eDVBChannel::getLength(pts_t &len) RESULT eDVBChannel::getCurrentPosition(pts_t &pos) { + if (!m_decoder_demux) + return -1; + off_t begin = 0; /* getPTS for offset 0 is cached, so it doesn't harm. */ int r = m_tstools.getPTS(begin, pos); @@ -563,7 +593,7 @@ RESULT eDVBChannel::getCurrentPosition(pts_t &pos) pts_t now; - r = m_demux->get().getSTC(now); + r = m_decoder_demux->get().getSTC(now); if (r) { @@ -587,3 +617,54 @@ RESULT eDVBChannel::getCurrentPosition(pts_t &pos) return 0; } + +RESULT eDVBChannel::seekTo(pts_t &pts) +{ +#if 0 + eDebug("eDVBChannel: seekTo .. %llx", pts); + m_pvr_thread->pause(); + if (m_decoder_demux) + m_decoder_demux->get().flush(); + /* demux will also flush all decoder.. */ + + off_t r; + + if (!m_tstools.getPosition(pts, r)); + m_pvr_thread->seek(r); + else + eDebug("getPosition failed!"); + m_pvr_thread->resume(); +#endif + return 0; +} + +RESULT eDVBChannel::seekToPosition(int relative, const off_t &r) +{ + /* when seeking, we have to ensure that all buffers are flushed. + there are basically 3 buffers: + a.) the filepush's internal buffer + b.) the PVR buffer (before demux) + c.) the ratebuffer (after demux) + + it's important to clear them in the correct order, otherwise + the ratebuffer (for example) would immediately refill from + the not-yet-flushed PVR buffer. + */ + eDebug("eDVBChannel: seekToPosition .. %llx", r); + m_pvr_thread->pause(); + + /* flush internal filepush buffer */ + m_pvr_thread->flush(); + + /* HACK: flush PVR buffer */ + ::ioctl(m_pvr_fd_dst, 0); + + /* flush ratebuffers (video, audio) */ + if (m_decoder_demux) + m_decoder_demux->get().flush(); + + /* demux will also flush all decoder.. */ + m_pvr_thread->seek(relative ? SEEK_CUR : SEEK_SET, r); + m_pvr_thread->resume(); + return 0; +}