Changeset 7561 in vbox for trunk/src/VBox/Devices/Audio

Timestamp:

Mar 25, 2008 7:49:23 PM (17 years ago)

Author:

vboxsync

Message:

audio: multiply master and pcm_out

File:

• trunk/src/VBox/Devices/Audio/audio.c (modified) (4 diffs)

trunk/src/VBox/Devices/Audio/audio.c

@@ -155 +155 @@
 
 #ifdef VBOX
+volume_t sum_out_volume =
+{
+    0,
+    INT_MAX,
+    INT_MAX
+};
+volume_t master_out_volume =
+{
+    0,
+    INT_MAX,
+    INT_MAX
+};
 volume_t pcm_out_volume =
 {
@@ -1009 +1021 @@
         sw->conv (sw->buf, buf, swlim, &sw->vol);
 #else
-        sw->conv (sw->buf, buf, swlim, &pcm_out_volume);
+        sw->conv (sw->buf, buf, swlim, &sum_out_volume);
 #endif
     }
@@ -1866 +1878 @@
         case AUD_MIXER_VOLUME:
             name = "MASTER";
-            vol  = &pcm_out_volume;
+            vol  = &master_out_volume;
             break;
         case AUD_MIXER_PCM:
             name = "PCM_OUT";
+            vol  = &pcm_out_volume;
             break;
         case AUD_MIXER_LINE_IN:
@@ -1882 +1895 @@
     if (vol)
     {
+        uint32_t u32VolumeLeft  = (uint32_t)*lvol;
+        uint32_t u32VolumeRight = (uint32_t)*rvol;
+        /* 0x00..0xff => 0x01..0x100 */
+        if (u32VolumeLeft)
+            u32VolumeLeft++;
+        if (u32VolumeRight)
+            u32VolumeRight++;
         vol->mute  = *mute;
-        vol->l     = ((uint32_t)*lvol) * 0x808080; /* maximum is INT_MAX = 0x7fffffff */
-        vol->r     = ((uint32_t)*rvol) * 0x808080; /* maximum is INT_MAX = 0x7fffffff */
-    }
-#if 0
-    LogRel(("AUDIO: Set '%s' volume to %d%%/%d%%\n", name, (*lvol*100)/255, (*rvol*100)/255l));
-#endif
+        vol->l     = u32VolumeLeft  * 0x800000; /* maximum is 0x80000000 */
+        vol->r     = u32VolumeRight * 0x800000; /* maximum is 0x80000000 */
+    }
+    sum_out_volume.mute = master_out_volume.mute || pcm_out_volume.mute;
+    sum_out_volume.l    = ASMMultU64ByU32DivByU32(master_out_volume.l, pcm_out_volume.l, 0x80000000U);
+    sum_out_volume.r    = ASMMultU64ByU32DivByU32(master_out_volume.r, pcm_out_volume.r, 0x80000000U);
 }