V4L/DVB (7329): add flag to allow software demux to recognize the output type

Previously, the macro DVR_FEED, which is used to recognize and filter
out duplicate packets going to the DVR device, used the TS_PAYLOAD_ONLY
flag to identify a packet's destination.

This kind of filtering was introduced by the following two changesets:

Now, that it is possible to record TS PIDs using the demux device by
setting the output type to DMX_OUT_TSDEMUX_TAP, checking TS_PAYLOAD_ONLY
is not sufficient anymore. Therefore another flag, TS_DEMUX, is added to
specify the output type of a feed.

This allows multiple clients to filter the same TS PID on a demux device
simultaneously.

Signed-off-by: Andreas Oberritter <obi@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

3 files changed, 8 insertions, 5 deletions

diff --git a/drivers/media/dvb/dvb-core/demux.h b/drivers/media/dvb/dvb-core/demux.h
index 0c1d87c5227a..b0d347daae47 100644
--- a/drivers/media/dvb/dvb-core/demux.h
+++ b/drivers/media/dvb/dvb-core/demux.h
@@ -80,6 +80,8 @@ enum dmx_success {
 #define TS_PAYLOAD_ONLY 2   /* in case TS_PACKET is set, only send the TS
                                payload (<=184 bytes per packet) to callback */
 #define TS_DECODER      4   /* send stream to built-in decoder (if present) */
+#define TS_DEMUX        8   /* in case TS_PACKET is set, send the TS to
+                               the demux device, not to the dvr device */
 
 /* PES type for filters which write to built-in decoder */
 /* these should be kept identical to the types in dmx.h */
diff --git a/drivers/media/dvb/dvb-core/dmxdev.c b/drivers/media/dvb/dvb-core/dmxdev.c
index e7f7aef862a8..716735f03f55 100644
--- a/drivers/media/dvb/dvb-core/dmxdev.c
+++ b/drivers/media/dvb/dvb-core/dmxdev.c
@@ -619,11 +619,12 @@ static int dvb_dmxdev_filter_start(struct dmxdev_filter *filter)
                 else
                         ts_type = 0;
 
-                if (otype == DMX_OUT_TS_TAP || otype == DMX_OUT_TSDEMUX_TAP)
+                if (otype == DMX_OUT_TS_TAP)
                         ts_type |= TS_PACKET;
-
-                if (otype == DMX_OUT_TAP)
-                        ts_type |= TS_PAYLOAD_ONLY | TS_PACKET;
+                else if (otype == DMX_OUT_TSDEMUX_TAP)
+                        ts_type |= TS_PACKET | TS_DEMUX;
+                else if (otype == DMX_OUT_TAP)
+                        ts_type |= TS_PACKET | TS_DEMUX | TS_PAYLOAD_ONLY;
 
                 ret = dmxdev->demux->allocate_ts_feed(dmxdev->demux,
                                                       tsfeed,
diff --git a/drivers/media/dvb/dvb-core/dvb_demux.c b/drivers/media/dvb/dvb-core/dvb_demux.c
index 7959020f9317..988d14302cb1 100644
--- a/drivers/media/dvb/dvb-core/dvb_demux.c
+++ b/drivers/media/dvb/dvb-core/dvb_demux.c
@@ -368,7 +368,7 @@ static inline void dvb_dmx_swfilter_packet_type(struct dvb_demux_feed *feed,
 #define DVR_FEED(f)                                                     \
         (((f)->type == DMX_TYPE_TS) &&                                  \
         ((f)->feed.ts.is_filtering) &&                                  \
-        (((f)->ts_type & (TS_PACKET|TS_PAYLOAD_ONLY)) == TS_PACKET))
+        (((f)->ts_type & (TS_PACKET | TS_DEMUX)) == TS_PACKET))
 
 static void dvb_dmx_swfilter_packet(struct dvb_demux *demux, const u8 *buf)
 {