Changeset 58372 in vbox for trunk/src/VBox

Timestamp:

Oct 22, 2015 10:48:08 AM (9 years ago)

Author:

vboxsync

Message:

DrvHostNullAudio.cpp: Cleanup.

File:

• trunk/src/VBox/Devices/Audio/DrvHostNullAudio.cpp (modified) (4 diffs)

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

@@ -55 +55 @@
 {
     /** Note: Always must come first! */
-    PDMAUDIOHSTSTRMOUT hw;
-    uint64_t u64TicksLast;
-    uint64_t csPlayBuffer;
-    uint8_t *pu8PlayBuffer;
-} NULLAUDIOSTREAMOUT;
+    PDMAUDIOHSTSTRMOUT streamOut;
+    uint64_t           u64TicksLast;
+    uint64_t           csPlayBuffer;
+    uint8_t           *pu8PlayBuffer;
+} NULLAUDIOSTREAMOUT, *PNULLAUDIOSTREAMOUT;
 
 typedef struct NULLAUDIOSTREAMIN
 {
     /** Note: Always must come first! */
-    PDMAUDIOHSTSTRMIN hw;
-} NULLAUDIOSTREAMIN;
+    PDMAUDIOHSTSTRMIN  streamIn;
+} NULLAUDIOSTREAMIN, *PNULLAUDIOSTREAMIN;
 
 /**
@@ -132 +132 @@
     if (RT_SUCCESS(rc))
     {
-        NULLAUDIOSTREAMOUT *pNullStrmOut = (NULLAUDIOSTREAMOUT *)pHstStrmOut;
-        pNullStrmOut->u64TicksLast = 0;
-        pNullStrmOut->csPlayBuffer = _1K;
+        PNULLAUDIOSTREAMOUT pNullStrmOut = (PNULLAUDIOSTREAMOUT)pHstStrmOut;
+        pNullStrmOut->u64TicksLast  = 0;
+        pNullStrmOut->csPlayBuffer  = _1K;
         pNullStrmOut->pu8PlayBuffer = (uint8_t *)RTMemAlloc(_1K << pHstStrmOut->Props.cShift);
         if (pNullStrmOut->pu8PlayBuffer)
@@ -161 +161 @@
 {
     PDRVHOSTNULLAUDIO pDrv = RT_FROM_MEMBER(pInterface, DRVHOSTNULLAUDIO, IHostAudio);
-    NULLAUDIOSTREAMOUT *pNullStrmOut = (NULLAUDIOSTREAMOUT *)pHstStrmOut;
+    PNULLAUDIOSTREAMOUT pNullStrmOut = (PNULLAUDIOSTREAMOUT)pHstStrmOut;
 
     /* Consume as many samples as would be played at the current frequency since last call. */
-    uint32_t csLive = drvAudioHstOutSamplesLive(pHstStrmOut);
-    uint64_t u64TicksNow = PDMDrvHlpTMGetVirtualTime(pDrv->pDrvIns);
+    uint32_t csLive          = drvAudioHstOutSamplesLive(pHstStrmOut);
+    uint64_t u64TicksNow     = PDMDrvHlpTMGetVirtualTime(pDrv->pDrvIns);
     uint64_t u64TicksElapsed = u64TicksNow  - pNullStrmOut->u64TicksLast;
-    uint64_t u64TicksFreq = PDMDrvHlpTMGetVirtualFreq(pDrv->pDrvIns);
+    uint64_t u64TicksFreq    = PDMDrvHlpTMGetVirtualFreq(pDrv->pDrvIns);
 
     /* Remember when samples were consumed. */
     pNullStrmOut->u64TicksLast = u64TicksNow;
 
-    /* Minimize the rounding error by adding 0.5: samples = int((u64TicksElapsed * samplesFreq) / u64TicksFreq + 0.5).
+    /*
+     * Minimize the rounding error by adding 0.5: samples = int((u64TicksElapsed * samplesFreq) / u64TicksFreq + 0.5).
      * If rounding is not taken into account then the playback rate will be consistently lower that expected.
      */
@@ -230 +231 @@
 static DECLCALLBACK(int) drvHostNullAudioFiniOut(PPDMIHOSTAUDIO pInterface, PPDMAUDIOHSTSTRMOUT pHstStrmOut)
 {
-    NULLAUDIOSTREAMOUT *pNullStrmOut = (NULLAUDIOSTREAMOUT *)pHstStrmOut;
-    RTMemFree(pNullStrmOut->pu8PlayBuffer);
+    PNULLAUDIOSTREAMOUT pNullStrmOut = (PNULLAUDIOSTREAMOUT)pHstStrmOut;
+    if (   pNullStrmOut
+        && pNullStrmOut->pu8PlayBuffer)
+    {
+        RTMemFree(pNullStrmOut->pu8PlayBuffer);
+    }
     return VINF_SUCCESS;
 }