aboutsummaryrefslogtreecommitdiffstats
path: root/include/media/cx2341x.h
diff options
context:
space:
mode:
authorAndy Walls <awalls@radix.net>2009-01-01 19:02:31 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-03-30 12:42:24 -0300
commit0d82fe801d7c6d8cb8987e66b570f6decde9e235 (patch)
treec161730acec942f8474516d5aa7587d6d64e2fd9 /include/media/cx2341x.h
parent50299994181b835e5a6ee2882df2ee07e7fb4491 (diff)
downloadmrst-s0i3-test-0d82fe801d7c6d8cb8987e66b570f6decde9e235.tar.gz
mrst-s0i3-test-0d82fe801d7c6d8cb8987e66b570f6decde9e235.tar.xz
mrst-s0i3-test-0d82fe801d7c6d8cb8987e66b570f6decde9e235.zip
V4L/DVB (10276): cx18, cx2341x, ivtv: Add AC-3 audio encoding control to cx18
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. Signed-off-by: Andy Walls <awalls@radix.net> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'include/media/cx2341x.h')
-rw-r--r--include/media/cx2341x.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/include/media/cx2341x.h b/include/media/cx2341x.h
index 9ec4d5889ef..2601bc71c51 100644
--- a/include/media/cx2341x.h
+++ b/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 */