Commit 25e3f8f4 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab

V4L/DVB (6059): ivtv: log stereo/bilingual audio modes

Signed-off-by: default avatarHans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 0989fd2c
...@@ -1235,7 +1235,8 @@ int ivtv_v4l2_ioctls(struct ivtv *itv, struct file *filp, unsigned int cmd, void ...@@ -1235,7 +1235,8 @@ int ivtv_v4l2_ioctls(struct ivtv *itv, struct file *filp, unsigned int cmd, void
ivtv_get_input(itv, itv->active_input, &vidin); ivtv_get_input(itv, itv->active_input, &vidin);
ivtv_get_audio_input(itv, itv->audio_input, &audin); ivtv_get_audio_input(itv, itv->audio_input, &audin);
IVTV_INFO("Video Input: %s\n", vidin.name); IVTV_INFO("Video Input: %s\n", vidin.name);
IVTV_INFO("Audio Input: %s\n", audin.name); IVTV_INFO("Audio Input: %s%s\n", audin.name,
(itv->dualwatch_stereo_mode & ~0x300) == 0x200 ? " (Bilingual)" : "");
if (has_output) { if (has_output) {
struct v4l2_output vidout; struct v4l2_output vidout;
struct v4l2_audioout audout; struct v4l2_audioout audout;
...@@ -1247,11 +1248,20 @@ int ivtv_v4l2_ioctls(struct ivtv *itv, struct file *filp, unsigned int cmd, void ...@@ -1247,11 +1248,20 @@ int ivtv_v4l2_ioctls(struct ivtv *itv, struct file *filp, unsigned int cmd, void
"YUV Frames", "YUV Frames",
"Passthrough", "Passthrough",
}; };
static const char * const audio_modes[] = {
"Stereo",
"Left",
"Right",
"Mono",
"Swapped"
};
ivtv_get_output(itv, itv->active_output, &vidout); ivtv_get_output(itv, itv->active_output, &vidout);
ivtv_get_audio_output(itv, 0, &audout); ivtv_get_audio_output(itv, 0, &audout);
IVTV_INFO("Video Output: %s\n", vidout.name); IVTV_INFO("Video Output: %s\n", vidout.name);
IVTV_INFO("Audio Output: %s\n", audout.name); IVTV_INFO("Audio Output: %s (Stereo/Bilingual: %s/%s)\n", audout.name,
audio_modes[itv->audio_stereo_mode],
audio_modes[itv->audio_bilingual_mode]);
if (mode < 0 || mode > OUT_PASSTHROUGH) if (mode < 0 || mode > OUT_PASSTHROUGH)
mode = OUT_NONE; mode = OUT_NONE;
IVTV_INFO("Output Mode: %s\n", output_modes[mode]); IVTV_INFO("Output Mode: %s\n", output_modes[mode]);
......
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