Changeset 55404 in vbox

Timestamp:

Apr 23, 2015 10:53:41 AM (9 years ago)

Author:

vboxsync

Message:

HDA: Set the appropriate sink volume rather than the master.

Location:

trunk/src/VBox/Devices/Audio

Files:

• DevIchHda.cpp (modified) (2 diffs)
• DevIchHdaCodec.cpp (modified) (7 diffs)
• DevIchHdaCodec.h (modified) (1 diff)

trunk/src/VBox/Devices/Audio/DevIchHda.cpp

@@ -2516 +2516 @@
     }
 
-    PDMAUDIOVOLUME vol = { false, 255, 255 };
-    audioMixerSetSinkVolume(pThis->pSinkOutput, &vol);
-
     LogFlowFuncLeaveRC(rc);
     return rc;
 }
 
-static DECLCALLBACK(int) hdaSetVolume(PHDASTATE pThis,
+static DECLCALLBACK(int) hdaSetVolume(PHDASTATE pThis, ENMSOUNDSOURCE enmSource,
                                       bool fMute, uint8_t uVolLeft, uint8_t uVolRight)
 {
-    int rc = VINF_SUCCESS;
-
-    PDMAUDIOVOLUME vol = { fMute, uVolLeft, uVolRight };
-    audioMixerSetMasterVolume(pThis->pMixer, &vol);
+    int             rc = VINF_SUCCESS;
+    PDMAUDIOVOLUME  vol = { fMute, uVolLeft, uVolRight };
+    PAUDMIXSINK     pSink;
+
+    /* Convert the audio source to corresponding sink. */
+    switch (enmSource) {
+    case PO_INDEX:
+        pSink = pThis->pSinkOutput;
+        break;
+    case PI_INDEX:
+        pSink = pThis->pSinkLineIn;
+        break;
+    case MC_INDEX:
+        pSink = pThis->pSinkMicIn;
+        break;
+    default:
+        AssertFailedReturn(VERR_INVALID_PARAMETER);
+    }
+
+    /* Set the volume. Codec already converted it to the correct range. */
+    audioMixerSetSinkVolume(pSink, &vol);
 
     LogFlowFuncLeaveRC(rc);
@@ -3868 +3882 @@
             rc = audioMixerAddSink(pThis->pMixer, "[Recording] Microphone In",
                                    AUDMIXSINKDIR_INPUT, &pThis->pSinkMicIn);
+            AssertRC(rc);
+
+            /* There is no master volume control. Set the master to max. */
+            PDMAUDIOVOLUME vol = { false, 255, 255 };
+            rc = audioMixerSetMasterVolume(pThis->pMixer, &vol);
             AssertRC(rc);
         }

trunk/src/VBox/Devices/Audio/DevIchHdaCodec.cpp

@@ -1174 +1174 @@
 {
     uint32_t dir = AMPLIFIER_OUT;
+    ENMSOUNDSOURCE enmSrc;
     switch (mt)
     {
 #ifdef VBOX_WITH_PDM_AUDIO_DRIVER
-        case PDMAUDIOMIXERCTL_VOLUME:
         case PDMAUDIOMIXERCTL_PCM:
+            enmSrc = PO_INDEX;
 #else
         case AUD_MIXER_VOLUME:
@@ -1187 +1188 @@
 #ifdef VBOX_WITH_PDM_AUDIO_DRIVER
         case PDMAUDIOMIXERCTL_LINE_IN:
+            enmSrc = PI_INDEX;
 #else
         case AUD_MIXER_LINE_IN:
@@ -1214 +1216 @@
 #ifdef VBOX_WITH_PDM_AUDIO_DRIVER
     /** @todo In SetVolume no passing audmixerctl_in as its not used in DrvAudio.cpp. */
-    pThis->pfnSetVolume(pThis->pHDAState, RT_BOOL(mute), lVol, rVol);
+    pThis->pfnSetVolume(pThis->pHDAState, enmSrc, RT_BOOL(mute), lVol, rVol);
 #else
     AUD_set_volume(mt, &mute, &lVol, &rVol);
@@ -1373 +1375 @@
         /** @todo Fix ID of u8DacLineOut! */
 #ifdef VBOX_WITH_PDM_AUDIO_DRIVER
-        hdaCodecToAudVolume(pThis, pAmplifier, PDMAUDIOMIXERCTL_VOLUME);
+        hdaCodecToAudVolume(pThis, pAmplifier, PDMAUDIOMIXERCTL_PCM);
 #else
         hdaCodecToAudVolume(pAmplifier, AUD_MIXER_VOLUME);
@@ -2415 +2417 @@
     if (hdaCodecIsDacNode(pThis, pThis->u8DacLineOut))
 #ifdef VBOX_WITH_PDM_AUDIO_DRIVER
-        hdaCodecToAudVolume(pThis, &pThis->paNodes[pThis->u8DacLineOut].dac.B_params, PDMAUDIOMIXERCTL_VOLUME);
+        hdaCodecToAudVolume(pThis, &pThis->paNodes[pThis->u8DacLineOut].dac.B_params, PDMAUDIOMIXERCTL_PCM);
 #else
         hdaCodecToAudVolume(&pThis->paNodes[pThis->u8DacLineOut].dac.B_params, AUD_MIXER_VOLUME);
@@ -2421 +2423 @@
     else if (hdaCodecIsSpdifOutNode(pThis, pThis->u8DacLineOut))
 #ifdef VBOX_WITH_PDM_AUDIO_DRIVER
-        hdaCodecToAudVolume(pThis, &pThis->paNodes[pThis->u8DacLineOut].spdifout.B_params, PDMAUDIOMIXERCTL_VOLUME);
+        hdaCodecToAudVolume(pThis, &pThis->paNodes[pThis->u8DacLineOut].spdifout.B_params, PDMAUDIOMIXERCTL_PCM);
     hdaCodecToAudVolume(pThis, &pThis->paNodes[pThis->u8AdcVolsLineIn].adcvol.B_params, PDMAUDIOMIXERCTL_LINE_IN);
 #else
@@ -2504 +2506 @@
 
 #ifdef VBOX_WITH_PDM_AUDIO_DRIVER
-    hdaCodecToAudVolume(pThis, &pThis->paNodes[pThis->u8DacLineOut].dac.B_params, PDMAUDIOMIXERCTL_VOLUME);
+    hdaCodecToAudVolume(pThis, &pThis->paNodes[pThis->u8DacLineOut].dac.B_params, PDMAUDIOMIXERCTL_PCM);
     hdaCodecToAudVolume(pThis, &pThis->paNodes[pThis->u8AdcVolsLineIn].adcvol.B_params, PDMAUDIOMIXERCTL_LINE_IN);
 

trunk/src/VBox/Devices/Audio/DevIchHdaCodec.h

@@ -116 +116 @@
     DECLR3CALLBACKMEMBER(int, pfnOpenIn, (PHDASTATE pThis, const char *pszName, PDMAUDIORECSOURCE enmRecSource, PPDMAUDIOSTREAMCFG pCfg));
     DECLR3CALLBACKMEMBER(int, pfnOpenOut, (PHDASTATE pThis, const char *pszName, PPDMAUDIOSTREAMCFG pCfg));
-    DECLR3CALLBACKMEMBER(int, pfnSetVolume, (PHDASTATE pThis, bool fMute, uint8_t uVolLeft, uint8_t uVolRight));
+    DECLR3CALLBACKMEMBER(int, pfnSetVolume, (PHDASTATE pThis, ENMSOUNDSOURCE enmSource, bool fMute, uint8_t uVolLeft, uint8_t uVolRight));
 #else
     QEMUSoundCard           card;