Commit 86ddd96f authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab Committed by Linus Torvalds

[PATCH] v4l: SAA7134 hybrid DVB

- Add new Typhoon DVB-T Cardbus.
- DVB-T support for MD7134 cardbus and the PCI variants
- initial DVB-T support for Lifeview Flydvb-t duo
- DVB-T support for Philips TOUGH reference design
- Don't turn off the xtal output of tda8274/75 in sleep mode
- Let Kconfig decide whether to include frontend-specific code in saa7134-dvb.
- Removed unused structures.
Signed-off-by: default avatarJuergen Orschiedt <jorschiedt@web.de>
Signed-off-by: default avatarMichael Krufky <mkrufky@m1k.net>
Signed-off-by: default avatarHartmut Hackmann <hartmut.hackmann@t-online.de>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 41ef7c1e
......@@ -155,10 +155,6 @@ static struct v4l2_mpeg_compression param_defaults =
.target = 256,
},
#if 0
/* FIXME: size? via S_FMT? */
.video_format = MPEG_VIDEO_FORMAT_D1,
#endif
};
/* ---------------------------------------------------------------------- */
......
This diff is collapsed.
......@@ -18,55 +18,6 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#if 0 /* ndef _SAA6752HS_H */
#define _SAA6752HS_H
enum mpeg_video_bitrate_mode {
MPEG_VIDEO_BITRATE_MODE_VBR = 0, /* Variable bitrate */
MPEG_VIDEO_BITRATE_MODE_CBR = 1, /* Constant bitrate */
MPEG_VIDEO_BITRATE_MODE_MAX
};
enum mpeg_audio_bitrate {
MPEG_AUDIO_BITRATE_256 = 0, /* 256 kBit/sec */
MPEG_AUDIO_BITRATE_384 = 1, /* 384 kBit/sec */
MPEG_AUDIO_BITRATE_MAX
};
enum mpeg_video_format {
MPEG_VIDEO_FORMAT_D1 = 0,
MPEG_VIDEO_FORMAT_2_3_D1 = 1,
MPEG_VIDEO_FORMAT_1_2_D1 = 2,
MPEG_VIDEO_FORMAT_SIF = 3,
MPEG_VIDEO_FORMAT_MAX
};
#define MPEG_VIDEO_TARGET_BITRATE_MAX 27000
#define MPEG_VIDEO_MAX_BITRATE_MAX 27000
#define MPEG_TOTAL_BITRATE_MAX 27000
#define MPEG_PID_MAX ((1 << 14) - 1)
struct mpeg_params {
enum mpeg_video_bitrate_mode video_bitrate_mode;
unsigned int video_target_bitrate;
unsigned int video_max_bitrate; // only used for VBR
enum mpeg_audio_bitrate audio_bitrate;
unsigned int total_bitrate;
unsigned int pmt_pid;
unsigned int video_pid;
unsigned int audio_pid;
unsigned int pcr_pid;
enum mpeg_video_format video_format;
};
#define MPEG_SETPARAMS _IOW('6',100,struct mpeg_params)
#endif // _SAA6752HS_H
/*
* Local variables:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment