trade open flags to openPVR function

[vuplus_dvbapp] / lib / dvb / demux.cpp

diff --git a/lib/dvb/demux.cpp b/lib/dvb/demux.cpp
index 1146518..f4d8618 100644 (file)
--- a/lib/dvb/demux.cpp
+++ b/lib/dvb/demux.cpp
@@ -35,6 +35,13 @@
 #define HAVE_ADD_PID
 
 #ifdef HAVE_ADD_PID
+
+#if HAVE_DVB_API_VERSION > 3
+#ifndef DMX_ADD_PID
+#define DMX_ADD_PID            _IOW('o', 51, __u16)
+#define DMX_REMOVE_PID         _IOW('o', 52, __u16)
+#endif
+#else
 #define DMX_ADD_PID              _IO('o', 51)
 #define DMX_REMOVE_PID           _IO('o', 52)
 
@@ -42,6 +49,7 @@ typedef enum {
        DMX_TAP_TS = 0,
        DMX_TAP_PES = DMX_PES_OTHER, /* for backward binary compat. */
 } dmx_tap_type_t;
+#endif
 
 #endif
 
@@ -77,6 +85,13 @@ int eDVBDemux::openDemux(void)
        return ::open(filename, O_RDWR);
 }
 
+int eDVBDemux::openDVR(int flags)
+{
+       char filename[128];
+       snprintf(filename, 128, "/dev/dvb/adapter%d/dvr%d", adapter, demux);
+       return ::open(filename, flags);
+}
+
 DEFINE_REF(eDVBDemux)
 
 RESULT eDVBDemux::setSourceFrontend(int fenum)
@@ -239,6 +254,14 @@ eDVBSectionReader::~eDVBSectionReader()
                ::close(fd);
 }
 
+RESULT eDVBSectionReader::setBufferSize(int size)
+{
+       int res=::ioctl(fd, DMX_SET_BUFFER_SIZE, size);
+       if (res < 0)
+               eDebug("eDVBSectionReader DMX_SET_BUFFER_SIZE failed(%m)");
+       return res;
+}
+
 RESULT eDVBSectionReader::start(const eDVBSectionFilterMask &mask)
 {
        RESULT res;
@@ -271,8 +294,7 @@ 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)");
+       setBufferSize(8192*8);
 #endif
        
        res = ::ioctl(fd, DMX_SET_FILTER, &sct);
@@ -344,7 +366,7 @@ eDVBPESReader::eDVBPESReader(eDVBDemux *demux, eMainloop *context, RESULT &res):
        
        if (m_fd >= 0)
        {
-               ::ioctl(m_fd, DMX_SET_BUFFER_SIZE, 64*1024);
+               setBufferSize(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);
@@ -356,6 +378,14 @@ eDVBPESReader::eDVBPESReader(eDVBDemux *demux, eMainloop *context, RESULT &res):
        }
 }
 
+RESULT eDVBPESReader::setBufferSize(int size)
+{
+       int res = ::ioctl(m_fd, DMX_SET_BUFFER_SIZE, size);
+       if (res < 0)
+               eDebug("eDVBPESReader DMX_SET_BUFFER_SIZE failed(%m)");
+       return res;
+}
+
 DEFINE_REF(eDVBPESReader)
 
 eDVBPESReader::~eDVBPESReader()
@@ -476,7 +506,7 @@ eDVBTSRecorder::eDVBTSRecorder(eDVBDemux *demux): m_demux(demux)
        m_running = 0;
        m_target_fd = -1;
        m_thread = new eDVBRecordFileThread();
-  CONNECT(m_thread->m_event, eDVBTSRecorder::filepushEvent);
+       CONNECT(m_thread->m_event, eDVBTSRecorder::filepushEvent);
 #ifndef HAVE_ADD_PID
        m_demux->m_dvr_busy = 1;
 #endif
@@ -493,12 +523,17 @@ eDVBTSRecorder::~eDVBTSRecorder()
 
 RESULT eDVBTSRecorder::start()
 {
+       std::map<int,int>::iterator i(m_pids.begin());
+
        if (m_running)
                return -1;
        
        if (m_target_fd == -1)
                return -2;
 
+       if (i == m_pids.end())
+               return -3;
+
        char filename[128];
 #ifndef HAVE_ADD_PID
 #if HAVE_DVB_API_VERSION < 3
@@ -523,14 +558,20 @@ RESULT eDVBTSRecorder::start()
                eDebug("FAILED to open demux (%s) in ts recoder (%m)", filename);
                return -3;
        }
