[media] libdvbv5: allow more options in set_pesfilter

Signed-off-by: André Roth <neolynx@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/lib/include/dvb-demux.h b/lib/include/dvb-demux.h
index 240d471..25cd56c 100644 (file)
--- a/lib/include/dvb-demux.h
+++ b/lib/include/dvb-demux.h
@@ -29,6 +29,8 @@
 #ifndef _DVB_DEMUX_H
 #define _DVB_DEMUX_H
 
+#include <linux/dvb/dmx.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -36,7 +38,7 @@ extern "C" {
 int dvb_dmx_open(int adapter, int demux, unsigned verbose);
 void dvb_dmx_close(int dmx_fd);
 
-int set_pesfilter(int dmxfd, int pid, int pes_type, int dvr);
+int dvb_set_pesfilter(int dmxfd, int pid, dmx_pes_type_t type, dmx_output_t output, int buffersize);
 
 int get_pmt_pid(const char *dmxdev, int sid);
 

diff --git a/lib/libdvbv5/dvb-demux.c b/lib/libdvbv5/dvb-demux.c
index 7ece976..138b58a 100644 (file)
--- a/lib/libdvbv5/dvb-demux.c
+++ b/lib/libdvbv5/dvb-demux.c
@@ -38,7 +38,6 @@
 #include <fcntl.h>
 #include <stdlib.h> /* free */
 
-#include <linux/dvb/dmx.h>
 #include "dvb-demux.h"
 
 int dvb_dmx_open(int adapter, int demux, unsigned verbose)
@@ -56,26 +55,25 @@ void dvb_dmx_close(int dmx_fd)
   close( dmx_fd);
 }
 
-int set_pesfilter(int dmxfd, int pid, int pes_type, int dvr)
+int dvb_set_pesfilter(int dmxfd, int pid, dmx_pes_type_t type, dmx_output_t output, int buffersize)
 {
        struct dmx_pes_filter_params pesfilter;
 
        /* ignore this pid to allow radio services */
        if (pid < 0 ||
                pid >= 0x1fff ||
-               (pid == 0 && pes_type != DMX_PES_OTHER))
+               (pid == 0 && type != DMX_PES_OTHER))
                return 0;
 
-       if (dvr) {
-               int buffersize = 64 * 1024;
+       if (buffersize) {
                if (ioctl(dmxfd, DMX_SET_BUFFER_SIZE, buffersize) == -1)
-               perror("DMX_SET_BUFFER_SIZE failed");
+                       perror("DMX_SET_BUFFER_SIZE failed");
        }
 
        pesfilter.pid = pid;
        pesfilter.input = DMX_IN_FRONTEND;
-       pesfilter.output = dvr ? DMX_OUT_TS_TAP : DMX_OUT_DECODER;
-       pesfilter.pes_type = pes_type;
+       pesfilter.output = output;
+       pesfilter.pes_type = type;
        pesfilter.flags = DMX_IMMEDIATE_START;
 
        if (ioctl(dmxfd, DMX_SET_PES_FILTER, &pesfilter) == -1) {

diff --git a/utils/dvb/dvbv5-zap.c b/utils/dvb/dvbv5-zap.c
index f7e3c4a..6445149 100644 (file)
--- a/utils/dvb/dvbv5-zap.c
+++ b/utils/dvb/dvbv5-zap.c
@@ -550,14 +550,18 @@ int main(int argc, char **argv)
                        perror("opening pat demux failed");
                        return -1;
                }
-               if (set_pesfilter(pat_fd, 0, DMX_PES_OTHER, args.dvr) < 0)
+               if (dvb_set_pesfilter(pat_fd, 0, DMX_PES_OTHER,
+                               args.dvr ? DMX_OUT_TS_TAP : DMX_OUT_DECODER,
+                               args.dvr ? 64 * 1024 : 0) < 0)
                        return -1;
 
                if ((pmt_fd = open(args.demux_dev, O_RDWR)) < 0) {
                        perror("opening pmt demux failed");
                        return -1;
                }
-               if (set_pesfilter(pmt_fd, pmtpid, DMX_PES_OTHER, args.dvr) < 0)
+               if (dvb_set_pesfilter(pmt_fd, pmtpid, DMX_PES_OTHER,
+                               args.dvr ? DMX_OUT_TS_TAP : DMX_OUT_DECODER,
+                               args.dvr ? 64 * 1024 : 0) < 0)
                        return -1;
        }
 
@@ -568,7 +572,10 @@ int main(int argc, char **argv)
                        PERROR("failed opening '%s'", args.demux_dev);
                        return -1;
                }
-               if (set_pesfilter(video_fd, vpid, DMX_PES_VIDEO, args.dvr) < 0)
+               printf( "  dvb_set_pesfilter %d\n", vpid );
+               if (dvb_set_pesfilter(video_fd, vpid, DMX_PES_VIDEO,
+                               args.dvr ? DMX_OUT_TS_TAP : DMX_OUT_DECODER,
+                               args.dvr ? 64 * 1024 : 0) < 0)
                        return -1;
        }
 
@@ -580,7 +587,9 @@ int main(int argc, char **argv)
                        return -1;
                }
 
-               if (set_pesfilter(audio_fd, apid, DMX_PES_AUDIO, args.dvr) < 0)
+               if (dvb_set_pesfilter(audio_fd, apid, DMX_PES_AUDIO,
+                               args.dvr ? DMX_OUT_TS_TAP : DMX_OUT_DECODER,
+                               args.dvr ? 64 * 1024 : 0) < 0)
                        return -1;
        }