fix spaces

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

diff --git a/lib/dvb/demux.cpp b/lib/dvb/demux.cpp
index f6bdbd7b5602cf9766786cd2c35598504a1ef6e8..f52bb601db6dab1d7f4303c4ccbe74d075928436 100644 (file)
--- a/lib/dvb/demux.cpp
+++ b/lib/dvb/demux.cpp
@@ -6,7 +6,6 @@
 #include <unistd.h>
 #include <signal.h>
 
-#include <lib/base/thread.h>
 
 #if HAVE_DVB_API_VERSION < 3
 #include <ost/dmx.h>
@@ -20,6 +19,7 @@
 #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>
@@ -59,6 +59,49 @@ RESULT eDVBDemux::getMPEGDecoder(ePtr<iTSMPEGDecoder> &decoder)
        return 0;
 }
 
+RESULT eDVBDemux::getSTC(pts_t &pts)
+{
+       char filename[128];
+#if HAVE_DVB_API_VERSION < 3
+       sprintf(filename, "/dev/dvb/card%d/demux%d", adapter, demux);
+#else
+       sprintf(filename, "/dev/dvb/adapter%d/demux%d", adapter, demux);
+#endif
+       int fd = ::open(filename, O_RDWR);
+       
+       if (fd < 0)
+               return -ENODEV;
+
+       struct dmx_stc stc;
+       stc.num = 0;
+       stc.base = 1;
+       
+       if (ioctl(fd, DMX_GET_STC, &stc) < 0)
+       {
+               ::close(fd);
+               return -1;
+       }
+       
+       pts = stc.stc;
+       
+       ::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;
+}
+
 void eDVBSectionReader::data(int)
 {
        __u8 data[4096]; // max. section size
@@ -74,9 +117,15 @@ void eDVBSectionReader::data(int)
                        // 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)
@@ -93,7 +142,7 @@ eDVBSectionReader::eDVBSectionReader(eDVBDemux *demux, eMainloop *context, RESUL
        
        if (fd >= 0)
        {
-               notifier=new eSocketNotifier(context, fd, eSocketNotifier::Read);
+               notifier=new eSocketNotifier(context, fd, eSocketNotifier::Read, false);
                CONNECT(notifier->activated, eDVBSectionReader::data);
                res = 0;
        } else
@@ -119,6 +168,7 @@ RESULT eDVBSectionReader::start(const eDVBSectionFilterMask &mask)
        if (fd < 0)
                return -ENODEV;
 
+       notifier->start();
 #if HAVE_DVB_API_VERSION < 3
        dmxSctFilterParams sct;
 #else
@@ -142,6 +192,8 @@ RESULT eDVBSectionReader::start(const eDVBSectionFilterMask &mask)
        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);
@@ -166,9 +218,11 @@ RESULT eDVBSectionReader::stop()
 {
        if (!active)
                return -1;
-       
+
+       active=0;
        ::ioctl(fd, DMX_STOP);
-       
+       notifier->stop();
+
        return 0;
 }
 
@@ -180,98 +234,12 @@ RESULT eDVBSectionReader::connectRead(const Slot1<void,const __u8*> &r, ePtr<eCo
 
 DEFINE_REF(eDVBTSRecorder);
 
-class eDVBTSRecorderThread: public eThread
-{
-public:
-       eDVBTSRecorderThread();
-       void thread();
-       void stop();
-       void start(int sourcefd, int destfd);
-private:
-       int m_stop;
-       unsigned char m_buffer[65536];
-       int m_buf_start, m_buf_end;
-       int m_fd_source, m_fd_dest;
-};
-
-eDVBTSRecorderThread::eDVBTSRecorderThread()
-{
-       m_stop = 0;
-       m_buf_start = m_buf_end = 0;
-}
-
-static void signal_handler(int x)
-{
-}
-
-void eDVBTSRecorderThread::thread()
-{
-       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");
-}
-
-void eDVBTSRecorderThread::start(int fd_source, int fd_dest)
-{
-       m_fd_source = fd_source;
-       m_fd_dest = fd_dest;
-       m_stop = 0;
-       run();
-}
-
-void eDVBTSRecorderThread::stop()
-{
-       m_stop = 1;
-       sendSignal(SIGUSR1);
-       kill();
-}
-
 eDVBTSRecorder::eDVBTSRecorder(eDVBDemux *demux): m_demux(demux)
 {
        m_running = 0;
        m_format = 0;
        m_target_fd = -1;
-       m_thread = new eDVBTSRecorderThread();
+       m_thread = new eFilePushThread();
        m_demux->m_dvr_busy = 1;
 }