replace assert by ASSERT, so a proper log message is generated

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

diff --git a/lib/dvb/demux.cpp b/lib/dvb/demux.cpp
index f6bdbd7b5602cf9766786cd2c35598504a1ef6e8..11465186c35a447594e70935560e2275d9b3e5cd 100644 (file)
--- a/lib/dvb/demux.cpp
+++ b/lib/dvb/demux.cpp
@@ -1,4 +1,3 @@
-#include <config.h>

 #include <stdio.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
 #include <stdio.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>


@@ -6,24 +5,57 @@
 #include <unistd.h>
 #include <signal.h>
 
 #include <unistd.h>
 #include <signal.h>
 

-#include <lib/base/thread.h>
+// #define FUZZING 1
+
+#if FUZZING
+               /* change every 1:FUZZING_PROPABILITY byte */
+#define FUZZING_PROPABILITY 100
+#endif

 
 #if HAVE_DVB_API_VERSION < 3
 #include <ost/dmx.h>
 
 #if HAVE_DVB_API_VERSION < 3
 #include <ost/dmx.h>

+

 #ifndef DMX_SET_NEGFILTER_MASK
        #define DMX_SET_NEGFILTER_MASK   _IOW('o',48,uint8_t *)
 #endif
 #ifndef DMX_SET_NEGFILTER_MASK
        #define DMX_SET_NEGFILTER_MASK   _IOW('o',48,uint8_t *)
 #endif

+
+#ifndef DMX_GET_STC
+       struct dmx_stc
+       {
+               unsigned int num;       /* input : which STC? O..N */
+               unsigned int base;      /* output: divisor for stc to get 90 kHz clock */
+               unsigned long long stc; /* output: src in 'base'*90 kHz units */
+       };
+       #define DMX_GET_STC             _IOR('o', 50, struct dmx_stc)
+#endif
+

 #else
 #include <linux/dvb/dmx.h>
 #else
 #include <linux/dvb/dmx.h>

+
+#define HAVE_ADD_PID
+
+#ifdef HAVE_ADD_PID
+#define DMX_ADD_PID              _IO('o', 51)
+#define DMX_REMOVE_PID           _IO('o', 52)
+
+typedef enum {
+       DMX_TAP_TS = 0,
+       DMX_TAP_PES = DMX_PES_OTHER, /* for backward binary compat. */
+} dmx_tap_type_t;
+
+#endif
+

 #endif
 
 #include "crc32.h"
 
 #include <lib/base/eerror.h>
 #endif
 
 #include "crc32.h"
 
 #include <lib/base/eerror.h>

+#include <lib/base/filepush.h>

 #include <lib/dvb/idvb.h>
 #include <lib/dvb/demux.h>
 #include <lib/dvb/esection.h>
 #include <lib/dvb/decoder.h>
 #include <lib/dvb/idvb.h>
 #include <lib/dvb/demux.h>
 #include <lib/dvb/esection.h>
 #include <lib/dvb/decoder.h>

