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 = 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)
{
RESULT allocateFrontend(const eDVBChannelID &chid, ePtr<eDVBAllocatedFrontend> &fe);
/* allocate a demux able to filter on the selected frontend. */
- RESULT allocateDemux(eDVBRegisteredFrontend *fe, ePtr<eDVBAllocatedDemux> &demux);
+ RESULT allocateDemux(eDVBRegisteredFrontend *fe, ePtr<eDVBAllocatedDemux> &demux, int cap);
struct active_channel
{
{
DECLARE_REF(eDVBChannel);
public:
- eDVBChannel(eDVBResourceManager *mgr, eDVBAllocatedFrontend *frontend, eDVBAllocatedDemux *demux);
+ eDVBChannel(eDVBResourceManager *mgr, eDVBAllocatedFrontend *frontend);
virtual ~eDVBChannel();
/* only for managed channels - effectively tunes to the channelid. should not be used... */
RESULT getState(int &state);
RESULT setCIRouting(const eDVBCIRouting &routing);
- RESULT getDemux(ePtr<iDVBDemux> &demux);
+ RESULT getDemux(ePtr<iDVBDemux> &demux, int cap);
RESULT getFrontend(ePtr<iDVBFrontend> &frontend);
/* iDVBPVRChannel */
private:
ePtr<eDVBAllocatedFrontend> m_frontend;
- ePtr<eDVBAllocatedDemux> m_demux;
+ ePtr<eDVBAllocatedDemux> m_demux, m_decoder_demux;
ePtr<iDVBFrontendParameters> m_current_frontend_parameters;
eDVBChannelID m_channel_id;
#include <lib/dvb/metaparser.h>
#include <dvbsi++/ca_program_map_section.h>
-eDVBServicePMTHandler::eDVBServicePMTHandler()
+eDVBServicePMTHandler::eDVBServicePMTHandler(int record)
:m_pmt_pid(0xFFFF), m_ca_servicePtr(0)
{
+ m_record = record;
eDVBResourceManager::getInstance(m_resourceManager);
CONNECT(m_PMT.tableReady, eDVBServicePMTHandler::PMTready);
CONNECT(m_PAT.tableReady, eDVBServicePMTHandler::PATready);
&& (state == iDVBChannel::state_ok) && (!m_demux))
{
if (m_channel)
- if (m_channel->getDemux(m_demux))
- eDebug("shit it failed.. again.");
+ if (m_channel->getDemux(m_demux, m_record ? 0 : iDVBChannel::capDecode))
+ eDebug("Allocating a demux for now tuned-in channel failed.");
serviceEvent(eventTuned);
RESULT res;
m_reference = ref;
-// ref.path = "/viva.ts"; // hrhr.
-
/* is this a normal (non PVR) channel? */
if (ref.path.empty())
{