#include <sys/stat.h>
#include <unistd.h>
#include <fcntl.h>
+#include <sys/ioctl.h>
DEFINE_REF(eDVBRegisteredFrontend);
DEFINE_REF(eDVBRegisteredDemux);
{
avail = 1;
busy = 0;
- m_sec = new eDVBSatelliteEquipmentControl;
+ m_sec = new eDVBSatelliteEquipmentControl(m_frontend);
if (!instance)
instance = this;
{
if (instance == this)
instance = 0;
-
}
void eDVBResourceManager::addAdapter(iDVBAdapter *adapter)
for (i=0; i<num_fe; ++i)
{
ePtr<eDVBFrontend> frontend;
+
if (!adapter->getFrontend(frontend, i))
+ {
+ frontend->setTone(iDVBFrontend::toneOff);
+ frontend->setVoltage(iDVBFrontend::voltageOff);
+ frontend->setSEC(m_sec);
m_frontend.push_back(new eDVBRegisteredFrontend(frontend, adapter));
+ }
}
}
-RESULT eDVBResourceManager::allocateFrontend(const eDVBChannelID &chid, ePtr<eDVBAllocatedFrontend> &fe)
+RESULT eDVBResourceManager::allocateFrontend(ePtr<eDVBAllocatedFrontend> &fe, ePtr<iDVBFrontendParameters> &feparm)
{
- /* find first unused frontend. we ignore compatibility for now. */
+ ePtr<eDVBRegisteredFrontend> best;
+ int bestval = 0;
+
for (eSmartPtrList<eDVBRegisteredFrontend>::iterator i(m_frontend.begin()); i != m_frontend.end(); ++i)
if (!i->m_inuse)
+ {
+ int c = i->m_frontend->isCompatibleWith(feparm);
+ if (c > bestval)
+ {
+ bestval = c;
+ best = i;
+ }
+ }
+
+ if (best)
+ {
+ fe = new eDVBAllocatedFrontend(best);
+ return 0;
+ }
+
+ fe = 0;
+
+ return -1;
+}
+
+RESULT eDVBResourceManager::allocateFrontendByIndex(ePtr<eDVBAllocatedFrontend> &fe, int nr)
+{
+ for (eSmartPtrList<eDVBRegisteredFrontend>::iterator i(m_frontend.begin()); i != m_frontend.end(); ++i, --nr)
+ if ((!nr) && !i->m_inuse)
{
fe = new eDVBAllocatedFrontend(i);
return 0;
}
+
+ fe = 0;
return -1;
}
if (i == m_demux.end())
return -1;
+ int n=0;
/* FIXME: hardware demux policy */
if (!(cap & iDVBChannel::capDecode))
- ++i;
+ ++i, ++n;
- for (; i != m_demux.end(); ++i)
+ 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);
- eDebug("demux found");
+ if (fe)
+ demux->get().setSourceFrontend(fe->m_frontend->getID());
+ else
+ demux->get().setSourcePVR(0);
return 0;
}
eDebug("demux not found");
}
}
- /* no currently available channel is tuned to this channelid. create a new one, if possible. */
-
- /* allocate a frontend. */
+ /* no currently available channel is tuned to this channelid. create a new one, if possible. */
+
+ if (!m_list)
+ {
+ eDebug("no channel list set!");
+ return -ENOENT;
+ }
+
+ ePtr<iDVBFrontendParameters> feparm;
+ if (m_list->getChannelFrontendData(channelid, feparm))
+ {
+ eDebug("channel not found!");
+ return -ENOENT;
+ }
+
+ /* allocate a frontend. */
ePtr<eDVBAllocatedFrontend> fe;
- if (allocateFrontend(channelid, fe))
+ if (allocateFrontend(fe, feparm))
return errNoFrontend;
-// will be allocated on demand:
-// ePtr<eDVBAllocatedDemux> demux;
-//
-// if (allocateDemux(*fe, demux))
-// return errNoDemux;
-
RESULT res;
- eDVBChannel *ch;
+ ePtr<eDVBChannel> ch;
ch = new eDVBChannel(this, fe);
- ePtr<iDVBFrontend> myfe;
- if (!ch->getFrontend(myfe))
- myfe->setSEC(m_sec);
-
- res = ch->setChannel(channelid);
+ res = ch->setChannel(channelid, feparm);
if (res)
{
channel = 0;
return 0;
}
-RESULT eDVBResourceManager::allocateRawChannel(eUsePtr<iDVBChannel> &channel)
+RESULT eDVBResourceManager::allocateRawChannel(eUsePtr<iDVBChannel> &channel, int frontend_index)
{
ePtr<eDVBAllocatedFrontend> fe;
-
- if (allocateFrontend(eDVBChannelID(), fe))
+
+ if (allocateFrontendByIndex(fe, frontend_index))
return errNoFrontend;
-// ePtr<eDVBAllocatedDemux> demux;
- //
-// if (allocateDemux(*fe, demux))
-// return errNoDemux;
-
eDVBChannel *ch;
ch = new eDVBChannel(this, fe);
- ePtr<iDVBFrontend> myfe;
- if (!ch->getFrontend(myfe))
- myfe->setSEC(m_sec);
-
channel = ch;
return 0;
}
{
ePtr<eDVBAllocatedDemux> demux;
-// if (allocateDemux(0, demux))
-// return errNoDemux;
-
eDVBChannel *ch;
ch = new eDVBChannel(this, 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;
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");
}
}
-RESULT eDVBChannel::setChannel(const eDVBChannelID &channelid)
+RESULT eDVBChannel::setChannel(const eDVBChannelID &channelid, ePtr<iDVBFrontendParameters> &feparm)
{
if (m_channel_id)
m_mgr->removeChannel(this);
if (!channelid)
return 0;
- ePtr<iDVBChannelList> list;
-
- if (m_mgr->getChannelList(list))
- {
- eDebug("no channel list set!");
- return -ENOENT;
- }
-
- eDebug("tuning to chid: ns: %08x tsid %04x onid %04x",
- channelid.dvbnamespace.get(), channelid.transport_stream_id.get(), channelid.original_network_id.get());
-
- ePtr<iDVBFrontendParameters> feparm;
- if (list->getChannelFrontendData(channelid, feparm))
- {
- eDebug("channel not found!");
- return -ENOENT;
- }
- eDebug("allocateChannel: channel found..");
-
if (!m_frontend)
{
eDebug("no frontend to tune!");
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<void,iDVBChannel*> &stateChange, ePtr<eConnection> &connection)
RESULT eDVBChannel::getDemux(ePtr<iDVBDemux> &demux, int cap)
{
+ eDebug("get %d demux", cap);
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;
+ return -1;
+
}
demux = *our_demux;
+ if (cap & capDecode)
+ {
+ our_demux = 0;
+ }
return 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)");
+ eDebug("can't open /dev/misc/pvr - you need to buy the new(!) $$$ box! (%m)"); // or wait for the driver to be improved.
return -ENODEV;
}
return m_tstools.calcLen(len);
}
-RESULT eDVBChannel::getCurrentPosition(pts_t &pos)
+RESULT eDVBChannel::getCurrentPosition(iDVBDemux *decoding_demux, pts_t &pos)
{
- if (!m_decoder_demux)
+ if (!decoding_demux)
return -1;
off_t begin = 0;
pts_t now;
- r = m_decoder_demux->get().getSTC(now);
+ r = decoding_demux->getSTC(now);
if (r)
{
return 0;
}
-RESULT eDVBChannel::seekTo(pts_t &pts)
+RESULT eDVBChannel::seekTo(iDVBDemux *decoding_demux, 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(decoding_demux, now))
+ {
+ eDebug("seekTo: getCurrentPosition failed!");
+ return -1;
+ }
+ pts += now;
+ }
+
+ if (pts < 0)
+ pts = 0;
+
+ off_t offset = (pts * (pts_t)bitrate) / 8ULL / 90000ULL;
+
+ seekToPosition(decoding_demux, offset);
+ return 0;
+}
+
+RESULT eDVBChannel::seekToPosition(iDVBDemux *decoding_demux, 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();
- if (m_decoder_demux)
- m_decoder_demux->get().flush();
+
+ /* flush internal filepush buffer */
+ m_pvr_thread->flush();
+
+ /* HACK: flush PVR buffer */
+ ::ioctl(m_pvr_fd_dst, 0);
+
+ /* flush ratebuffers (video, audio) */
+ if (decoding_demux)
+ decoding_demux->flush();
+
/* demux will also flush all decoder.. */
-// m_pvr_thread->seek(pts);
+ m_pvr_thread->seek(SEEK_SET, r);
m_pvr_thread->resume();
+ return 0;
}
-
git.cweiske.de / enigma2.git / blobdiff