+#include <lib/dvb/pvrparse.h>

 
 eDVBDemux::eDVBDemux(int adapter, int demux): adapter(adapter), demux(demux)
 {
 
 eDVBDemux::eDVBDemux(int adapter, int demux): adapter(adapter), demux(demux)
 {


@@ -34,8 +66,48 @@ eDVBDemux::~eDVBDemux()
 {
 }
 
 {
 }
 

+int eDVBDemux::openDemux(void)
+{
+       char filename[128];
+#if HAVE_DVB_API_VERSION < 3
+       snprintf(filename, 128, "/dev/dvb/card%d/demux%d", adapter, demux);
+#else
+       snprintf(filename, 128, "/dev/dvb/adapter%d/demux%d", adapter, demux);
+#endif
+       return ::open(filename, O_RDWR);
+}
+

 DEFINE_REF(eDVBDemux)
 
 DEFINE_REF(eDVBDemux)
 

+RESULT eDVBDemux::setSourceFrontend(int fenum)
+{
+#if HAVE_DVB_API_VERSION >= 3
+       int fd = openDemux();
+       int n = DMX_SOURCE_FRONT0 + fenum;
+       int res = ::ioctl(fd, DMX_SET_SOURCE, &n);
+       if (res)
+               eDebug("DMX_SET_SOURCE failed! - %m");
+       else
+               source = fenum;
+       ::close(fd);
+       return res;
+#endif
+       return 0;
+}
+
+RESULT eDVBDemux::setSourcePVR(int pvrnum)
+{
+#if HAVE_DVB_API_VERSION >= 3
+       int fd = openDemux();
+       int n = DMX_SOURCE_DVR0 + pvrnum;
+       int res = ::ioctl(fd, DMX_SET_SOURCE, &n);
+       source = -1;
+       ::close(fd);
+       return res;
+#endif
+       return 0;
+}
+

 RESULT eDVBDemux::createSectionReader(eMainloop *context, ePtr<iDVBSectionReader> &reader)
 {
        RESULT res;
 RESULT eDVBDemux::createSectionReader(eMainloop *context, ePtr<iDVBSectionReader> &reader)
 {
        RESULT res;


@@ -45,6 +117,15 @@ RESULT eDVBDemux::createSectionReader(eMainloop *context, ePtr<iDVBSectionReader
        return res;
 }
 
        return res;
 }
 

+RESULT eDVBDemux::createPESReader(eMainloop *context, ePtr<iDVBPESReader> &reader)
+{
+       RESULT res;
+       reader = new eDVBPESReader(this, context, res);
+       if (res)
+               reader = 0;
+       return res;
+}
+

 RESULT eDVBDemux::createTSRecorder(ePtr<iDVBTSRecorder> &recorder)
 {
        if (m_dvr_busy)
 RESULT eDVBDemux::createTSRecorder(ePtr<iDVBTSRecorder> &recorder)
 {
        if (m_dvr_busy)


@@ -53,9 +134,49 @@ RESULT eDVBDemux::createTSRecorder(ePtr<iDVBTSRecorder> &recorder)
        return 0;
 }
 
        return 0;
 }
 

-RESULT eDVBDemux::getMPEGDecoder(ePtr<iTSMPEGDecoder> &decoder)
+RESULT eDVBDemux::getMPEGDecoder(ePtr<iTSMPEGDecoder> &decoder, int primary)

 {
 {

-       decoder = new eTSMPEGDecoder(this, 0);
+       decoder = new eTSMPEGDecoder(this, primary ? 0 : 1);
+       return 0;
+}
+
+RESULT eDVBDemux::getSTC(pts_t &pts, int num)
+{
+       int fd = openDemux();
+       
+       if (fd < 0)
+               return -ENODEV;
+
+       struct dmx_stc stc;
+       stc.num = num;
+       stc.base = 1;
+       
+       if (ioctl(fd, DMX_GET_STC, &stc) < 0)
+       {
+               eDebug("DMX_GET_STC failed!");
+               ::close(fd);
+               return -1;
+       }
+       
+       pts = stc.stc;
+       
+       eDebug("DMX_GET_STC - %lld", pts);
+       
+       ::close(fd);
+       return 0;
+}
+
+RESULT eDVBDemux::flush()
+{
+       // FIXME: implement flushing the PVR queue here.
+       
+       m_event(evtFlush);
+       return 0;
+}
+
+RESULT eDVBDemux::connectEvent(const Slot1<void,int> &event, ePtr<eConnection> &conn)
+{
+       conn = new eConnection(this, m_event.connect(event));

        return 0;
 }
 
        return 0;
 }
 


@@ -64,6 +185,14 @@ void eDVBSectionReader::data(int)
        __u8 data[4096]; // max. section size
        int r;
        r = ::read(fd, data, 4096);
        __u8 data[4096]; // max. section size
        int r;
        r = ::read(fd, data, 4096);

+#if FUZZING
+       int j;
+       for (j = 0; j < r; ++j)
+       {
+               if (!(rand()%FUZZING_PROPABILITY))
+                       data[j] ^= rand();
+       }
+#endif 

        if(r < 0)
        {
                eWarning("ERROR reading section - %m\n");
        if(r < 0)
        {
                eWarning("ERROR reading section - %m\n");


@@ -74,26 +203,25 @@ void eDVBSectionReader::data(int)
                        // this check should never happen unless the driver is crappy!
                unsigned int c;
                if ((c = crc32((unsigned)-1, data, r)))
                        // this check should never happen unless the driver is crappy!
                unsigned int c;
                if ((c = crc32((unsigned)-1, data, r)))

-                       eFatal("crc32 failed! is %x\n", c);
+               {
+                       eDebug("crc32 failed! is %x\n", c);
+                       return;
+               }

        }
        }

-       read(data);
+       if (active)
+               read(data);
+       else
+               eDebug("data.. but not active");

 }
 
 eDVBSectionReader::eDVBSectionReader(eDVBDemux *demux, eMainloop *context, RESULT &res): demux(demux)
 {
        char filename[128];
 }
 
 eDVBSectionReader::eDVBSectionReader(eDVBDemux *demux, eMainloop *context, RESULT &res): 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
-       fd = ::open(filename, O_RDWR);
-       
-       eDebug("eDVBSectionReader has fd %d", fd);
+       fd = demux->openDemux();

        
        if (fd >= 0)
        {
        
        if (fd >= 0)
        {

-               notifier=new eSocketNotifier(context, fd, eSocketNotifier::Read);
+               notifier=eSocketNotifier::create(context, fd, eSocketNotifier::Read, false);

                CONNECT(notifier->activated, eDVBSectionReader::data);
                res = 0;
        } else
                CONNECT(notifier->activated, eDVBSectionReader::data);
                res = 0;
        } else


@@ -107,8 +235,6 @@ DEFINE_REF(eDVBSectionReader)
 
 eDVBSectionReader::~eDVBSectionReader()
 {
 
 eDVBSectionReader::~eDVBSectionReader()
 {

-       if (notifier)
-               delete notifier;

        if (fd >= 0)
                ::close(fd);
 }
        if (fd >= 0)
                ::close(fd);
 }


@@ -119,6 +245,7 @@ RESULT eDVBSectionReader::start(const eDVBSectionFilterMask &mask)
        if (fd < 0)
                return -ENODEV;
 
        if (fd < 0)
                return -ENODEV;
 

+       notifier->start();

 #if HAVE_DVB_API_VERSION < 3
        dmxSctFilterParams sct;
 #else
 #if HAVE_DVB_API_VERSION < 3
        dmxSctFilterParams sct;
 #else


@@ -131,17 +258,21 @@ RESULT eDVBSectionReader::start(const eDVBSectionFilterMask &mask)
 #else
        sct.flags   = DMX_IMMEDIATE_START;
 #endif
 #else
        sct.flags   = DMX_IMMEDIATE_START;
 #endif

+#if !FUZZING

        if (mask.flags & eDVBSectionFilterMask::rfCRC)
        {
                sct.flags |= DMX_CHECK_CRC;
                checkcrc = 1;
        } else
        if (mask.flags & eDVBSectionFilterMask::rfCRC)
        {
                sct.flags |= DMX_CHECK_CRC;
                checkcrc = 1;
        } else

+#endif

                checkcrc = 0;
        
        memcpy(sct.filter.filter, mask.data, DMX_FILTER_SIZE);
        memcpy(sct.filter.mask, mask.mask, DMX_FILTER_SIZE);
 #if HAVE_DVB_API_VERSION >= 3
        memcpy(sct.filter.mode, mask.mode, DMX_FILTER_SIZE);
                checkcrc = 0;
        
        memcpy(sct.filter.filter, mask.data, DMX_FILTER_SIZE);
        memcpy(sct.filter.mask, mask.mask, DMX_FILTER_SIZE);
 #if HAVE_DVB_API_VERSION >= 3
        memcpy(sct.filter.mode, mask.mode, DMX_FILTER_SIZE);

+       if (::ioctl(fd, DMX_SET_BUFFER_SIZE, 8192*8) < 0)
+               eDebug("DMX_SET_BUFFER_SIZE failed(%m)");

 #endif
        
        res = ::ioctl(fd, DMX_SET_FILTER, &sct);
 #endif
        
        res = ::ioctl(fd, DMX_SET_FILTER, &sct);


@@ -166,9 +297,11 @@ RESULT eDVBSectionReader::stop()
 {
        if (!active)
                return -1;
 {
        if (!active)
                return -1;

-       
+
+       active=0;

        ::ioctl(fd, DMX_STOP);
        ::ioctl(fd, DMX_STOP);

-       
+       notifier->stop();
+

        return 0;
 }
 
        return 0;
 }
 


@@ -178,108 +311,184 @@ RESULT eDVBSectionReader::connectRead(const Slot1<void,const __u8*> &r, ePtr<eCo
        return 0;
 }
 
        return 0;
 }
 

-DEFINE_REF(eDVBTSRecorder);
+void eDVBPESReader::data(int)
+{
+       while (1)
+       {
+               __u8 buffer[16384];
+               int r;
+               r = ::read(m_fd, buffer, 16384);
+               if (!r)
+                       return;
+               if(r < 0)
+               {
+                       if (errno == EAGAIN || errno == EINTR) /* ok */
+                               return;
+                       eWarning("ERROR reading PES (fd=%d) - %m", m_fd);
+                       return;
+               }
+
+               if (m_active)
+                       m_read(buffer, r);
+               else
+                       eWarning("PES reader not active");
+               if (r != 16384)
+                       break;
+       }
+}
+
+eDVBPESReader::eDVBPESReader(eDVBDemux *demux, eMainloop *context, RESULT &res): m_demux(demux)
+{
+       char filename[128];
+       m_fd = m_demux->openDemux();
+       
+       if (m_fd >= 0)
+       {
+               ::ioctl(m_fd, DMX_SET_BUFFER_SIZE, 64*1024);
+               ::fcntl(m_fd, F_SETFL, O_NONBLOCK);
+               m_notifier = eSocketNotifier::create(context, m_fd, eSocketNotifier::Read, false);
+               CONNECT(m_notifier->activated, eDVBPESReader::data);
+               res = 0;
+       } else
+       {
+               perror(filename);
+               res = errno;
+       }
+}
+
+DEFINE_REF(eDVBPESReader)
+
+eDVBPESReader::~eDVBPESReader()
+{
+       if (m_fd >= 0)
+               ::close(m_fd);
+}
+
+RESULT eDVBPESReader::start(int pid)
+{
+       RESULT res;
+       if (m_fd < 0)
+               return -ENODEV;
+
+       m_notifier->start();
+
+#if HAVE_DVB_API_VERSION < 3
+       dmxPesFilterParams flt;
+       
+       flt.pesType = DMX_PES_OTHER;
+#else
+       dmx_pes_filter_params flt;
+       
+       flt.pes_type = DMX_PES_OTHER;
+#endif
+
+       flt.pid     = pid;
+       flt.input   = DMX_IN_FRONTEND;
+       flt.output  = DMX_OUT_TAP;
+       
+       flt.flags   = DMX_IMMEDIATE_START;
+
+       res = ::ioctl(m_fd, DMX_SET_PES_FILTER, &flt);
+       
+       if (res)
+               eWarning("PES filter: DMX_SET_PES_FILTER - %m");
+       if (!res)
+               m_active = 1;
+       return res;
+}
+
+RESULT eDVBPESReader::stop()
+{
+       if (!m_active)
+               return -1;
+
+       m_active=0;
+       ::ioctl(m_fd, DMX_STOP);
+       m_notifier->stop();
+
+       return 0;
+}
+
+RESULT eDVBPESReader::connectRead(const Slot2<void,const __u8*,int> &r, ePtr<eConnection> &conn)
+{
+       conn = new eConnection(this, m_read.connect(r));
+       return 0;
+}

 
 

-class eDVBTSRecorderThread: public eThread
+class eDVBRecordFileThread: public eFilePushThread

 {
 public:
 {
 public:

-       eDVBTSRecorderThread();
-       void thread();
-       void stop();
-       void start(int sourcefd, int destfd);
+       eDVBRecordFileThread();
+       void setTimingPID(int pid, int type);
+       
+       void startSaveMetaInformation(const std::string &filename);
+       void stopSaveMetaInformation();
+       int getLastPTS(pts_t &pts);
+protected:
+       int filterRecordData(const unsigned char *data, int len, size_t &current_span_remaining);

 private:
 private:

-       int m_stop;
-       unsigned char m_buffer[65536];
-       int m_buf_start, m_buf_end;
-       int m_fd_source, m_fd_dest;
+       eMPEGStreamParserTS m_ts_parser;
+       eMPEGStreamInformation m_stream_info;
+       off_t m_current_offset;
+       pts_t m_last_pcr; /* very approximate.. */
+       int m_pid;

 };
 
 };
 

-eDVBTSRecorderThread::eDVBTSRecorderThread()
+eDVBRecordFileThread::eDVBRecordFileThread()
+       :eFilePushThread(IOPRIO_CLASS_RT, 7), m_ts_parser(m_stream_info)

 {
 {

-       m_stop = 0;
-       m_buf_start = m_buf_end = 0;
+       m_current_offset = 0;

 }
 
 }
 

-static void signal_handler(int x)
+void eDVBRecordFileThread::setTimingPID(int pid, int type)

 {
 {

+       m_ts_parser.setPid(pid, type);

 }
 
 }
 

-void eDVBTSRecorderThread::thread()
+void eDVBRecordFileThread::startSaveMetaInformation(const std::string &filename)

 {
 {

-       eDebug("RECORDING THREAD START");
-               // this is race. FIXME.
-       
-               /* we set the signal to not restart syscalls, so we can detect our signal. */
-       struct sigaction act;
-       act.sa_handler = signal_handler; // no, SIG_IGN doesn't do it :/
-       act.sa_flags = 0;
-       sigaction(SIGUSR1, &act, 0);
-       
-               /* m_stop must be evaluated after each syscall. */
-       while (!m_stop)
-       {
-                       /* first try flushing the bufptr */
-               if (m_buf_start != m_buf_end)
-               {
-                               // TODO: take care of boundaries.
-                       int w = write(m_fd_dest, m_buffer + m_buf_start, m_buf_end - m_buf_start);
-                       if (w <= 0)
-                       {
-                               if (errno == -EINTR)
-                                       continue;
-                               eDebug("eDVBTSRecorder *write error* - not yet handled");
-                               // ... we would stop the thread
-                       }
-                       printf("TSRECORD: wrote %d bytes\n", w);
-                       m_buf_start += w;
-                       continue;
-               }
-                       
-                       /* now fill our buffer. */
-               m_buf_start = 0;
-               m_buf_end = read(m_fd_source, m_buffer, sizeof(m_buffer));
-               if (m_buf_end < 0)
-               {
-                       m_buf_end = 0;
-                       if (errno == EINTR)
-                               continue;
-                       eDebug("eDVBTSRecorder *read error* - not yet handled");
-               }
-               printf("TSRECORD: read %d bytes\n", m_buf_end);
-       }
-       
-       eDebug("RECORDING THREAD STOP");
+       m_stream_info.startSave(filename.c_str());

 }
 
 }
 

-void eDVBTSRecorderThread::start(int fd_source, int fd_dest)
+void eDVBRecordFileThread::stopSaveMetaInformation()

 {
 {

-       m_fd_source = fd_source;
-       m_fd_dest = fd_dest;
-       m_stop = 0;
-       run();
+       m_stream_info.stopSave();

 }
 
 }
 

-void eDVBTSRecorderThread::stop()
+int eDVBRecordFileThread::getLastPTS(pts_t &pts)

 {
 {

-       m_stop = 1;
-       sendSignal(SIGUSR1);
-       kill();
+       return m_ts_parser.getLastPTS(pts);
+}
+
+int eDVBRecordFileThread::filterRecordData(const unsigned char *data, int len, size_t &current_span_remaining)
+{
+       m_ts_parser.parseData(m_current_offset, data, len);
+       
+       m_current_offset += len;
+       
+       return len;

 }
 
 }
 

+DEFINE_REF(eDVBTSRecorder);
+

 eDVBTSRecorder::eDVBTSRecorder(eDVBDemux *demux): m_demux(demux)
 {
        m_running = 0;
 eDVBTSRecorder::eDVBTSRecorder(eDVBDemux *demux): m_demux(demux)
 {
        m_running = 0;

-       m_format = 0;

        m_target_fd = -1;
        m_target_fd = -1;

-       m_thread = new eDVBTSRecorderThread();
+       m_thread = new eDVBRecordFileThread();
+  CONNECT(m_thread->m_event, eDVBTSRecorder::filepushEvent);
+#ifndef HAVE_ADD_PID

        m_demux->m_dvr_busy = 1;
        m_demux->m_dvr_busy = 1;

+#endif

 }
 
 eDVBTSRecorder::~eDVBTSRecorder()
 {
        stop();
        delete m_thread;
 }
 
 eDVBTSRecorder::~eDVBTSRecorder()
 {
        stop();
        delete m_thread;

+#ifndef HAVE_ADD_PID

        m_demux->m_dvr_busy = 0;
        m_demux->m_dvr_busy = 0;

+#endif

 }
 
 RESULT eDVBTSRecorder::start()
 }
 
 RESULT eDVBTSRecorder::start()


@@ -289,8 +498,9 @@ RESULT eDVBTSRecorder::start()
        
        if (m_target_fd == -1)
                return -2;
        
        if (m_target_fd == -1)
                return -2;

-               
+

        char filename[128];
        char filename[128];

+#ifndef HAVE_ADD_PID

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


@@ -303,6 +513,39 @@ RESULT eDVBTSRecorder::start()
                eDebug("FAILED to open dvr (%s) in ts recoder (%m)", filename);
                return -3;
        }
                eDebug("FAILED to open dvr (%s) in ts recoder (%m)", filename);
                return -3;
        }

