#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 errNoDemux;
RESULT res;
- eDVBChannel *ch;
+ ePtr<eDVBChannel> ch;
ch = new eDVBChannel(this, fe);
ePtr<iDVBFrontend> myfe;
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");
eDebug("channel not found!");
return -ENOENT;
}
- eDebug("allocateChannel: channel found..");
if (!m_frontend)
{
return 0;
}
-RESULT eDVBChannel::seekTo(pts_t &pts)
+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(pts);
+ m_pvr_thread->seek(SEEK_SET, r);
m_pvr_thread->resume();
+ return 0;
}
-