-       
-       ::ioctl(m_source_fd, DMX_SET_BUFFER_SIZE, 1024*1024);
+
+       setBufferSize(1024*1024);
 
        dmx_pes_filter_params flt;
+#if HAVE_DVB_API_VERSION > 3
+       flt.pes_type = DMX_PES_OTHER;
+       flt.output  = DMX_OUT_TSDEMUX_TAP;
+#else
        flt.pes_type = (dmx_pes_type_t)DMX_TAP_TS;
-       flt.pid     = (__u16)-1;
-       flt.input   = DMX_IN_FRONTEND;
        flt.output  = DMX_OUT_TAP;
+#endif
+       flt.pid     = i->first;
+       ++i;
+       flt.input   = DMX_IN_FRONTEND;
        flt.flags   = 0;
        int res = ::ioctl(m_source_fd, DMX_SET_PES_FILTER, &flt);
        if (res)
@@ -549,13 +590,23 @@ RESULT eDVBTSRecorder::start()
        
        m_thread->start(m_source_fd, m_target_fd);
        m_running = 1;
-       
-       for (std::map<int,int>::iterator i(m_pids.begin()); i != m_pids.end(); ++i)
+
+       while (i != m_pids.end()) {
                startPID(i->first);
-       
+               ++i;
+       }
+
        return 0;
 }
 
+RESULT eDVBTSRecorder::setBufferSize(int size)
+{
+       int res = ::ioctl(m_source_fd, DMX_SET_BUFFER_SIZE, size);
+       if (res < 0)
+               eDebug("eDVBTSRecorder DMX_SET_BUFFER_SIZE failed(%m)");
+       return res;
+}
+
 RESULT eDVBTSRecorder::addPID(int pid)
 {
        if (m_pids.find(pid) != m_pids.end())
@@ -581,8 +632,6 @@ RESULT eDVBTSRecorder::removePID(int pid)
 
 RESULT eDVBTSRecorder::setTimingPID(int pid, int type)
 {
-       if (m_running)
-               return -1;
        m_thread->setTimingPID(pid, type);
        return 0;
 }
@@ -606,18 +655,36 @@ RESULT eDVBTSRecorder::setBoundary(off_t max)
 
 RESULT eDVBTSRecorder::stop()
 {
+       int state=3;
+
        for (std::map<int,int>::iterator i(m_pids.begin()); i != m_pids.end(); ++i)
                stopPID(i->first);
 
        if (!m_running)
                return -1;
+
+#if HAVE_DVB_API_VERSION >= 5
+       /* workaround for record thread stop */
+       if (::ioctl(m_source_fd, DMX_STOP) < 0)
+               perror("DMX_STOP");
+       else
+               state &= ~1;
+
+       if (::close(m_source_fd) < 0)
+               perror("close");
+       else
+               state &= ~2;
+#endif
+
        m_thread->stop();
-       
-       close(m_source_fd);
+
+       if (state & 3)
+               ::close(m_source_fd);
+
+       m_running = 0;
        m_source_fd = -1;
-       
+
        m_thread->stopSaveMetaInformation();
-       
        return 0;
 }
 
@@ -675,7 +742,12 @@ RESULT eDVBTSRecorder::startPID(int pid)
        m_pids[pid] = fd;
 #else
        while(true) {
+#if HAVE_DVB_API_VERSION > 3
+               __u16 p = pid;
+               if (::ioctl(m_source_fd, DMX_ADD_PID, &p) < 0) {
+#else
                if (::ioctl(m_source_fd, DMX_ADD_PID, pid) < 0) {
+#endif
                        perror("DMX_ADD_PID");
                        if (errno == EAGAIN || errno == EINTR) {
                                eDebug("retry!");
@@ -698,7 +770,12 @@ void eDVBTSRecorder::stopPID(int pid)
        if (m_pids[pid] != -1)
        {
                while(true) {
+#if HAVE_DVB_API_VERSION > 3
+                       __u16 p = pid;
+                       if (::ioctl(m_source_fd, DMX_REMOVE_PID, &p) < 0) {
+#else
                        if (::ioctl(m_source_fd, DMX_REMOVE_PID, pid) < 0) {
+#endif
                                perror("DMX_REMOVE_PID");
                                if (errno == EAGAIN || errno == EINTR) {
                                        eDebug("retry!");