+#else
+       snprintf(filename, 128, "/dev/dvb/adapter%d/demux%d", m_demux->adapter, m_demux->demux);
+
+       m_source_fd = ::open(filename, O_RDONLY);
+       
+       if (m_source_fd < 0)
+       {
+               eDebug("FAILED to open demux (%s) in ts recoder (%m)", filename);
+               return -3;
+       }
+       
+       ::ioctl(m_source_fd, DMX_SET_BUFFER_SIZE, 1024*1024);
+
+       dmx_pes_filter_params flt;
+       flt.pes_type = (dmx_pes_type_t)DMX_TAP_TS;
+       flt.pid     = (__u16)-1;
+       flt.input   = DMX_IN_FRONTEND;
+       flt.output  = DMX_OUT_TAP;
+       flt.flags   = 0;
+       int res = ::ioctl(m_source_fd, DMX_SET_PES_FILTER, &flt);
+       if (res)
+       {
+               eDebug("DMX_SET_PES_FILTER: %m");
+               ::close(m_source_fd);
+               return -3;
+       }
+       
+       ::ioctl(m_source_fd, DMX_START);
+       
+#endif
+
+       if (m_target_filename != "")
+               m_thread->startSaveMetaInformation(m_target_filename);

        
        m_thread->start(m_source_fd, m_target_fd);
        m_running = 1;
        
        m_thread->start(m_source_fd, m_target_fd);
        m_running = 1;


