b01cd93789
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>
155 lines
3.8 KiB
C
155 lines
3.8 KiB
C
/*
|
|
* dmx.h
|
|
*
|
|
* Copyright (C) 2000 Marcus Metzler <marcus@convergence.de>
|
|
* & Ralph Metzler <ralph@convergence.de>
|
|
* for convergence integrated media GmbH
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public License
|
|
* as published by the Free Software Foundation; either version 2.1
|
|
* of the License, or (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|
*
|
|
*/
|
|
|
|
#ifndef _DVBDMX_H_
|
|
#define _DVBDMX_H_
|
|
|
|
#include <asm/types.h>
|
|
#ifdef __KERNEL__
|
|
#include <linux/time.h>
|
|
#else
|
|
#include <time.h>
|
|
#endif
|
|
|
|
|
|
#define DMX_FILTER_SIZE 16
|
|
|
|
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 */
|
|
/* (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;
|
|
|
|
|
|
typedef enum
|
|
{
|
|
DMX_IN_FRONTEND, /* Input from a front-end device. */
|
|
DMX_IN_DVR /* Input from the logical DVR device. */
|
|
} dmx_input_t;
|
|
|
|
|
|
typedef enum
|
|
{
|
|
DMX_PES_AUDIO0,
|
|
DMX_PES_VIDEO0,
|
|
DMX_PES_TELETEXT0,
|
|
DMX_PES_SUBTITLE0,
|
|
DMX_PES_PCR0,
|
|
|
|
DMX_PES_AUDIO1,
|
|
DMX_PES_VIDEO1,
|
|
DMX_PES_TELETEXT1,
|
|
DMX_PES_SUBTITLE1,
|
|
DMX_PES_PCR1,
|
|
|
|
DMX_PES_AUDIO2,
|
|
DMX_PES_VIDEO2,
|
|
DMX_PES_TELETEXT2,
|
|
DMX_PES_SUBTITLE2,
|
|
DMX_PES_PCR2,
|
|
|
|
DMX_PES_AUDIO3,
|
|
DMX_PES_VIDEO3,
|
|
DMX_PES_TELETEXT3,
|
|
DMX_PES_SUBTITLE3,
|
|
DMX_PES_PCR3,
|
|
|
|
DMX_PES_OTHER
|
|
} dmx_pes_type_t;
|
|
|
|
#define DMX_PES_AUDIO DMX_PES_AUDIO0
|
|
#define DMX_PES_VIDEO DMX_PES_VIDEO0
|
|
#define DMX_PES_TELETEXT DMX_PES_TELETEXT0
|
|
#define DMX_PES_SUBTITLE DMX_PES_SUBTITLE0
|
|
#define DMX_PES_PCR DMX_PES_PCR0
|
|
|
|
|
|
typedef struct dmx_filter
|
|
{
|
|
__u8 filter[DMX_FILTER_SIZE];
|
|
__u8 mask[DMX_FILTER_SIZE];
|
|
__u8 mode[DMX_FILTER_SIZE];
|
|
} dmx_filter_t;
|
|
|
|
|
|
struct dmx_sct_filter_params
|
|
{
|
|
__u16 pid;
|
|
dmx_filter_t filter;
|
|
__u32 timeout;
|
|
__u32 flags;
|
|
#define DMX_CHECK_CRC 1
|
|
#define DMX_ONESHOT 2
|
|
#define DMX_IMMEDIATE_START 4
|
|
#define DMX_KERNEL_CLIENT 0x8000
|
|
};
|
|
|
|
|
|
struct dmx_pes_filter_params
|
|
{
|
|
__u16 pid;
|
|
dmx_input_t input;
|
|
dmx_output_t output;
|
|
dmx_pes_type_t pes_type;
|
|
__u32 flags;
|
|
};
|
|
|
|
typedef struct dmx_caps {
|
|
__u32 caps;
|
|
int num_decoders;
|
|
} dmx_caps_t;
|
|
|
|
typedef enum {
|
|
DMX_SOURCE_FRONT0 = 0,
|
|
DMX_SOURCE_FRONT1,
|
|
DMX_SOURCE_FRONT2,
|
|
DMX_SOURCE_FRONT3,
|
|
DMX_SOURCE_DVR0 = 16,
|
|
DMX_SOURCE_DVR1,
|
|
DMX_SOURCE_DVR2,
|
|
DMX_SOURCE_DVR3
|
|
} dmx_source_t;
|
|
|
|
struct dmx_stc {
|
|
unsigned int num; /* input : which STC? 0..N */
|
|
unsigned int base; /* output: divisor for stc to get 90 kHz clock */
|
|
__u64 stc; /* output: stc in 'base'*90 kHz units */
|
|
};
|
|
|
|
|
|
#define DMX_START _IO('o', 41)
|
|
#define DMX_STOP _IO('o', 42)
|
|
#define DMX_SET_FILTER _IOW('o', 43, struct dmx_sct_filter_params)
|
|
#define DMX_SET_PES_FILTER _IOW('o', 44, struct dmx_pes_filter_params)
|
|
#define DMX_SET_BUFFER_SIZE _IO('o', 45)
|
|
#define DMX_GET_PES_PIDS _IOR('o', 47, __u16[5])
|
|
#define DMX_GET_CAPS _IOR('o', 48, dmx_caps_t)
|
|
#define DMX_SET_SOURCE _IOW('o', 49, dmx_source_t)
|
|
#define DMX_GET_STC _IOWR('o', 50, struct dmx_stc)
|
|
|
|
#endif /*_DVBDMX_H_*/
|