add missing letter

[enigma2.git] / lib / dvb / decoder.cpp

diff --git a/lib/dvb/decoder.cpp b/lib/dvb/decoder.cpp
index 835f434e1f10160f9393669fba5f9e02498d4aba..919c85a9671dac04bdc9a8878d0938082f104e34 100644 (file)
--- a/lib/dvb/decoder.cpp
+++ b/lib/dvb/decoder.cpp
@@ -1,4 +1,4 @@
-#include <config.h>
+#include <lib/base/ebase.h>

 #include <lib/base/eerror.h>
 #include <lib/dvb/decoder.h>
 #if HAVE_DVB_API_VERSION < 3 
 #include <lib/base/eerror.h>
 #include <lib/dvb/decoder.h>
 #if HAVE_DVB_API_VERSION < 3 


@@ -10,8 +10,10 @@
 #define videoStreamSource_t video_stream_source_t
 #define streamSource stream_source
 #define dmxPesFilterParams dmx_pes_filter_params
 #define videoStreamSource_t video_stream_source_t
 #define streamSource stream_source
 #define dmxPesFilterParams dmx_pes_filter_params

-#define DMX_PES_VIDEO DMX_PES_VIDEO0
-#define DMX_PES_AUDIO DMX_PES_AUDIO0
+#define DMX_PES_VIDEO0 DMX_PES_VIDEO
+#define DMX_PES_AUDIO0 DMX_PES_AUDIO
+#define DMX_PES_VIDEO1 DMX_PES_VIDEO
+#define DMX_PES_AUDIO1 DMX_PES_AUDIO

 #include <ost/dmx.h>
 #include <ost/video.h>
 #include <ost/audio.h>
 #include <ost/dmx.h>
 #include <ost/video.h>
 #include <ost/audio.h>


@@ -26,13 +28,20 @@
 #include <sys/ioctl.h>
 #include <errno.h>
 
 #include <sys/ioctl.h>
 #include <errno.h>
 

+       /* these are quite new... */
+#ifndef AUDIO_GET_PTS
+#define AUDIO_GET_PTS              _IOR('o', 19, __u64)
+#define VIDEO_GET_PTS              _IOR('o', 57, __u64)
+#endif
+

 DEFINE_REF(eDVBAudio);
 
 DEFINE_REF(eDVBAudio);
 

-eDVBAudio::eDVBAudio(eDVBDemux *demux, int dev): m_demux(demux)
+eDVBAudio::eDVBAudio(eDVBDemux *demux, int dev)
+       :m_demux(demux), m_dev(dev), m_is_freezed(0)

 {
        char filename[128];
 #if HAVE_DVB_API_VERSION < 3
 {
        char filename[128];
 #if HAVE_DVB_API_VERSION < 3

-       sprintf(filename, "/dev/dvb/card%d/audio%d", demux->adapter, dev);      
+       sprintf(filename, "/dev/dvb/card%d/audio%d", demux->adapter, dev);

 #else
        sprintf(filename, "/dev/dvb/adapter%d/audio%d", demux->adapter, dev);
 #endif
 #else
        sprintf(filename, "/dev/dvb/adapter%d/audio%d", demux->adapter, dev);
 #endif


@@ -43,14 +52,106 @@ eDVBAudio::eDVBAudio(eDVBDemux *demux, int dev): m_demux(demux)
        sprintf(filename, "/dev/dvb/card%d/demux%d", demux->adapter, demux->demux);
 #else
        sprintf(filename, "/dev/dvb/adapter%d/demux%d", demux->adapter, demux->demux);
        sprintf(filename, "/dev/dvb/card%d/demux%d", demux->adapter, demux->demux);
 #else
        sprintf(filename, "/dev/dvb/adapter%d/demux%d", demux->adapter, demux->demux);

-#endif 
+#endif

        m_fd_demux = ::open(filename, O_RDWR);
        if (m_fd_demux < 0)
                eWarning("%s: %m", filename);
 }
        m_fd_demux = ::open(filename, O_RDWR);
        if (m_fd_demux < 0)
                eWarning("%s: %m", filename);
 }

-       
+
+#if HAVE_DVB_API_VERSION < 3
+int eDVBAudio::setPid(int pid, int type)
+{
+       if ((m_fd < 0) || (m_fd_demux < 0))
+               return -1;
+
+       int bypass = 0;
+
+       switch (type)
+       {
+       case aMPEG:
+               bypass = 1;
+               break;
+       case aAC3:
+               bypass = 0;
+               break;
+               /*
+       case aDTS:
+               bypass = 2;
+               break;
+               */
+       }
+
+       if (::ioctl(m_fd, AUDIO_SET_BYPASS_MODE, bypass) < 0)
+               eDebug("failed (%m)");
+
+       dmx_pes_filter_params pes;
+
+       pes.pid      = pid;
+       pes.input    = DMX_IN_FRONTEND;
+       pes.output   = DMX_OUT_DECODER;
+       pes.pes_type = m_dev ? DMX_PES_AUDIO1 : DMX_PES_AUDIO0; /* FIXME */
+       pes.flags    = 0;
+       eDebugNoNewLine("DMX_SET_PES_FILTER(0x%02x) - audio - ", pid);
+       if (::ioctl(m_fd_demux, DMX_SET_PES_FILTER, &pes) < 0)
+       {
+               eDebug("failed (%m)");
+               return -errno;
+       }
+       eDebug("ok");
+
+       return 0;
+}
+
+int eDVBAudio::startPid()
+{
+       eDebugNoNewLine("DEMUX_START - audio - ");
+       if (::ioctl(m_fd_demux, DMX_START) < 0)
+       {
+               eDebug("failed (%m)");
+               return -errno;
+       }
+       eDebug("ok");
+       return 0;
+}
+
+int eDVBAudio::start()
+{
+       eDebugNoNewLine("AUDIO_PLAY - ");
+       if (::ioctl(m_fd, AUDIO_PLAY) < 0)
+       {
+               eDebug("failed (%m)");
+               return -errno;
+       }
+       eDebug("ok");
+       return 0;
+}
+
+int eDVBAudio::stopPid()
+{
+       eDebugNoNewLine("DEMUX_STOP - audio - ");
+       if (::ioctl(m_fd_demux, DMX_STOP) < 0)
+       {
+               eDebug("failed (%m)");
+               return -errno;
+       }
+       eDebug("ok");
+       return 0;
+}
+
+int eDVBAudio::setAVSync(int val)
+{
+       eDebugNoNewLine("AUDIO_SET_AV_SYNC - ");
+       if (::ioctl(m_fd, AUDIO_SET_AV_SYNC, val) < 0)
+       {
+               eDebug("failed (%m)");
+               return -errno;
+       }
+       eDebug("ok");
+       return 0;
+}
+#else

 int eDVBAudio::startPid(int pid, int type)
 int eDVBAudio::startPid(int pid, int type)

