X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/1d9b83e416ec6471e53844c80626dbf22a411e90..fc8d7d9463a9305b68da5b439c2a41061cb962bb:/lib/dvb/dvb.cpp diff --git a/lib/dvb/dvb.cpp b/lib/dvb/dvb.cpp index d98aa2a8..b08e524c 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,37 @@ 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; + + int n=0; + /* FIXME: hardware demux policy */ + if (!(cap & iDVBChannel::capDecode)) + ++i, ++n; + + for (; i != m_demux.end(); ++i, ++n) if ((!i->m_inuse) && ((!fe) || (i->m_adapter == fe->m_adapter))) { + if ((cap & iDVBChannel::capDecode) && n) + continue; + demux = new eDVBAllocatedDemux(i); + if (fe) + demux->get().setSourceFrontend(fe->m_frontend->getID()); + else + demux->get().setSourcePVR(0); + eDebug("demux (%d) found (fe id: %d)", n, fe->m_frontend->getID()); return 0; } + eDebug("demux not found"); return -1; } @@ -267,14 +289,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 +321,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 +342,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,9 +354,8 @@ 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); +// /* emit */ m_channelAdded(ch); return 0; } @@ -363,10 +385,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; @@ -382,13 +403,14 @@ eDVBChannel::~eDVBChannel() 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. */ @@ -406,10 +428,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"); @@ -459,7 +485,6 @@ RESULT eDVBChannel::setChannel(const eDVBChannelID &channelid) eDebug("channel not found!"); return -ENOENT; } - eDebug("allocateChannel: channel found.."); if (!m_frontend) { @@ -470,7 +495,18 @@ RESULT eDVBChannel::setChannel(const eDVBChannelID &channelid) m_channel_id = channelid; m_mgr->addChannel(channelid, this); m_state = state_tuning; - return m_frontend->get().tune(*feparm); + /* if tuning fails, shutdown the channel immediately. */ + int res; + res = m_frontend->get().tune(*feparm); + + if (res) + { + m_state = state_release; + m_stateChanged(this); + return res; + } + + return 0; } RESULT eDVBChannel::connectStateChange(const Slot1 &stateChange, ePtr &connection) @@ -490,9 +526,25 @@ RESULT eDVBChannel::setCIRouting(const eDVBCIRouting &routing) return -1; } -RESULT eDVBChannel::getDemux(ePtr &demux) +RESULT eDVBChannel::getDemux(ePtr &demux, int cap) { - demux = &m_demux->get(); + eDebug("get %d demux", cap); + 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 -1; + + } + + demux = *our_demux; + if (cap & capDecode) + { + our_demux = 0; + } return 0; } @@ -515,29 +567,136 @@ RESULT eDVBChannel::playFile(const char *file) 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.) */ - int dest = open("/dev/misc/pvr", O_WRONLY); - if (dest < 0) + 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; } - int source = open(file, O_RDONLY); - if (source < 0) + m_pvr_fd_src = open(file, O_RDONLY); + if (m_pvr_fd_src < 0) { - eDebug("can't open PVR source file %s (%m)", file); - close(dest); + 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(source, dest); + 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(int relative, pts_t &pts) +{ + int bitrate = m_tstools.calcBitrate(); /* in bits/s */ + + if (bitrate == -1) + return -1; + + if (relative) + { + pts_t now; + if (getCurrentPosition(now)) + { + eDebug("seekTo: getCurrentPosition failed!"); + return -1; + } + pts += now; + } + + if (pts < 0) + pts = 0; + + off_t offset = (pts * (pts_t)bitrate) / 8ULL / 90000ULL; + + seekToPosition(offset); + return 0; +} + +RESULT eDVBChannel::seekToPosition(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(SEEK_SET, r); + m_pvr_thread->resume(); + return 0; }