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

Timestamp:

Aug 17, 2015 12:11:08 PM (9 years ago)

Author:

vboxsync

Message:

Audio: Some renaming.

Location:

trunk/src/VBox/Devices/Audio

Files:

• DrvAudio.cpp (modified) (3 diffs)
• DrvAudio.h (modified) (1 diff)
• DrvHostDSound.cpp (modified) (1 diff)
• DrvHostOSSAudio.cpp (modified) (1 diff)

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

@@ -310 +310 @@
 }
 
-void audio_pcm_info_clear_buf(PPDMPCMPROPS pPCMInfo, void *pvBuf, int len)
-{
-    if (!len)
+void drvAudioClearBuf(PPDMPCMPROPS pPCMInfo, void *pvBuf, size_t cbBuf)
+{
+    AssertPtrReturnVoid(pPCMInfo);
+    AssertPtrReturnVoid(pvBuf);
+
+    if (!cbBuf)
         return;
 
     if (pPCMInfo->fSigned)
     {
-        memset (pvBuf, 0, len << pPCMInfo->cShift);
+        memset(pvBuf, 0, cbBuf << pPCMInfo->cShift);
     }
     else
@@ -325 +328 @@
 
         case 8:
-            memset (pvBuf, 0x80, len << pPCMInfo->cShift);
+            memset(pvBuf, 0x80, cbBuf << pPCMInfo->cShift);
             break;
 
         case 16:
-            {
-                int i;
-                uint16_t *p = (uint16_t *)pvBuf;
-                int shift = pPCMInfo->cChannels - 1;
-                short s = INT16_MAX;
-
-                if (pPCMInfo->fSwapEndian)
-                    s = RT_BSWAP_U16(s);
-
-                for (i = 0; i < len << shift; i++)
-                    p[i] = s;
-            }
+        {
+            int i;
+            uint16_t *p = (uint16_t *)pvBuf;
+            int shift = pPCMInfo->cChannels - 1;
+            short s = INT16_MAX;
+
+            if (pPCMInfo->fSwapEndian)
+                s = RT_BSWAP_U16(s);
+
+            for (i = 0; i < cbBuf << shift; i++)
+                p[i] = s;
+
             break;
+        }
 
         case 32:
-            {
-                int i;
-                uint32_t *p = (uint32_t *)pvBuf;
-                int shift = pPCMInfo->cChannels - 1;
-                int32_t s = INT32_MAX;
-
-                if (pPCMInfo->fSwapEndian)
-                    s = RT_BSWAP_U32(s);
-
-                for (i = 0; i < len << shift; i++)
-                    p[i] = s;
-            }
+        {
+            int i;
+            uint32_t *p = (uint32_t *)pvBuf;
+            int shift = pPCMInfo->cChannels - 1;
+            int32_t s = INT32_MAX;
+
+            if (pPCMInfo->fSwapEndian)
+                s = RT_BSWAP_U32(s);
+
+            for (i = 0; i < cbBuf << shift; i++)
+                p[i] = s;
+
             break;
+        }
 
         default:
-            LogFlowFunc(("audio_pcm_info_clear_buf: invalid bits %d\n", pPCMInfo->cBits));
+            AssertMsgFailed(("Invalid bits: %RU8\n", pPCMInfo->cBits));
             break;
         }
@@ -1479 +1484 @@
                     }
 
-                    pHstStrmOut->fPendingDisable = cGstStrmsActive == 1;
+                    pHstStrmOut->fPendingDisable = cGstStrmsActive >= 1;
                 }
             }

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

@@ -145 +145 @@
 /* Common functions between DrvAudio and backends (host audio drivers). */
 int  drvAudioAttachCapture(PDRVAUDIO pDrvAudio, PPDMAUDIOHSTSTRMOUT pHstStrmOut);
+void drvAudioClearBuf(PPDMPCMPROPS pPCMInfo, void *pvBuf, size_t cbBuf);
 void drvAudioDetachCapture(PPDMAUDIOHSTSTRMOUT pHstStrmOut);
 uint32_t drvAudioHstOutSamplesLive(PPDMAUDIOHSTSTRMOUT pHstStrmOut, uint32_t *pcStreamsLive);
 
-void audio_pcm_info_clear_buf(PPDMPCMPROPS pPCMInfo, void *pvBuf, int len);
 
 typedef struct fixed_settings

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

@@ -498 +498 @@
 
         if (pv1 && len1)
-            audio_pcm_info_clear_buf(&pDSoundStrmOut->strmOut.Props, pv1, len1);
+            drvAudioClearBuf(&pDSoundStrmOut->strmOut.Props, pv1, len1);
 
         if (pv2 && len2)
-            audio_pcm_info_clear_buf(&pDSoundStrmOut->strmOut.Props, pv2, len2);
+            drvAudioClearBuf(&pDSoundStrmOut->strmOut.Props, pv2, len2);
 
         dsoundUnlockOutput(pDSoundStrmOut->pDSB, pv1, pv2, cb1, cb2);

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

@@ -353 +353 @@
         case PDMAUDIOSTREAMCMD_ENABLE:
         {
-            audio_pcm_info_clear_buf(&pHstStrmOut->Props,
-                                     pThisStrmOut->pvPCMBuf, AudioMixBufSize(&pHstStrmOut->MixBuf));
+            drvAudioClearBuf(&pHstStrmOut->Props,
+                             pThisStrmOut->pvPCMBuf, AudioMixBufSize(&pHstStrmOut->MixBuf));
 
             mask = PCM_ENABLE_OUTPUT;