-{      
+{

        if ((m_fd < 0) || (m_fd_demux < 0))
                return -1;
        dmx_pes_filter_params pes;
        if ((m_fd < 0) || (m_fd_demux < 0))
                return -1;
        dmx_pes_filter_params pes;


@@ -58,21 +159,24 @@ int eDVBAudio::startPid(int pid, int type)
        pes.pid      = pid;
        pes.input    = DMX_IN_FRONTEND;
        pes.output   = DMX_OUT_DECODER;
        pes.pid      = pid;
        pes.input    = DMX_IN_FRONTEND;
        pes.output   = DMX_OUT_DECODER;

-       pes.pes_type = DMX_PES_AUDIO;  // DMX_PES_AUDIO0
+       pes.pes_type = m_dev ? DMX_PES_AUDIO1 : DMX_PES_AUDIO0; /* FIXME */

        pes.flags    = 0;
        pes.flags    = 0;

+       eDebugNoNewLine("DMX_SET_PES_FILTER(0x%02x) - audio - ", pid);

        if (::ioctl(m_fd_demux, DMX_SET_PES_FILTER, &pes) < 0)
        {
        if (::ioctl(m_fd_demux, DMX_SET_PES_FILTER, &pes) < 0)
        {

-               eWarning("audio: DMX_SET_PES_FILTER: %m");
+               eDebug("failed (%m)");

                return -errno;
        }
                return -errno;
        }

+       eDebug("ok");
+       eDebugNoNewLine("DEMUX_START - audio - ");

        if (::ioctl(m_fd_demux, DMX_START) < 0)
        {
        if (::ioctl(m_fd_demux, DMX_START) < 0)
        {

-               eWarning("audio: DMX_START: %m");
+               eDebug("failed (%m)");

                return -errno;
        }
                return -errno;
        }

-       
+       eDebug("ok");

        int bypass = 0;
        int bypass = 0;

-       
+

        switch (type)
        {
        case aMPEG:
        switch (type)
        {
        case aMPEG:


@@ -87,53 +191,106 @@ int eDVBAudio::startPid(int pid, int type)
                break;
                */
        }
                break;
                */
        }

-       
+
+       eDebugNoNewLine("AUDIO_SET_BYPASS - ");

        if (::ioctl(m_fd, AUDIO_SET_BYPASS_MODE, bypass) < 0)
        if (::ioctl(m_fd, AUDIO_SET_BYPASS_MODE, bypass) < 0)

-               eWarning("audio: AUDIO_SET_BYPASS_MODE: %m");
-       
+               eDebug("failed (%m)");
+       else
+               eDebug("ok");
+       freeze();
+
+       eDebugNoNewLine("AUDIO_PLAY - ");

        if (::ioctl(m_fd, AUDIO_PLAY) < 0)
        if (::ioctl(m_fd, AUDIO_PLAY) < 0)

-               eWarning("audio: AUDIO_PLAY: %m");
+               eDebug("failed (%m)");
+       else
+               eDebug("ok");

        return 0;
 }
        return 0;
 }

-       
+#endif
+

 void eDVBAudio::stop()
 {
 void eDVBAudio::stop()
 {

+#if HAVE_DVB_API_VERSION > 2
+       flush();
+#endif
+       eDebugNoNewLine("AUDIO_STOP - ");

        if (::ioctl(m_fd, AUDIO_STOP) < 0)
        if (::ioctl(m_fd, AUDIO_STOP) < 0)

-               eWarning("audio: AUDIO_STOP: %m");
+               eDebug("failed (%m)");
+       else
+               eDebug("ok");

 #if HAVE_DVB_API_VERSION > 2
 #if HAVE_DVB_API_VERSION > 2

+       eDebugNoNewLine("DEMUX_STOP - audio - ");

        if (::ioctl(m_fd_demux, DMX_STOP) < 0)
        if (::ioctl(m_fd_demux, DMX_STOP) < 0)

-               eWarning("audio: DMX_STOP: %m");
+               eDebug("failed (%m)");
+       else
+               eDebug("ok");

 #endif
 }
 #endif
 }

-       
-#if HAVE_DVB_API_VERSION < 3
-void eDVBAudio::stopPid()
-{
-       if (::ioctl(m_fd_demux, DMX_STOP) < 0)
-               eWarning("audio: DMX_STOP: %m");
-}
-#endif

 
 void eDVBAudio::flush()
 {
 
 void eDVBAudio::flush()
 {

+       eDebugNoNewLine("AUDIO_CLEAR_BUFFER - ");

        if (::ioctl(m_fd, AUDIO_CLEAR_BUFFER) < 0)
        if (::ioctl(m_fd, AUDIO_CLEAR_BUFFER) < 0)

-               eDebug("audio: AUDIO_CLEAR_BUFFER: %m");
+               eDebug("failed (%m)");
+       else
+               eDebug("ok");

 }
 
 void eDVBAudio::freeze()
 {
 }
 
 void eDVBAudio::freeze()
 {

-       if (::ioctl(m_fd, AUDIO_PAUSE) < 0)
-               eDebug("video: AUDIO_PAUSE: %m");
+       if (!m_is_freezed)
+       {
+               eDebugNoNewLine("AUDIO_PAUSE - ");
+               if (::ioctl(m_fd, AUDIO_PAUSE) < 0)
+                       eDebug("failed (%m)");
+               else
+                       eDebug("ok");
+               m_is_freezed=1;
+       }

 }
 }

-       
+

 void eDVBAudio::unfreeze()
 {
 void eDVBAudio::unfreeze()
 {

-       if (::ioctl(m_fd, AUDIO_CONTINUE) < 0)
-               eDebug("video: AUDIO_CONTINUE: %m");
+       if (m_is_freezed)
+       {
+               eDebugNoNewLine("AUDIO_CONTINUE - ");
+               if (::ioctl(m_fd, AUDIO_CONTINUE) < 0)
+                       eDebug("failed (%m)");
+               else
+                       eDebug("ok");
+               m_is_freezed=0;
+       }
+}
+
+void eDVBAudio::setChannel(int channel)
+{
+       int val = AUDIO_STEREO;
+       switch (channel)
+       {
+       case aMonoLeft: val = AUDIO_MONO_LEFT; break;
+       case aMonoRight: val = AUDIO_MONO_RIGHT; break;
+       default: break;
+       }
+       eDebugNoNewLine("AUDIO_CHANNEL_SELECT(%d) - ", val);
+       if (::ioctl(m_fd, AUDIO_CHANNEL_SELECT, val) < 0)
+               eDebug("failed (%m)");
+       else
+               eDebug("ok");

 }
 }

