Changeset 55387 in vbox

Timestamp:

Apr 22, 2015 4:49:20 PM (10 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

99726

Message:

Audio: Keep track of sink volume, drop unused routines.

Location:

trunk/src/VBox/Devices/Audio

Files:

• AudioMixBuffer.cpp (modified) (1 diff)
• AudioMixer.cpp (modified) (7 diffs)

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

@@ -1139 +1139 @@
 
     pMixBuf->Volume.fMuted = pVol->fMuted;
-    pMixBuf->Volume.uLeft  = (UINT64_C(0x100000000) * pVol->uLeft) / 255;
-    pMixBuf->Volume.uRight = (UINT64_C(0x100000000) * pVol->uRight) / 255;
+    pMixBuf->Volume.uLeft  = (UINT64_C(0x80000000) * pVol->uLeft) / 255;
+    pMixBuf->Volume.uRight = (UINT64_C(0x80000000) * pVol->uRight) / 255;
 
     LogFlowFunc(("\t-> lVol=%RU32, rVol=%RU32\n", pMixBuf->Volume.uLeft, pMixBuf->Volume.uRight));

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

@@ -38 +38 @@
 
 
-static int audioMixerUpdateSinkVolume(PAUDMIXSINK pSink, const PPDMAUDIOVOLUME pVolMaster, const PPDMAUDIOVOLUME pVolSink);
+static int audioMixerUpdateSinkVolume(PAUDMIXSINK pSink, const PPDMAUDIOVOLUME pVolMaster);
 
 
@@ -276 +276 @@
     RTListForEach(&pMixer->lstSinks, pSink, AUDMIXSINK, Node)
     {
-        int rc2 = audioMixerUpdateSinkVolume(pSink, &pMixer->VolMaster, &pSink->Volume);
+        int rc2 = audioMixerUpdateSinkVolume(pSink, &pMixer->VolMaster);
         AssertRC(rc2);
     }
@@ -411 +411 @@
 }
 
-static inline PDMAUDIOVOLUME audioMixerVolCalc(PPDMAUDIOVOLUME pVol)
-{
-    uint32_t u32VolumeLeft  = pVol->uLeft;
-    uint32_t u32VolumeRight = pVol->uRight;
-    /* 0x00..0xff => 0x01..0x100 */
-    if (u32VolumeLeft)
-        u32VolumeLeft++;
-    if (u32VolumeRight)
-        u32VolumeRight++;
-
-    PDMAUDIOVOLUME volOut;
-    volOut.fMuted = pVol->fMuted;
-    volOut.uLeft  = u32VolumeLeft  * 0x80000000; /* Maximum is 0x80000000 */
-    volOut.uRight = u32VolumeRight * 0x80000000; /* Maximum is 0x80000000 */
-
-    return volOut;
-}
-
-static inline PDMAUDIOVOLUME audioMixerVolMix(const PPDMAUDIOVOLUME pVolMaster, PPDMAUDIOVOLUME pVol)
-{
-    PDMAUDIOVOLUME volOut;
-    volOut.fMuted = pVolMaster->fMuted || pVol->fMuted;
-    volOut.uLeft  = ASMMultU64ByU32DivByU32(pVolMaster->uLeft,  pVol->uLeft,  0x80000000U); /* Maximum is 0x80000000U */
-    volOut.uRight = ASMMultU64ByU32DivByU32(pVolMaster->uRight, pVol->uRight, 0x80000000U); /* Maximum is 0x80000000U */
-
-    LogFlowFunc(("pMaster=%p, fMuted=%RTbool, lVol=%RU32, rVol=%RU32\n",
-                 pVolMaster, pVolMaster->fMuted, pVolMaster->uLeft, pVolMaster->uRight));
-    LogFlowFunc(("pVol=%p, fMuted=%RTbool, lVol=%RU32, rVol=%RU32 => fMuted=%RTbool, lVol=%RU32, rVol=%RU32\n",
-                 pVol, pVol->fMuted, pVol->uLeft, pVol->uRight, volOut.fMuted, volOut.uLeft, volOut.uRight));
-
-    return volOut;
-}
-
-static int audioMixerUpdateSinkVolume(PAUDMIXSINK pSink, const PPDMAUDIOVOLUME pVolMaster, const PPDMAUDIOVOLUME pVolSink)
+static int audioMixerUpdateSinkVolume(PAUDMIXSINK pSink, const PPDMAUDIOVOLUME pVolMaster)
 {
     AssertPtrReturn(pSink,      VERR_INVALID_POINTER);
     AssertPtrReturn(pVolMaster, VERR_INVALID_POINTER);
-    AssertPtrReturn(pVolSink,   VERR_INVALID_POINTER);
 
     LogFlowFunc(("Master fMuted=%RTbool, lVol=%RU32, rVol=%RU32\n",
@@ -458 +424 @@
 
     PDMAUDIOVOLUME volSink;
-    volSink.fMuted  = pVolMaster->fMuted || pVolSink->fMuted;
-    volSink.uLeft   = (pVolSink->uLeft  * pVolMaster->uLeft)  / UINT8_MAX;
-    volSink.uRight  = (pVolSink->uRight * pVolMaster->uRight) / UINT8_MAX;
+    volSink.fMuted  = pVolMaster->fMuted || pSink->Volume.fMuted;
+    volSink.uLeft   = (pSink->Volume.uLeft  * pVolMaster->uLeft)  / UINT8_MAX;
+    volSink.uRight  = (pSink->Volume.uRight * pVolMaster->uRight) / UINT8_MAX;
 
     LogFlowFunc(("\t-> fMuted=%RTbool, lVol=%RU32, rVol=%RU32\n",
@@ -480 +446 @@
 }
 
+/** Set the master volume of the mixer. */
 int audioMixerSetMasterVolume(PAUDIOMIXER pMixer, PPDMAUDIOVOLUME pVol)
 {
@@ -485 +452 @@
     AssertPtrReturn(pVol,   VERR_INVALID_POINTER);
 
-    pMixer->VolMaster = *pVol; //= audioMixerVolCalc(pVol);
+    pMixer->VolMaster = *pVol;
 
     LogFlowFunc(("%s: lVol=%RU32, rVol=%RU32 => fMuted=%RTbool, lVol=%RU32, rVol=%RU32\n",
@@ -495 +462 @@
 }
 
+/** Set the volume of an individual sink. */
 int audioMixerSetSinkVolume(PAUDMIXSINK pSink, PPDMAUDIOVOLUME pVol)
 {
     AssertPtrReturn(pSink, VERR_INVALID_POINTER);
     AssertPtrReturn(pVol,  VERR_INVALID_POINTER);
+    AssertPtr(pSink->pParent);
 
     LogFlowFunc(("%s: fMuted=%RTbool, lVol=%RU32, rVol=%RU32\n", pSink->pszName, pVol->fMuted, pVol->uLeft, pVol->uRight));
 
-    AssertPtr(pSink->pParent);
-    return audioMixerUpdateSinkVolume(pSink, &pSink->pParent->VolMaster, pVol);
-}
-
+    pSink->Volume = *pVol;
+
+    return audioMixerUpdateSinkVolume(pSink, &pSink->pParent->VolMaster);
+}