V4L/DVB (7293): DMX_OUT_TSDEMUX_TAP: record two streams from same mux, resend

Currently (in linux-2.6.24, but linux-dvb hg looks similar), the
dmx_output_t in the dmx_pes_filter_params decides two things: whether
output is sent to demux0 or dvr0 (in dmxdev.c:dvb_dmxdev_ts_callback),
*and* whether to depacketise TS (in dmxdev.c:dvb_dmxdev_filter_start).
As it stands, those two things can't be set independently: output
destined for demux0 is depacketised, output for dvr0 isn't.

This is what you want for capturing multiple audio streams from the same
multiplex simultaneously: open demux0 several times and send
depacketised output there. And capturing a single video stream is fine
not what you want: you want multi-open (so demux0, not dvr0), but you
want the TS nature preserved (because that's what you want on output, as
you're going to re-multiplex it with the audio).

At least one existing solution -- GStreamer -- sends all its streams
simultaneously via dvr0 and demuxes again in userland, but it seems a
bit of a shame to pick out all the PIDs in kernel, stick them back
together in kernel, and send them to userland only to get unpicked
again, when the alternative is such a small API addition.

The attached patch adds a new value for dmx_output_t:
DMX_OUT_TSDEMUX_TAP, which sends TS to the demux0 device. With this
patch and a dvb-usb-dib0700 (and UK Freeview from Sandy Heath), I can
successfully capture an audio/video PID pair into a TS file that mplayer
can play back.

Signed-off-by: Peter Hartley <pdh@utter.chaos.org.uk>
Acked-by: Andreas Oberritter <obi@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

2 files changed, 5 insertions, 3 deletions

diff --git a/drivers/media/dvb/dvb-core/dmxdev.c b/drivers/media/dvb/dvb-core/dmxdev.c
index f94bc31e3b33..e7f7aef862a8 100644
--- a/drivers/media/dvb/dvb-core/dmxdev.c
+++ b/drivers/media/dvb/dvb-core/dmxdev.c
@@ -374,7 +374,8 @@ static int dvb_dmxdev_ts_callback(const u8 *buffer1, size_t buffer1_len,
                 return 0;
         }
 
-        if (dmxdevfilter->params.pes.output == DMX_OUT_TAP)
+        if (dmxdevfilter->params.pes.output == DMX_OUT_TAP
+            || dmxdevfilter->params.pes.output == DMX_OUT_TSDEMUX_TAP)
                 buffer = &dmxdevfilter->buffer;
         else
                 buffer = &dmxdevfilter->dev->dvr_buffer;
@@ -618,7 +619,7 @@ static int dvb_dmxdev_filter_start(struct dmxdev_filter *filter)
                 else
                         ts_type = 0;
 
-                if (otype == DMX_OUT_TS_TAP)
+                if (otype == DMX_OUT_TS_TAP || otype == DMX_OUT_TSDEMUX_TAP)
                         ts_type |= TS_PACKET;
 
                 if (otype == DMX_OUT_TAP)
diff --git a/include/linux/dvb/dmx.h b/include/linux/dvb/dmx.h
index c6a2353c4e68..402fb7a8d922 100644
--- a/include/linux/dvb/dmx.h
+++ b/include/linux/dvb/dmx.h
@@ -39,9 +39,10 @@ typedef enum
         DMX_OUT_DECODER, /* Streaming directly to decoder. */
         DMX_OUT_TAP,     /* Output going to a memory buffer */
                          /* (to be retrieved via the read command).*/
-        DMX_OUT_TS_TAP   /* Output multiplexed into a new TS  */
+        DMX_OUT_TS_TAP,  /* Output multiplexed into a new TS  */
                          /* (to be retrieved by reading from the */
                          /* logical DVR device).                 */
+        DMX_OUT_TSDEMUX_TAP /* Like TS_TAP but retrieved from the DMX device */
 } dmx_output_t;