-       
+
+int eDVBAudio::getPTS(pts_t &now)
+{
+       eDebugNoNewLine("AUDIO_GET_PTS - ");
+       if (::ioctl(m_fd, AUDIO_GET_PTS, &now) < 0)
+               eDebug("failed (%m)");
+       else
+               eDebug("ok");
+       return 0;
+}
+

 eDVBAudio::~eDVBAudio()
 {
 eDVBAudio::~eDVBAudio()
 {

+       unfreeze();

        if (m_fd >= 0)
                ::close(m_fd);
        if (m_fd_demux >= 0)
        if (m_fd >= 0)
                ::close(m_fd);
        if (m_fd_demux >= 0)


@@ -142,17 +299,27 @@ eDVBAudio::~eDVBAudio()
 
 DEFINE_REF(eDVBVideo);
 
 
 DEFINE_REF(eDVBVideo);
 

-eDVBVideo::eDVBVideo(eDVBDemux *demux, int dev): m_demux(demux)
+eDVBVideo::eDVBVideo(eDVBDemux *demux, int dev)
+       :m_demux(demux), m_dev(dev), m_is_slow_motion(0), m_is_fast_forward(0), m_is_freezed(0)

 {
        char filename[128];
 #if HAVE_DVB_API_VERSION < 3
        sprintf(filename, "/dev/dvb/card%d/video%d", demux->adapter, dev);
 {
        char filename[128];
 #if HAVE_DVB_API_VERSION < 3
        sprintf(filename, "/dev/dvb/card%d/video%d", demux->adapter, dev);

+       m_fd_video = ::open("/dev/video", O_RDWR);
+       if (m_fd_video < 0)
+               eWarning("/dev/video: %m");

 #else
        sprintf(filename, "/dev/dvb/adapter%d/video%d", demux->adapter, dev);
 #endif
        m_fd = ::open(filename, O_RDWR);
        if (m_fd < 0)
                eWarning("%s: %m", filename);
 #else
        sprintf(filename, "/dev/dvb/adapter%d/video%d", demux->adapter, dev);
 #endif
        m_fd = ::open(filename, O_RDWR);
        if (m_fd < 0)
                eWarning("%s: %m", filename);

+       else
+       {
+               m_sn = new eSocketNotifier(eApp, m_fd, eSocketNotifier::Priority);
+               CONNECT(m_sn->activated, eDVBVideo::video_event);
+       }
+       eDebug("Video Device: %s", filename);

 #if HAVE_DVB_API_VERSION < 3
        sprintf(filename, "/dev/dvb/card%d/demux%d", demux->adapter, demux->demux);
 #else
 #if HAVE_DVB_API_VERSION < 3
        sprintf(filename, "/dev/dvb/card%d/demux%d", demux->adapter, demux->demux);
 #else


@@ -161,10 +328,16 @@ eDVBVideo::eDVBVideo(eDVBDemux *demux, int dev): m_demux(demux)
        m_fd_demux = ::open(filename, O_RDWR);
        if (m_fd_demux < 0)
                eWarning("%s: %m", filename);
        m_fd_demux = ::open(filename, O_RDWR);
        if (m_fd_demux < 0)
                eWarning("%s: %m", filename);

+       eDebug("demux device: %s", filename);

 }
 }

-       
-int eDVBVideo::startPid(int pid)
-{      
+
+// not finally values i think.. !!
+#define VIDEO_STREAMTYPE_MPEG2 0
+#define VIDEO_STREAMTYPE_MPEG4_H264 1
+
+#if HAVE_DVB_API_VERSION < 3
+int eDVBVideo::setPid(int pid)
+{

        if ((m_fd < 0) || (m_fd_demux < 0))
                return -1;
        dmx_pes_filter_params pes;
        if ((m_fd < 0) || (m_fd_demux < 0))
                return -1;
        dmx_pes_filter_params pes;


@@ -172,65 +345,237 @@ int eDVBVideo::startPid(int pid)
        pes.pid      = pid;
        pes.input    = DMX_IN_FRONTEND;
        pes.output   = DMX_OUT_DECODER;
        pes.pid      = pid;
        pes.input    = DMX_IN_FRONTEND;
        pes.output   = DMX_OUT_DECODER;

-       pes.pes_type = DMX_PES_VIDEO;
+       pes.pes_type = m_dev ? DMX_PES_VIDEO1 : DMX_PES_VIDEO0; /* FIXME */

        pes.flags    = 0;
        pes.flags    = 0;

+       eDebugNoNewLine("DMX_SET_PES_FILTER(0x%02x) - video - ", pid);

        if (::ioctl(m_fd_demux, DMX_SET_PES_FILTER, &pes) < 0)
        {
        if (::ioctl(m_fd_demux, DMX_SET_PES_FILTER, &pes) < 0)
        {

-               eWarning("video: DMX_SET_PES_FILTER: %m");
+               eDebug("failed (%m)");

                return -errno;
        }
                return -errno;
        }

+       eDebug("ok");
+       return 0;
+}
+
+int eDVBVideo::startPid()
+{
+       eDebugNoNewLine("DEMUX_START - video - ");

        if (::ioctl(m_fd_demux, DMX_START) < 0)
        {
        if (::ioctl(m_fd_demux, DMX_START) < 0)
        {

-               eWarning("video: DMX_START: %m");
+               eDebug("failed (%m)");

                return -errno;
        }
                return -errno;
        }

+       eDebug("ok");
+       return 0;
+}
+
+int eDVBVideo::start()
+{
+       eDebugNoNewLine("VIDEO_PLAY - ");

        if (::ioctl(m_fd, VIDEO_PLAY) < 0)
        if (::ioctl(m_fd, VIDEO_PLAY) < 0)

-               eWarning("video: VIDEO_PLAY: %m");
+       {
+               eDebug("failed (%m)");
+               return -errno;
+       }
+       eDebug("ok");

        return 0;
 }
        return 0;
 }

-       
-void eDVBVideo::stop()
+
+int eDVBVideo::stopPid()

 {
 {

-       if (::ioctl(m_fd, VIDEO_STOP, 1) < 0)
-               eWarning("video: VIDEO_STOP: %m");
-#if HAVE_DVB_API_VERSION > 2
+       eDebugNoNewLine("DEMUX_STOP - video - ");

        if (::ioctl(m_fd_demux, DMX_STOP) < 0)
        if (::ioctl(m_fd_demux, DMX_STOP) < 0)

-               eWarning("video: DMX_STOP: %m");
-#endif
+       {
+               eDebug("failed (%m)");
+               return -errno;
+       }
+       eDebug("ok");
+       return 0;

 }
 }

+#else
+int eDVBVideo::startPid(int pid, int type)
+{
+       if ((m_fd < 0) || (m_fd_demux < 0))
+               return -1;
+       dmx_pes_filter_params pes;

 
 

-#if HAVE_DVB_API_VERSION < 3
-void eDVBVideo::stopPid()
+       eDebugNoNewLine("VIDEO_SET_STREAMTYPE %d - ",type == MPEG4_H264 ? VIDEO_STREAMTYPE_MPEG4_H264 : VIDEO_STREAMTYPE_MPEG2);
+       if (::ioctl(m_fd, VIDEO_SET_STREAMTYPE,
+               type == MPEG4_H264 ? VIDEO_STREAMTYPE_MPEG4_H264 : VIDEO_STREAMTYPE_MPEG2) < 0)
+               eDebug("failed (%m)");
+       else
+               eDebug("ok");
+
+       pes.pid      = pid;
+       pes.input    = DMX_IN_FRONTEND;
+       pes.output   = DMX_OUT_DECODER;
+       pes.pes_type = m_dev ? DMX_PES_VIDEO1 : DMX_PES_VIDEO0; /* FIXME */
+       pes.flags    = 0;
+       eDebugNoNewLine("DMX_SET_PES_FILTER(0x%02x) - video - ", pid);
+       if (::ioctl(m_fd_demux, DMX_SET_PES_FILTER, &pes) < 0)
+       {
+               eDebug("failed (%m)");
+               return -errno;
+       }
+       eDebug("ok");
+       eDebugNoNewLine("DEMUX_START - video - ");
+       if (::ioctl(m_fd_demux, DMX_START) < 0)
+       {
+               eDebug("failed (%m)");
+               return -errno;
+       }
+       eDebug("ok");
+       freeze();
+       eDebugNoNewLine("VIDEO_PLAY - ");
+       if (::ioctl(m_fd, VIDEO_PLAY) < 0)
+               eDebug("failed (%m)");
+       else
+               eDebug("ok");
+       return 0;
+}
+#endif
+
+void eDVBVideo::stop()

 {
 {

+#if HAVE_DVB_API_VERSION > 2
+       eDebugNoNewLine("DEMUX_STOP - video - ");

        if (::ioctl(m_fd_demux, DMX_STOP) < 0)
        if (::ioctl(m_fd_demux, DMX_STOP) < 0)

-               eWarning("video: DMX_STOP: %m");
-}
+               eDebug("failed (%m)");
+       else
+               eDebug("ok");

 #endif
 #endif

+       eDebugNoNewLine("VIDEO_STOP - ");
+       if (::ioctl(m_fd, VIDEO_STOP, 1) < 0)
+               eDebug("failed (%m)");
+       else
+               eDebug("ok");
+}

 
 void eDVBVideo::flush()
 {
 
 void eDVBVideo::flush()
 {

+       eDebugNoNewLine("VIDEO_CLEAR_BUFFER - ");

        if (::ioctl(m_fd, VIDEO_CLEAR_BUFFER) < 0)
        if (::ioctl(m_fd, VIDEO_CLEAR_BUFFER) < 0)

-               eDebug("video: VIDEO_CLEAR_BUFFER: %m");
+               eDebug("failed (%m)");
+       else
+               eDebug("ok");

 }
 }

-       
+

 void eDVBVideo::freeze()
 {
 void eDVBVideo::freeze()
 {

-       if (::ioctl(m_fd, VIDEO_FREEZE) < 0)
-               eDebug("video: VIDEO_FREEZE: %m");
+       if (!m_is_freezed)
+       {
+               eDebugNoNewLine("VIDEO_FREEZE - ");
+               if (::ioctl(m_fd, VIDEO_FREEZE) < 0)
+                       eDebug("failed (%m)");
+               else
+                       eDebug("ok");
+               m_is_freezed=1;
+       }

 }
 }

-       
+

 void eDVBVideo::unfreeze()
 {
 void eDVBVideo::unfreeze()
 {

-       if (::ioctl(m_fd, VIDEO_CONTINUE) < 0)
-               eDebug("video: VIDEO_CONTINUE: %m");
+       if (m_is_freezed)
+       {
+               eDebugNoNewLine("VIDEO_CONTINUE - ");
+               if (::ioctl(m_fd, VIDEO_CONTINUE) < 0)
+                       eDebug("failed (%m)");
+               else
+                       eDebug("ok");
+               m_is_freezed=0;
+       }
+}
+
+int eDVBVideo::setSlowMotion(int repeat)
+{
+       eDebugNoNewLine("VIDEO_SLOWMOTION - ");
+       m_is_slow_motion = repeat;
+       int ret = ::ioctl(m_fd, VIDEO_SLOWMOTION, repeat);
+       if (ret < 0)
+               eDebug("failed(%m)");
+       else
+               eDebug("ok");
+       return ret;
+}
+
+int eDVBVideo::setFastForward(int skip)
+{
+       eDebugNoNewLine("VIDEO_FAST_FORWARD - ");
+       m_is_fast_forward = skip;
+       int ret = ::ioctl(m_fd, VIDEO_FAST_FORWARD, skip);
+       if (ret < 0)
+               eDebug("failed(%m)");
+       else
+               eDebug("ok");
+       return ret;
+}
+
+int eDVBVideo::getPTS(pts_t &now)
+{
+#if HAVE_DVB_API_VERSION < 3
+       #define VIDEO_GET_PTS_OLD           _IOR('o', 1, unsigned int*)
+       unsigned int pts;
+       int ret = ::ioctl(m_fd_video, VIDEO_GET_PTS_OLD, &pts);
+       now = pts;
+       now *= 2;
+#else
+       int ret = ::ioctl(m_fd, VIDEO_GET_PTS, &now);
+#endif
+       if (ret < 0)
+               eDebug("VIDEO_GET_PTS failed(%m)");
+       return ret;

 }
 }

-       
+

 eDVBVideo::~eDVBVideo()
 {
 eDVBVideo::~eDVBVideo()
 {

+       if (m_sn)
+               delete m_sn;
+       if (m_is_slow_motion)
+               setSlowMotion(0);
+       if (m_is_fast_forward)
+               setFastForward(0);
+       unfreeze();

        if (m_fd >= 0)
                ::close(m_fd);
        if (m_fd_demux >= 0)
                ::close(m_fd_demux);
        if (m_fd >= 0)
                ::close(m_fd);
        if (m_fd_demux >= 0)
                ::close(m_fd_demux);

+#if HAVE_DVB_API_VERSION < 3
+       if (m_fd_video >= 0)
+               ::close(m_fd_video);
+#endif
+}
+
+void eDVBVideo::video_event(int)
+{
+#if HAVE_DVB_API_VERSION >= 3
+       struct video_event evt;
+       eDebugNoNewLine("VIDEO_GET_EVENT - ");
+       if (::ioctl(m_fd, VIDEO_GET_EVENT, &evt) < 0)
+               eDebug("failed (%m)");
+       else
+       {
+               eDebug("ok");
+               if (evt.type == VIDEO_EVENT_SIZE_CHANGED)
+               {
+                       struct iTSMPEGDecoder::videoEvent event;
+                       event.type = iTSMPEGDecoder::videoEvent::eventSizeChanged;
+                       event.aspect = evt.u.size.aspect_ratio;
+                       event.height = evt.u.size.h;
+                       event.width = evt.u.size.w;
+                       /* emit */ m_event(event);
+               }
+               else
+                       eDebug("unhandled DVBAPI Video Event %d", evt.type);
+       }
+#else
+#warning "FIXMEE!! Video Events not implemented for old api"
+#endif
+}
+
+RESULT eDVBVideo::connectEvent(const Slot1<void, struct iTSMPEGDecoder::videoEvent> &event, ePtr<eConnection> &conn)
+{
+       conn = new eConnection(this, m_event.connect(event));
+       return 0;

 }
 
 DEFINE_REF(eDVBPCR);
 }
 
 DEFINE_REF(eDVBPCR);


@@ -248,6 +593,43 @@ eDVBPCR::eDVBPCR(eDVBDemux *demux): m_demux(demux)
                eWarning("%s: %m", filename);
 }
 
                eWarning("%s: %m", filename);
 }
 

