Mercurial > mplayer.hg
diff libmpdemux/tvi_v4l.c @ 7070:aaac9080b8a3
v4l capture update by Jindrich Makovicka <makovick@kmlinux.fjfi.cvut.cz>
some silly bugs slipped through.. here is the fix
| author | arpi |
|---|---|
| date | Thu, 22 Aug 2002 23:05:58 +0000 |
| parents | 2e5c07262861 |
| children | a193df8b275b |
line wrap: on
line diff
--- a/libmpdemux/tvi_v4l.c Thu Aug 22 23:03:51 2002 +0000 +++ b/libmpdemux/tvi_v4l.c Thu Aug 22 23:05:58 2002 +0000 @@ -298,7 +298,6 @@ ioctl(priv->video_fd, VIDIOCSAUDIO, &priv->audio[i]); } - priv->audio[i].audio = i; if (ioctl(priv->video_fd, VIDIOCGAUDIO, &priv->audio[i]) == -1) { mp_msg(MSGT_TV, MSGL_ERR, "ioctl get audio failed: %s\n", strerror(errno)); @@ -338,13 +337,6 @@ if (tv_param_immediate == 1) tv_param_noaudio = 1; - if (!tv_param_noaudio) { - } - - if (priv->audio_device) { - audio_in_set_device(&priv->audio_in, priv->audio_device); - } - priv->video_ringbuffer = NULL; priv->video_timebuffer = NULL; priv->audio_ringbuffer = NULL; @@ -477,6 +469,10 @@ audio_in_init(&priv->audio_in, AUDIO_IN_OSS); #endif + if (priv->audio_device) { + audio_in_set_device(&priv->audio_in, priv->audio_device); + } + if (tv_param_audio_id < priv->capability.audios) priv->audio_id = tv_param_audio_id; else @@ -704,6 +700,12 @@ if (priv->audio[priv->audio_id].volume <= 0) priv->audio[priv->audio_id].volume = 100; priv->audio[priv->audio_id].flags &= ~VIDEO_AUDIO_MUTE; + mp_msg(MSGT_TV, MSGL_V, "Starting audio capture\n"); + mp_msg(MSGT_TV, MSGL_V, "id=%d volume=%d bass=%d treble=%d balance=%d mode=%s\n", + priv->audio_id, + priv->audio[priv->audio_id].volume, priv->audio[priv->audio_id].bass, priv->audio[priv->audio_id].treble, + priv->audio[priv->audio_id].balance, audio_mode2name[priv->audio[priv->audio_id].mode]); + mp_msg(MSGT_TV, MSGL_V, " channels: %d\n", priv->audio_channels[priv->audio_id]); ioctl(priv->video_fd, VIDIOCSAUDIO, &priv->audio[priv->audio_id]); /* launch capture threads */