summaryrefslogtreecommitdiff
path: root/linux/include/media/cx2341x.h
diff options
context:
space:
mode:
authorAndy Walls <awalls@radix.net>2009-01-01 17:02:31 -0500
committerAndy Walls <awalls@radix.net>2009-01-01 17:02:31 -0500
commitd47ee226646d66e244c30d48ea1486919d00755f (patch)
treeb8b09ef6087525e0e3985cd4b8e0a631537bd73d /linux/include/media/cx2341x.h
parent621de87dd60253f07c841241519bde3e5e300015 (diff)
downloadmediapointer-dvb-s2-d47ee226646d66e244c30d48ea1486919d00755f.tar.gz
mediapointer-dvb-s2-d47ee226646d66e244c30d48ea1486919d00755f.tar.bz2
cx18, cx2341x, ivtv: Add AC-3 audio encoding control to cx18
From: Andy Walls <awalls@radix.net> Initial addition of controls to set AC-3 audio encoding for the CX23418 - it does not work yet due to firmware or cx18 driver issues. This change affects the common cx2341x and ivtv modules due to shared structures and common functions. Priority: normal Signed-off-by: Andy Walls <awalls@radix.net>
Diffstat (limited to 'linux/include/media/cx2341x.h')
-rw-r--r--linux/include/media/cx2341x.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/linux/include/media/cx2341x.h b/linux/include/media/cx2341x.h
index 9ec4d5889..2601bc71c 100644
--- a/linux/include/media/cx2341x.h
+++ b/linux/include/media/cx2341x.h
@@ -1,5 +1,5 @@
/*
- cx23415/6 header containing common defines.
+ cx23415/6/8 header containing common defines.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -28,6 +28,8 @@ enum cx2341x_port {
enum cx2341x_cap {
CX2341X_CAP_HAS_SLICED_VBI = 1 << 0,
CX2341X_CAP_HAS_TS = 1 << 1,
+ CX2341X_CAP_HAS_AC3 = 1 << 2,
+ CX2341X_CAP_HAS_LPCM = 1 << 3,
};
struct cx2341x_mpeg_params {
@@ -47,11 +49,12 @@ struct cx2341x_mpeg_params {
enum v4l2_mpeg_audio_sampling_freq audio_sampling_freq;
enum v4l2_mpeg_audio_encoding audio_encoding;
enum v4l2_mpeg_audio_l2_bitrate audio_l2_bitrate;
+ enum v4l2_mpeg_audio_ac3_bitrate audio_ac3_bitrate;
enum v4l2_mpeg_audio_mode audio_mode;
enum v4l2_mpeg_audio_mode_extension audio_mode_extension;
enum v4l2_mpeg_audio_emphasis audio_emphasis;
enum v4l2_mpeg_audio_crc audio_crc;
- u16 audio_properties;
+ u32 audio_properties;
u16 audio_mute;
/* video */