+#if HAVE_DVB_API_VERSION < 3
+int eDVBPCR::setPid(int pid)
+{
+       if (m_fd_demux < 0)
+               return -1;
+       dmx_pes_filter_params pes;
+
+       pes.pid      = pid;
+       pes.input    = DMX_IN_FRONTEND;
+       pes.output   = DMX_OUT_DECODER;
+       pes.pes_type = DMX_PES_PCR;
+       pes.flags    = 0;
+
+       eDebugNoNewLine("DMX_SET_PES_FILTER(0x%02x) - pcr - ", pid);
+       if (::ioctl(m_fd_demux, DMX_SET_PES_FILTER, &pes) < 0)
+       {
+               eDebug("failed (%m)");
+               return -errno;
+       }
+       eDebug("ok");
+       return 0;
+}
+
+int eDVBPCR::startPid()
+{
+       if (m_fd_demux < 0)
+               return -1;
+       eDebugNoNewLine("DEMUX_START - pcr - ");
+       if (::ioctl(m_fd_demux, DMX_START) < 0)
+       {
+               eDebug("failed (%m)");
+               return -errno;
+       }
+       eDebug("ok");
+       return 0;
+}
+#else

 int eDVBPCR::startPid(int pid)
 {
        if (m_fd_demux < 0)
 int eDVBPCR::startPid(int pid)
 {
        if (m_fd_demux < 0)


@@ -259,23 +641,31 @@ int eDVBPCR::startPid(int pid)
        pes.output   = DMX_OUT_DECODER;
        pes.pes_type = DMX_PES_PCR;
        pes.flags    = 0;
        pes.output   = DMX_OUT_DECODER;
        pes.pes_type = DMX_PES_PCR;
        pes.flags    = 0;

+       eDebugNoNewLine("DMX_SET_PES_FILTER(0x%02x) - pcr - ", pid);

        if (::ioctl(m_fd_demux, DMX_SET_PES_FILTER, &pes) < 0)
        {
        if (::ioctl(m_fd_demux, DMX_SET_PES_FILTER, &pes) < 0)
        {

-               eWarning("video: DMX_SET_PES_FILTER: %m");
+               eDebug("failed (%m)");

                return -errno;
        }
                return -errno;
        }

+       eDebug("ok");
+       eDebugNoNewLine("DEMUX_START - pcr - ");

        if (::ioctl(m_fd_demux, DMX_START) < 0)
        {
        if (::ioctl(m_fd_demux, DMX_START) < 0)
        {

-               eWarning("video: DMX_START: %m");
+               eDebug("failed (%m)");

                return -errno;
        }
                return -errno;
        }

+       eDebug("ok");

        return 0;
 }
        return 0;
 }