@@ -336,11 +579,11 @@ RESULT eDVBTSRecorder::removePID(int pid)
        return 0;
 }
 
        return 0;
 }
 

-RESULT eDVBTSRecorder::setFormat(int format)
+RESULT eDVBTSRecorder::setTimingPID(int pid, int type)

 {
        if (m_running)
                return -1;
 {
        if (m_running)
                return -1;

-       m_format = format;
+       m_thread->setTimingPID(pid, type);

        return 0;
 }
 
        return 0;
 }
 


@@ -350,6 +593,12 @@ RESULT eDVBTSRecorder::setTargetFD(int fd)
        return 0;
 }
 
        return 0;
 }
 

+RESULT eDVBTSRecorder::setTargetFilename(const char *filename)
+{
+       m_target_filename = filename;
+       return 0;
+}
+

 RESULT eDVBTSRecorder::setBoundary(off_t max)
 {
        return -1; // not yet implemented
 RESULT eDVBTSRecorder::setBoundary(off_t max)
 {
        return -1; // not yet implemented


@@ -365,10 +614,25 @@ RESULT eDVBTSRecorder::stop()
        m_thread->stop();
        
        close(m_source_fd);
        m_thread->stop();
        
        close(m_source_fd);

+       m_source_fd = -1;
+       
+       m_thread->stopSaveMetaInformation();

        
        return 0;
 }
 
        
        return 0;
 }
 

