aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2007-08-19 14:03:05 -0400
committerMauro Carvalho Chehab <mchehab@infradead.org>2007-10-09 21:05:47 -0400
commit25e3f8f40ecf61b87a4b6476ea6d00cb5b74628c (patch)
treefcca8ccb0cb85318ee87bf3b24c3b63a1dd5510c /drivers/media/video
parent0989fd2c88a11aa5014b2b348ed51872d14d536d (diff)
V4L/DVB (6059): ivtv: log stereo/bilingual audio modes
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video')
-rw-r--r--drivers/media/video/ivtv/ivtv-ioctl.c14
1 files changed, 12 insertions, 2 deletions
diff --git a/drivers/media/video/ivtv/ivtv-ioctl.c b/drivers/media/video/ivtv/ivtv-ioctl.c
index 2061d82653fc..de866d450ecd 100644
--- a/drivers/media/video/ivtv/ivtv-ioctl.c
+++ b/drivers/media/video/ivtv/ivtv-ioctl.c
@@ -1235,7 +1235,8 @@ int ivtv_v4l2_ioctls(struct ivtv *itv, struct file *filp, unsigned int cmd, void
1235 ivtv_get_input(itv, itv->active_input, &vidin); 1235 ivtv_get_input(itv, itv->active_input, &vidin);
1236 ivtv_get_audio_input(itv, itv->audio_input, &audin); 1236 ivtv_get_audio_input(itv, itv->audio_input, &audin);
1237 IVTV_INFO("Video Input: %s\n", vidin.name); 1237 IVTV_INFO("Video Input: %s\n", vidin.name);
1238 IVTV_INFO("Audio Input: %s\n", audin.name); 1238 IVTV_INFO("Audio Input: %s%s\n", audin.name,
1239 (itv->dualwatch_stereo_mode & ~0x300) == 0x200 ? " (Bilingual)" : "");
1239 if (has_output) { 1240 if (has_output) {
1240 struct v4l2_output vidout; 1241 struct v4l2_output vidout;
1241 struct v4l2_audioout audout; 1242 struct v4l2_audioout audout;
@@ -1247,11 +1248,20 @@ int ivtv_v4l2_ioctls(struct ivtv *itv, struct file *filp, unsigned int cmd, void
1247 "YUV Frames", 1248 "YUV Frames",
1248 "Passthrough", 1249 "Passthrough",
1249 }; 1250 };
1251 static const char * const audio_modes[] = {
1252 "Stereo",
1253 "Left",
1254 "Right",
1255 "Mono",
1256 "Swapped"
1257 };
1250 1258
1251 ivtv_get_output(itv, itv->active_output, &vidout); 1259 ivtv_get_output(itv, itv->active_output, &vidout);
1252 ivtv_get_audio_output(itv, 0, &audout); 1260 ivtv_get_audio_output(itv, 0, &audout);
1253 IVTV_INFO("Video Output: %s\n", vidout.name); 1261 IVTV_INFO("Video Output: %s\n", vidout.name);
1254 IVTV_INFO("Audio Output: %s\n", audout.name); 1262 IVTV_INFO("Audio Output: %s (Stereo/Bilingual: %s/%s)\n", audout.name,
1263 audio_modes[itv->audio_stereo_mode],
1264 audio_modes[itv->audio_bilingual_mode]);
1255 if (mode < 0 || mode > OUT_PASSTHROUGH) 1265 if (mode < 0 || mode > OUT_PASSTHROUGH)
1256 mode = OUT_NONE; 1266 mode = OUT_NONE;
1257 IVTV_INFO("Output Mode: %s\n", output_modes[mode]); 1267 IVTV_INFO("Output Mode: %s\n", output_modes[mode]);