+#endif

 
 void eDVBPCR::stop()
 {
 
 void eDVBPCR::stop()
 {

+       eDebugNoNewLine("DEMUX_STOP - pcr - ");

        if (::ioctl(m_fd_demux, DMX_STOP) < 0)
        if (::ioctl(m_fd_demux, DMX_STOP) < 0)

-               eWarning("video: DMX_STOP: %m");
+               eDebug("failed(%m)");
+       else
+               eDebug("ok");

 }
 
 eDVBPCR::~eDVBPCR()
 }
 
 eDVBPCR::~eDVBPCR()


@@ -284,12 +674,83 @@ eDVBPCR::~eDVBPCR()
                ::close(m_fd_demux);
 }
 
                ::close(m_fd_demux);
 }
 

+DEFINE_REF(eDVBTText);
+
+eDVBTText::eDVBTText(eDVBDemux *demux): m_demux(demux)
+{
+       char filename[128];
+#if HAVE_DVB_API_VERSION < 3
+       sprintf(filename, "/dev/dvb/card%d/demux%d", demux->adapter, demux->demux);
+#else
+       sprintf(filename, "/dev/dvb/adapter%d/demux%d", demux->adapter, demux->demux);
+#endif
+       m_fd_demux = ::open(filename, O_RDWR);
+       if (m_fd_demux < 0)
+               eWarning("%s: %m", filename);
+}
+
+int eDVBTText::startPid(int pid)
+{
+       if (m_fd_demux < 0)
+               return -1;
+       dmx_pes_filter_params pes;
+
+       pes.pid      = pid;
+       pes.input    = DMX_IN_FRONTEND;
+       pes.output   = DMX_OUT_DECODER;
+       pes.pes_type = DMX_PES_TELETEXT;
+       pes.flags    = 0;
+
+       eDebugNoNewLine("DMX_SET_PES_FILTER(0x%02x) - ttx - ", pid);
+       if (::ioctl(m_fd_demux, DMX_SET_PES_FILTER, &pes) < 0)
+       {
+               eDebug("failed(%m)");
+               return -errno;
+       }
+       eDebug("ok");
+       eDebugNoNewLine("DEMUX_START - pcr - ");
+       if (::ioctl(m_fd_demux, DMX_START) < 0)
+       {
+               eDebug("failed(%m)");
+               return -errno;
+       }
+       eDebug("ok");
+       return 0;
+}
+
+void eDVBTText::stop()
+{
+       eDebugNoNewLine("DEMUX_STOP - ttx - ");
+       if (::ioctl(m_fd_demux, DMX_STOP) < 0)
+               eDebug("failed(%m)");
+       else
+               eDebug("ok");
+}
+
+eDVBTText::~eDVBTText()
+{
+       if (m_fd_demux >= 0)
+               ::close(m_fd_demux);
+}
+

 DEFINE_REF(eTSMPEGDecoder);
 
 int eTSMPEGDecoder::setState()
 {
        int res = 0;
 DEFINE_REF(eTSMPEGDecoder);
 
 int eTSMPEGDecoder::setState()
 {
        int res = 0;

+
+       int noaudio = m_is_sm || m_is_ff || m_is_trickmode;
+       int nott = noaudio; /* actually same conditions */
+
+       if ((noaudio && m_audio) || (!m_audio && !noaudio))
+               m_changed |= changeAudio;
+
+       if ((nott && m_text) || (!m_text && !nott))
+               m_changed |= changeText;
+
+       bool changed = !!m_changed;

 #if HAVE_DVB_API_VERSION < 3
 #if HAVE_DVB_API_VERSION < 3

+       bool checkAVSync = m_changed & (changeAudio|changeVideo|changePCR);

        if (m_changed & changeAudio && m_audio)
                m_audio->stopPid();
        if (m_changed & changeVideo && m_video)
        if (m_changed & changeAudio && m_audio)
                m_audio->stopPid();
        if (m_changed & changeVideo && m_video)


@@ -298,64 +759,67 @@ int eTSMPEGDecoder::setState()
        {
                m_pcr->stop();
                m_pcr=0;
        {
                m_pcr->stop();
                m_pcr=0;

+               if (!(m_pcrpid >= 0 && m_pcrpid < 0x1ff))
+                       m_changed &= ~changePCR;

        }
        if (m_changed & changeAudio && m_audio)
        {
                m_audio->stop();
                m_audio=0;
        }
        if (m_changed & changeAudio && m_audio)
        {
                m_audio->stop();
                m_audio=0;

+               if (!(m_apid >= 0 && m_apid < 0x1ff))
+                       m_changed &= ~changeAudio;

        }
        if (m_changed & changeVideo && m_video)
        {
                m_video->stop();
                m_video=0;
        }
        if (m_changed & changeVideo && m_video)
        {
                m_video->stop();
                m_video=0;

+               m_video_event_conn=0;
+               if (!(m_vpid >= 0 && m_vpid < 0x1ff))
+                       m_changed &= ~changeVideo;
+       }
+       if (m_changed & changeVideo)
+       {
+               m_video = new eDVBVideo(m_demux, m_decoder);
+               m_video->connectEvent(slot(*this, &eTSMPEGDecoder::video_event), m_video_event_conn);
+               if (m_video->setPid(m_vpid))
+                       res -1;

        }
        if (m_changed & changePCR)
        {
                m_pcr = new eDVBPCR(m_demux);
        }
        if (m_changed & changePCR)
        {
                m_pcr = new eDVBPCR(m_demux);

-               if (m_pcr->startPid(m_pcrpid))
-               {
-                       eWarning("pcr: startpid failed!");
+               if (m_pcr->setPid(m_pcrpid))
+                       res = -1;
+       }
+       if (m_changed & changeAudio)
+       {
+               m_audio = new eDVBAudio(m_demux, m_decoder);
+               if (m_audio->setPid(m_apid, m_atype))
+                       res = -1;
+       }
+       if (m_changed & changePCR)
+       {
+               if (m_pcr->startPid())

                        res = -1;
                        res = -1;

-               }

                m_changed &= ~changePCR;
        }
                m_changed &= ~changePCR;
        }

+       else if (checkAVSync && m_audio && m_video)
+       {
+               if (m_audio->setAVSync(1))
+                       res = -1;
+       }

        if (m_changed & changeVideo)
        {
        if (m_changed & changeVideo)
        {

-               m_video = new eDVBVideo(m_demux, 0);
-               if (m_video->startPid(m_vpid))
-               {
-                       eWarning("video: startpid failed!");
+               if (m_video->startPid() || m_video->start())

                        res = -1;
                        res = -1;

-               }

                m_changed &= ~changeVideo;
        }
        if (m_changed & changeAudio)
        {
                m_changed &= ~changeVideo;
        }
        if (m_changed & changeAudio)
        {

-               m_audio = new eDVBAudio(m_demux, 0);
-               if (m_audio->startPid(m_apid, m_atype))
-               {
-                       eWarning("audio: startpid failed!");
+               if (m_audio->start() || m_audio->startPid())

                        res = -1;
                        res = -1;

-               }

                m_changed &= ~changeAudio;
        }
 #else
                m_changed &= ~changeAudio;
        }
 #else

-       if (m_changed & changeVideo)
-       {
-               if (m_video)
-                       m_video->stop();
-               m_video = 0;
-               if ((m_vpid >= 0) && (m_vpid < 0x1FFF))
-               {
-                       m_video = new eDVBVideo(m_demux, 0);
-                       if (m_video->startPid(m_vpid))
-                       {
-                               eWarning("video: startpid failed!");
-                               res = -1;
-                       }
-               }
-               m_changed &= ~changeVideo;
-       }

        if (m_changed & changePCR)
        {
                if (m_pcr)
        if (m_changed & changePCR)
        {
                if (m_pcr)


@@ -365,51 +829,116 @@ int eTSMPEGDecoder::setState()
                {
                        m_pcr = new eDVBPCR(m_demux);
                        if (m_pcr->startPid(m_pcrpid))
                {
                        m_pcr = new eDVBPCR(m_demux);
                        if (m_pcr->startPid(m_pcrpid))

-                       {
-                               eWarning("pcr: startpid failed!");

                                res = -1;
                                res = -1;

-                       }

                }
                m_changed &= ~changePCR;
        }
                }
                m_changed &= ~changePCR;
        }

+       if (m_changed & changeVideo)
+       {
+               eDebug("VIDEO CHANGED (to %04x)", m_vpid);
+               if (m_video)
+               {
+                       m_video->stop();
+                       m_video = 0;
+                       m_video_event_conn = 0;
+               }
+               if ((m_vpid >= 0) && (m_vpid < 0x1FFF))
+               {
+                       m_video = new eDVBVideo(m_demux, m_decoder);
+                       m_video->connectEvent(slot(*this, &eTSMPEGDecoder::video_event), m_video_event_conn);
+                       if (m_video->startPid(m_vpid, m_vtype))
+                               res = -1;
+               }
+               m_changed &= ~changeVideo;
+       }

        if (m_changed & changeAudio)
        {
                if (m_audio)
                        m_audio->stop();
                m_audio = 0;
        if (m_changed & changeAudio)
        {
                if (m_audio)
                        m_audio->stop();
                m_audio = 0;

-               if ((m_apid >= 0) && (m_apid < 0x1FFF))
+               if ((m_apid >= 0) && (m_apid < 0x1FFF) && !noaudio)

                {
                {

-                       m_audio = new eDVBAudio(m_demux, 0);
+                       m_audio = new eDVBAudio(m_demux, m_decoder);

                        if (m_audio->startPid(m_apid, m_atype))
                        if (m_audio->startPid(m_apid, m_atype))

-                       {
-                               eWarning("audio: startpid failed!");

                                res = -1;
                                res = -1;

-                       }

                }
                m_changed &= ~changeAudio;
        }
                }
                m_changed &= ~changeAudio;
        }

+       if (m_changed & changeText)
+       {
+               if (m_text)
+                       m_text->stop();
+               m_text = 0;
+               if ((m_textpid >= 0) && (m_textpid < 0x1FFF) && !nott)
+               {
+                       m_text = new eDVBTText(m_demux);
+                       if (m_text->startPid(m_textpid))
+                               res = -1;
+               }
+               m_changed &= ~changeText;
+       }

 #endif
 #endif

+       if (changed && !m_video && m_audio && m_radio_pic.length())
+               showSinglePic(m_radio_pic.c_str());
+

        return res;
 }
 
        return res;
 }
 

