X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/aa3d1162bef321bd2d0effdafce6eb080660a7ca..e126edab6b5649fef4c00f871925e06f24338843:/lib/dvb/dvb.cpp diff --git a/lib/dvb/dvb.cpp b/lib/dvb/dvb.cpp index ea51d6a1..13ae224c 100644 --- a/lib/dvb/dvb.cpp +++ b/lib/dvb/dvb.cpp @@ -1,12 +1,14 @@ -#include #include +#include +#include #include #include -#include +#include #include #include #include +#include DEFINE_REF(eDVBRegisteredFrontend); DEFINE_REF(eDVBRegisteredDemux); @@ -174,7 +176,6 @@ eDVBResourceManager::~eDVBResourceManager() { if (instance == this) instance = 0; - } void eDVBResourceManager::addAdapter(iDVBAdapter *adapter) @@ -212,15 +213,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 */ - for (eSmartPtrList::iterator i(m_demux.begin()); i != m_demux.end(); ++i) - if ((!i->m_inuse) && (i->m_adapter == fe->m_adapter)) + /* 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; } @@ -265,14 +280,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)) @@ -296,13 +312,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)) @@ -312,14 +328,23 @@ RESULT eDVBResourceManager::allocateRawChannel(eUsePtr &channel) return 0; } -RESULT eDVBResourceManager::allocatePVRChannel(int caps) + +RESULT eDVBResourceManager::allocatePVRChannel(eUsePtr &channel) { - return -1; // will nicht, mag nicht, und das interface ist auch kaputt + ePtr demux; + +// if (allocateDemux(0, demux)) +// return errNoDemux; + + eDVBChannel *ch; + ch = new eDVBChannel(this, 0); + + channel = ch; + return 0; } 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; @@ -351,10 +376,11 @@ 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; if (m_frontend) m_frontend->get().connectStateChange(slot(*this, &eDVBChannel::frontendStateChanged), m_conn_frontendStateChanged); @@ -364,11 +390,18 @@ 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; + } } void eDVBChannel::frontendStateChanged(iDVBFrontend*fe) { - eDebug("fe state changed!"); int state, ourstate = 0; /* if we are already in shutdown, don't change state. */ @@ -386,10 +419,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"); @@ -439,7 +476,6 @@ RESULT eDVBChannel::setChannel(const eDVBChannelID &channelid) eDebug("channel not found!"); return -ENOENT; } - eDebug("allocateChannel: channel found.."); if (!m_frontend) { @@ -470,9 +506,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; } @@ -484,3 +530,100 @@ RESULT eDVBChannel::getFrontend(ePtr &frontend) else return -ENODEV; } + +RESULT eDVBChannel::playFile(const char *file) +{ + ASSERT(!m_frontend); + if (m_pvr_thread) + { + m_pvr_thread->stop(); + delete m_pvr_thread; + m_pvr_thread = 0; + } + + m_tstools.openFile(file); + + /* DON'T EVEN THINK ABOUT FIXING THIS. FIX THE ATI SOURCES FIRST, + THEN DO A REAL FIX HERE! */ + + /* (this codepath needs to be improved anyway.) */ + 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)"); + return -ENODEV; + } + + m_pvr_fd_src = open(file, O_RDONLY); + 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->start(m_pvr_fd_src, m_pvr_fd_dst); + + return 0; +} + +RESULT eDVBChannel::getLength(pts_t &len) +{ + return m_tstools.calcLen(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); + if (r) + { + eDebug("tstools getpts(0) failed!"); + return r; + } + + pts_t now; + + r = m_decoder_demux->get().getSTC(now); + + if (r) + { + eDebug("demux getSTC failed"); + return -1; + } + +// eDebug("STC: %08llx PTS: %08llx, diff %lld", now, pos, now - pos); + /* when we are less than 10 seconds before the start, return 0. */ + /* (we're just waiting for the timespam to start) */ + if ((now < pos) && ((pos - now) < 90000 * 10)) + { + pos = 0; + return 0; + } + + if (now < pos) /* wrap around */ + pos = now + ((pts_t)1)<<33 - pos; + else + pos = now - pos; + + return 0; +} + +RESULT eDVBChannel::seekTo(pts_t &pts) +{ + m_pvr_thread->pause(); + if (m_decoder_demux) + m_decoder_demux->get().flush(); + /* demux will also flush all decoder.. */ +// m_pvr_thread->seek(pts); + m_pvr_thread->resume(); +} +