#include <sys/stat.h>
#include <unistd.h>
#include <fcntl.h>
+#include <sys/ioctl.h>
DEFINE_REF(eDVBRegisteredFrontend);
DEFINE_REF(eDVBRegisteredDemux);
{
if (instance == this)
instance = 0;
-
}
void eDVBResourceManager::addAdapter(iDVBAdapter *adapter)
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);
+ ePtr<eDVBChannel> ch;
+ 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;
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;
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;
void eDVBChannel::frontendStateChanged(iDVBFrontend*fe)
{
- eDebug("fe state changed!");
int state, ourstate = 0;
/* if we are already in shutdown, don't change state. */
{
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");
eDebug("channel not found!");
return -ENOENT;
}
- eDebug("allocateChannel: channel found..");
if (!m_frontend)
{
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 = new eFilePushThread();
m_pvr_thread->start(m_pvr_fd_src, m_pvr_fd_dst);
+
+ return 0;
}
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);
pts_t now;
- r = m_demux->get().getSTC(now);
+ r = m_decoder_demux->get().getSTC(now);
if (r)
{
return -1;
}
- eDebug("STC: %08llx PTS: %08llx, diff %lld", now, pos, now - pos);
-
+// 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))
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;
+}