-eTSMPEGDecoder::eTSMPEGDecoder(eDVBDemux *demux, int decoder): m_demux(demux), m_changed(0)
+int eTSMPEGDecoder::m_pcm_delay=-1,
+       eTSMPEGDecoder::m_ac3_delay=-1;
+
+RESULT eTSMPEGDecoder::setPCMDelay(int delay)

 {
 {

-       demux->connectEvent(slot(*this, &eTSMPEGDecoder::demux_event), m_demux_event);
+       if (m_decoder == 0 && delay != m_pcm_delay )
+       {
+               FILE *fp = fopen("/proc/stb/audio/audio_delay_pcm", "w");
+               if (fp)
+               {
+                       fprintf(fp, "%x", delay*90);
+                       fclose(fp);
+                       m_pcm_delay = delay;
+                       return 0;
+               }
+       }
+       return -1;
+}
+
+RESULT eTSMPEGDecoder::setAC3Delay(int delay)
+{
+       if ( m_decoder == 0 && delay != m_ac3_delay )
+       {
+               FILE *fp = fopen("/proc/stb/audio/audio_delay_bitstream", "w");
+               if (fp)
+               {
+                       fprintf(fp, "%x", delay*90);
+                       fclose(fp);
+                       m_ac3_delay = delay;
+                       return 0;
+               }
+       }
+       return -1;
+}
+
+eTSMPEGDecoder::eTSMPEGDecoder(eDVBDemux *demux, int decoder): m_demux(demux), m_changed(0), m_decoder(decoder)
+{
+       demux->connectEvent(slot(*this, &eTSMPEGDecoder::demux_event), m_demux_event_conn);
+       m_is_ff = m_is_sm = m_is_trickmode = 0;

 }
 
 eTSMPEGDecoder::~eTSMPEGDecoder()
 {
 }
 
 eTSMPEGDecoder::~eTSMPEGDecoder()
 {

-       m_vpid = m_apid = m_pcrpid = pidNone;
+       m_vpid = m_apid = m_pcrpid = m_textpid = pidNone;

        m_changed = -1;
        setState();
 }
 
        m_changed = -1;
        setState();
 }
 

