return -1;
}
-RESULT eDVBResourceManager::allocateDemux(eDVBRegisteredFrontend *fe, ePtr<eDVBAllocatedDemux> &demux)
+RESULT eDVBResourceManager::allocateDemux(eDVBRegisteredFrontend *fe, ePtr<eDVBAllocatedDemux> &demux, int cap)
{
- /* find first unused demux which is on same adapter as frontend (or any, if PVR) */
- for (eSmartPtrList<eDVBRegisteredDemux>::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<eDVBRegisteredDemux>::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;
}
if (allocateFrontend(channelid, fe))
return errNoFrontend;
- ePtr<eDVBAllocatedDemux> demux;
-
- if (allocateDemux(*fe, demux))
- return errNoDemux;
+// will be allocated on demand:
+// ePtr<eDVBAllocatedDemux> demux;
+//
+// if (allocateDemux(*fe, demux))
+// return errNoDemux;
RESULT res;
eDVBChannel *ch;
- ch = new eDVBChannel(this, fe, demux);
+ ch = new eDVBChannel(this, fe);
ePtr<iDVBFrontend> myfe;
if (!ch->getFrontend(myfe))
if (allocateFrontend(eDVBChannelID(), fe))
return errNoFrontend;
- ePtr<eDVBAllocatedDemux> demux;
-
- if (allocateDemux(*fe, demux))
- return errNoDemux;
+// ePtr<eDVBAllocatedDemux> demux;
+ //
+// if (allocateDemux(*fe, demux))
+// return errNoDemux;
eDVBChannel *ch;
- ch = new eDVBChannel(this, fe, demux);
+ ch = new eDVBChannel(this, fe);
ePtr<iDVBFrontend> myfe;
if (!ch->getFrontend(myfe))
{
ePtr<eDVBAllocatedDemux> 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;
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;
return -1;
}
-RESULT eDVBChannel::getDemux(ePtr<iDVBDemux> &demux)
+RESULT eDVBChannel::getDemux(ePtr<iDVBDemux> &demux, int cap)
{
- demux = &m_demux->get();
+ ePtr<eDVBAllocatedDemux> &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;
}
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)
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;
}