+RESULT eDVBTSRecorder::getCurrentPCR(pts_t &pcr)
+{
+       if (!m_running)
+               return 0;
+       if (!m_thread)
+               return 0;
+               /* XXX: we need a lock here */
+
+                       /* we don't filter PCR data, so just use the last received PTS, which is not accurate, but better than nothing */
+       return m_thread->getLastPTS(pcr);
+}
+

 RESULT eDVBTSRecorder::connectEvent(const Slot1<void,int> &event, ePtr<eConnection> &conn)
 {
        conn = new eConnection(this, m_event.connect(event));
 RESULT eDVBTSRecorder::connectEvent(const Slot1<void,int> &event, ePtr<eConnection> &conn)
 {
        conn = new eConnection(this, m_event.connect(event));


@@ -377,16 +641,11 @@ RESULT eDVBTSRecorder::connectEvent(const Slot1<void,int> &event, ePtr<eConnecti
 
 RESULT eDVBTSRecorder::startPID(int pid)
 {
 
 RESULT eDVBTSRecorder::startPID(int pid)
 {

-       char filename[128];
-#if HAVE_DVB_API_VERSION < 3
-       snprintf(filename, 128, "/dev/dvb/card%d/demux%d", m_demux->adapter, m_demux->demux);
-#else
-       snprintf(filename, 128, "/dev/dvb/adapter%d/demux%d", m_demux->adapter, m_demux->demux);
-#endif
-       int fd = ::open(filename, O_RDWR);
+#ifndef HAVE_ADD_PID
+       int fd = m_demux->openDemux();

        if (fd < 0)
        {
        if (fd < 0)
        {

-               eDebug("FAILED to open demux (%s) in ts recoder (%m)", filename);
+               eDebug("FAILED to open demux in ts recoder (%m)");

                return -1;
        }
 
                return -1;
        }
 


@@ -414,12 +673,51 @@ RESULT eDVBTSRecorder::startPID(int pid)
                return -1;
        }
        m_pids[pid] = fd;
                return -1;
        }
        m_pids[pid] = fd;

-
+#else
+       while(true) {
+               if (::ioctl(m_source_fd, DMX_ADD_PID, pid) < 0) {
+                       perror("DMX_ADD_PID");
+                       if (errno == EAGAIN || errno == EINTR) {
+                               eDebug("retry!");
+                               continue;
+                       }
+               } else
+                       m_pids[pid] = 1;
+               break;
+       }
+#endif

        return 0;
 }
 
 void eDVBTSRecorder::stopPID(int pid)
 {
        return 0;
 }
 
 void eDVBTSRecorder::stopPID(int pid)
 {

-       ::close(m_pids[pid]);
+#ifndef HAVE_ADD_PID
+       if (m_pids[pid] != -1)
+               ::close(m_pids[pid]);
+#else
+       if (m_pids[pid] != -1)
+       {
+               while(true) {
+                       if (::ioctl(m_source_fd, DMX_REMOVE_PID, pid) < 0) {
+                               perror("DMX_REMOVE_PID");
+                               if (errno == EAGAIN || errno == EINTR) {
+                                       eDebug("retry!");
+                                       continue;
+                               }
+                       }
+                       break;
+               }
+       }
+#endif

        m_pids[pid] = -1;
 }
        m_pids[pid] = -1;
 }

+
+void eDVBTSRecorder::filepushEvent(int event)
+{
+       switch (event)
+       {
+       case eFilePushThread::evtWriteError:
+               m_event(eventWriteError);
+               break;
+       }
+}