-RESULT eTSMPEGDecoder::setVideoPID(int vpid)
+RESULT eTSMPEGDecoder::setVideoPID(int vpid, int type)

 {
        if (m_vpid != vpid)
        {
                m_changed |= changeVideo;
                m_vpid = vpid;
 {
        if (m_vpid != vpid)
        {
                m_changed |= changeVideo;
                m_vpid = vpid;

+               m_vtype = type;

        }
        return 0;
 }
        }
        return 0;
 }


@@ -425,6 +954,30 @@ RESULT eTSMPEGDecoder::setAudioPID(int apid, int type)
        return 0;
 }
 
        return 0;
 }
 

+int eTSMPEGDecoder::m_audio_channel = -1;
+
+RESULT eTSMPEGDecoder::setAudioChannel(int channel)
+{
+       if (channel == -1)
+               channel = ac_stereo;
+       if (m_decoder == 0 && m_audio_channel != channel)
+       {
+               if (m_audio)
+               {
+                       m_audio->setChannel(channel);
+                       m_audio_channel=channel;
+               }
+               else
+                       eDebug("eTSMPEGDecoder::setAudioChannel but no audio decoder exist");
+       }
+       return 0;
+}
+
+int eTSMPEGDecoder::getAudioChannel()
+{
+       return m_audio_channel == -1 ? ac_stereo : m_audio_channel;
+}
+

 RESULT eTSMPEGDecoder::setSyncPCR(int pcrpid)
 {
        if (m_pcrpid != pcrpid)
 RESULT eTSMPEGDecoder::setSyncPCR(int pcrpid)
 {
        if (m_pcrpid != pcrpid)


@@ -435,12 +988,32 @@ RESULT eTSMPEGDecoder::setSyncPCR(int pcrpid)
        return 0;
 }
 
        return 0;
 }
 

