Em Sun, 05 Jan 2014 12:29:11 +0100
Frank Schäfer <fschaefer.oss@xxxxxxxxxxxxxx> escreveu:
> Am 04.01.2014 11:55, schrieb Mauro Carvalho Chehab:
> > Better to first write the GPIOs of the input mux, before initializing
> > the audio.
> Why are you making this change ?
>
> > Signed-off-by: Mauro Carvalho Chehab <m.chehab@xxxxxxxxxxx>
> > ---
> > drivers/media/usb/em28xx/em28xx-video.c | 40 ++++++++++++++++-----------------
> > 1 file changed, 20 insertions(+), 20 deletions(-)
> >
> > diff --git a/drivers/media/usb/em28xx/em28xx-video.c b/drivers/media/usb/em28xx/em28xx-video.c
> > index b767262c642b..328d724a13ea 100644
> > --- a/drivers/media/usb/em28xx/em28xx-video.c
> > +++ b/drivers/media/usb/em28xx/em28xx-video.c
> > @@ -2291,26 +2291,6 @@ static int em28xx_v4l2_init(struct em28xx *dev)
> > em28xx_tuner_setup(dev);
> > em28xx_init_camera(dev);
> >
> > - /* Configure audio */
> > - ret = em28xx_audio_setup(dev);
> > - if (ret < 0) {
> > - em28xx_errdev("%s: Error while setting audio - error [%d]!\n",
> > - __func__, ret);
> > - goto err;
> > - }
> > - if (dev->audio_mode.ac97 != EM28XX_NO_AC97) {
> > - v4l2_ctrl_new_std(hdl, &em28xx_ctrl_ops,
> > - V4L2_CID_AUDIO_MUTE, 0, 1, 1, 1);
> > - v4l2_ctrl_new_std(hdl, &em28xx_ctrl_ops,
> > - V4L2_CID_AUDIO_VOLUME, 0, 0x1f, 1, 0x1f);
> > - } else {
> > - /* install the em28xx notify callback */
> > - v4l2_ctrl_notify(v4l2_ctrl_find(hdl, V4L2_CID_AUDIO_MUTE),
> > - em28xx_ctrl_notify, dev);
> > - v4l2_ctrl_notify(v4l2_ctrl_find(hdl, V4L2_CID_AUDIO_VOLUME),
> > - em28xx_ctrl_notify, dev);
> > - }
> > -
> > /* wake i2c devices */
> > em28xx_wake_i2c(dev);
> >
> > @@ -2356,6 +2336,26 @@ static int em28xx_v4l2_init(struct em28xx *dev)
> >
> > video_mux(dev, 0);
> >
> > + /* Configure audio */
> > + ret = em28xx_audio_setup(dev);
> > + if (ret < 0) {
> > + em28xx_errdev("%s: Error while setting audio - error [%d]!\n",
> > + __func__, ret);
> > + goto err;
> > + }
> > + if (dev->audio_mode.ac97 != EM28XX_NO_AC97) {
> > + v4l2_ctrl_new_std(hdl, &em28xx_ctrl_ops,
> > + V4L2_CID_AUDIO_MUTE, 0, 1, 1, 1);
> > + v4l2_ctrl_new_std(hdl, &em28xx_ctrl_ops,
> > + V4L2_CID_AUDIO_VOLUME, 0, 0x1f, 1, 0x1f);
> > + } else {
> > + /* install the em28xx notify callback */
> > + v4l2_ctrl_notify(v4l2_ctrl_find(hdl, V4L2_CID_AUDIO_MUTE),
> > + em28xx_ctrl_notify, dev);
> > + v4l2_ctrl_notify(v4l2_ctrl_find(hdl, V4L2_CID_AUDIO_VOLUME),
> > + em28xx_ctrl_notify, dev);
> > + }
> > +
> > /* Audio defaults */
> > dev->mute = 1;
> > dev->volume = 0x1f;
> Well, the v4l/core split didn't change the order.
> And if the current order would be wrong, then you would also have to
> call audio_setup() each time the user switches the input.
Maybe this is needed anyway. Btw, there's a bug on xawtv: if you maximize
a window, audio stops playing. I didn't have time yet to identify why.
> So unless you are trying to fix a real bug, I wouldn't change it.
> The current order is sane and we likely could never change it back later
> without risking regressions...
Sometimes, ac97 is not properly detected here with HVR-950. Not sure
what happens. I need to do more tests. Perhaps it happens only on USB 3.0
ports.
In any case, it makes sense to first wake up I2C devices, then to set
the video mux, before start probing for audio, as the audio setting
may depend on the video mux settings.
--
Cheers,
Mauro
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