+RESULT eTSMPEGDecoder::setTextPID(int textpid)
+{
+       if (m_textpid != textpid)
+       {
+               m_changed |= changeText;
+               m_textpid = textpid;
+       }
+       return 0;
+}
+

 RESULT eTSMPEGDecoder::setSyncMaster(int who)
 {
        return -1;
 }
 
 RESULT eTSMPEGDecoder::start()
 RESULT eTSMPEGDecoder::setSyncMaster(int who)
 {
        return -1;
 }
 
 RESULT eTSMPEGDecoder::start()

+{
+       RESULT r;
+       r = setState();
+       if (r)
+               return r;
+       return unfreeze();
+}
+
+       /* preroll is start in freezed mode. */
+RESULT eTSMPEGDecoder::preroll()

 {
        return setState();
 }
 {
        return setState();
 }


@@ -452,7 +1025,7 @@ RESULT eTSMPEGDecoder::freeze(int cont)
 
        if (m_audio)
                m_audio->freeze();
 
        if (m_audio)
                m_audio->freeze();

-       
+

        return 0;
 }
 
        return 0;
 }
 


@@ -463,7 +1036,7 @@ RESULT eTSMPEGDecoder::unfreeze()
 
        if (m_audio)
                m_audio->unfreeze();
 
        if (m_audio)
                m_audio->unfreeze();

-       
+

        return 0;
 }
 
        return 0;
 }
 


@@ -477,9 +1050,28 @@ RESULT eTSMPEGDecoder::setPictureSkipMode(int what)
        return -1;
 }
 
        return -1;
 }
 

+RESULT eTSMPEGDecoder::setFastForward(int frames_to_skip)
+{
+       m_is_ff = frames_to_skip != 0;
+
+       setState();
+
+       if (m_video)
+               return m_video->setFastForward(frames_to_skip);
+       else
+               return -1;
+}
+

 RESULT eTSMPEGDecoder::setSlowMotion(int repeat)
 {
 RESULT eTSMPEGDecoder::setSlowMotion(int repeat)
 {

-       return -1;
+       m_is_sm = repeat != 0;
+
+       setState();
+
+       if (m_video)
+               return m_video->setSlowMotion(repeat);
+       else
+               return -1;

 }
 
 RESULT eTSMPEGDecoder::setZoom(int what)
 }
 
 RESULT eTSMPEGDecoder::setZoom(int what)


@@ -507,3 +1099,125 @@ void eTSMPEGDecoder::demux_event(int event)
                break;
        }
 }
                break;
        }
 }

+
+RESULT eTSMPEGDecoder::setTrickmode(int what)
+{
+       m_is_trickmode = what;
+       setState();
+       return 0;
+}
+
+RESULT eTSMPEGDecoder::getPTS(int what, pts_t &pts)
+{
+       if (what == 0) /* auto */
+               what = m_video ? 1 : 2;
+
+       if (what == 1) /* video */
+       {
+               if (m_video)
+                       return m_video->getPTS(pts);
+               else
+                       return -1;
+       }
+
+       if (what == 2) /* audio */
+       {
+               if (m_audio)
+                       return m_audio->getPTS(pts);
+               else
+                       return -1;
+       }
+
+       return -1;
+}
+
+RESULT eTSMPEGDecoder::setRadioPic(const std::string &filename)
+{
+       m_radio_pic = filename;
+       return 0;
+}
+
+RESULT eTSMPEGDecoder::showSinglePic(const char *filename)
+{
+       if (m_decoder == 0)
+       {
+               FILE *f = fopen(filename, "r");
+               if (f)
+               {
+                       int vfd = open("/dev/dvb/adapter0/video0", O_RDWR);
+                       if (vfd > 0)
+                       {
+                               fseek(f, 0, SEEK_END);
+                               int length = ftell(f);
+                               unsigned char *buffer = new unsigned char[length*2+9];
+                               if (ioctl(vfd, VIDEO_FAST_FORWARD, 1) < 0)
+                                       eDebug("VIDEO_FAST_FORWARD failed (%m)");
+                               if (ioctl(vfd, VIDEO_SELECT_SOURCE, VIDEO_SOURCE_MEMORY) < 0)
+                                       eDebug("VIDEO_SELECT_SOURCE MEMORY failed (%m)");
+                               if (ioctl(vfd, VIDEO_PLAY) < 0)
+                                       eDebug("VIDEO_PLAY failed (%m)");
+                               if (::ioctl(vfd, VIDEO_CONTINUE) < 0)
+                                       eDebug("video: VIDEO_CONTINUE: %m");
+                               int cnt=0;
+                               int pos=0;
+                               while(cnt<2)
+                               {
+                                       int rd;
+                                       fseek(f, 0, SEEK_SET);
+                                       if (!cnt)
+                                       {
+                                               buffer[pos++]=0;
+                                               buffer[pos++]=0;
+                                               buffer[pos++]=1;
+                                               buffer[pos++]=0xE0;
+                                               buffer[pos++]=(length*2)>>8;
+                                               buffer[pos++]=(length*2)&0xFF;
+                                               buffer[pos++]=0x80;
+                                               buffer[pos++]=0;
+                                               buffer[pos++]=0;
+                                       }
+                                       while(1)
+                                       {
+                                               rd = fread(buffer+pos, 1, length, f);
+                                               if (rd > 0)
+                                                       pos += rd;
+                                               else
+                                                       break;
+                                       }
+                                       ++cnt;
+                               }
+                               write(vfd, buffer, pos);
+                               usleep(75000);  // i dont like this.. but i dont have a better solution :(
+                               if (ioctl(vfd, VIDEO_SELECT_SOURCE, VIDEO_SOURCE_DEMUX) < 0)
+                                       eDebug("VIDEO_SELECT_SOURCE DEMUX failed (%m)");
+                               if (ioctl(vfd, VIDEO_FAST_FORWARD, 0) < 0)
+                                       eDebug("VIDEO_FAST_FORWARD failed (%m)");
+                               close(vfd);
+                               delete [] buffer;
+                       }
+                       fclose(f);
+               }
+               else
+               {
+                       eDebug("couldnt open %s", filename);
+                       return -1;
+               }
+       }
+       else
+       {
+               eDebug("only show single pics on first decoder");
+               return -1;
+       }
+       return 0;
+}
+
+RESULT eTSMPEGDecoder::connectVideoEvent(const Slot1<void, struct videoEvent> &event, ePtr<eConnection> &conn)
+{
+       conn = new eConnection(this, m_video_event.connect(event));
+       return 0;
+}
+
+void eTSMPEGDecoder::video_event(struct videoEvent event)
+{
+       /* emit */ m_video_event(event);
+}