Changeset 89128 in vbox for trunk/src/VBox

Timestamp:

May 17, 2021 11:31:36 PM (4 years ago)

Author:

vboxsync

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

144469

Message:

DrvHostAudioWasApi: A few minor fixes. bugref:9890

File:

• trunk/src/VBox/Devices/Audio/DrvHostAudioWasApi.cpp (modified) (9 diffs)

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

@@ -294 +294 @@
     static RTSTRTUPLE const s_aEnable[2] =
     {
-        RT_STR_TUPLE("DISABLED"),
-        RT_STR_TUPLE("ENABLED ")
+        { RT_STR_TUPLE("DISABLED") },
+        { RT_STR_TUPLE("ENABLED ") },
     };
     PCRTSTRTUPLE pTuple = &s_aEnable[pStreamWas->fEnabled];
@@ -303 +303 @@
     static RTSTRTUPLE const s_aStarted[2] =
     {
-        RT_STR_TUPLE(" STOPPED"),
-        RT_STR_TUPLE(" STARTED")
+        { RT_STR_TUPLE(" STOPPED") },
+        { RT_STR_TUPLE(" STARTED") },
     };
     pTuple = &s_aStarted[pStreamWas->fStarted];
@@ -312 +312 @@
     static RTSTRTUPLE const s_aDraining[2] =
     {
-        RT_STR_TUPLE(""),
-        RT_STR_TUPLE(" DRAINING")
+        { RT_STR_TUPLE("")          },
+        { RT_STR_TUPLE(" DRAINING") },
     };
     pTuple = &s_aDraining[pStreamWas->fDraining];
@@ -319 +319 @@
     off += pTuple->cch;
 
+    Assert(off < sizeof(pStreamCA->szStatus));
     pStreamWas->szStatus[off] = '\0';
     return pStreamWas->szStatus;
@@ -2126 +2127 @@
 
     /*
-     * We will not stop a draining output stream, otherwise the actions are the same here.
+     * Always try stop it (draining or no).
      */
     pStreamWas->fEnabled         = false;
@@ -2250 +2251 @@
         if (!pStreamWas->fDraining)
         {
-            if (pStreamWas->fStarted)
+            uint64_t const msNow           = RTTimeMilliTS();
+            uint64_t       msDrainDeadline = 0;
+            UINT32         cFramesPending  = 0;
+            HRESULT hrc = pStreamWas->pDevCfg->pIAudioClient->GetCurrentPadding(&cFramesPending);
+            if (SUCCEEDED(hrc))
+                msDrainDeadline = msNow
+                                + PDMAudioPropsFramesToMilli(&pStreamWas->Cfg.Props,
+                                                             RT_MIN(cFramesPending,
+                                                                    pStreamWas->Cfg.Backend.cFramesBufferSize * 2))
+                                + 1 /*fudge*/;
+            else
             {
-                uint64_t const msNow           = RTTimeMilliTS();
-                uint64_t       msDrainDeadline = 0;
-                UINT32         cFramesPending  = 0;
-                HRESULT hrc = pStreamWas->pDevCfg->pIAudioClient->GetCurrentPadding(&cFramesPending);
-                if (SUCCEEDED(hrc))
-                    msDrainDeadline = msNow
-                                    + PDMAudioPropsFramesToMilli(&pStreamWas->Cfg.Props,
-                                                                 RT_MIN(cFramesPending,
-                                                                        pStreamWas->Cfg.Backend.cFramesBufferSize * 2))
-                                    + 1 /*fudge*/;
-                else
-                {
-                    msDrainDeadline = msNow;
-                    LogRelMax(64, ("WasAPI: GetCurrentPadding fail on '%s' when starting draining: %Rhrc\n",
-                                   pStreamWas->Cfg.szName, hrc));
-                }
-                pStreamWas->msDrainDeadline = msDrainDeadline;
-                pStreamWas->fDraining       = true;
+                msDrainDeadline = msNow;
+                LogRelMax(64, ("WasAPI: GetCurrentPadding fail on '%s' when starting draining: %Rhrc\n",
+                               pStreamWas->Cfg.szName, hrc));
             }
-            else
-                LogFlowFunc(("Drain requested for '%s', but not started playback...\n", pStreamWas->Cfg.szName));
+            pStreamWas->msDrainDeadline = msDrainDeadline;
+            pStreamWas->fDraining       = true;
         }
         else
@@ -2278 +2274 @@
     }
     else
+    {
+        LogFlowFunc(("Drain requested for '%s', but not started playback...\n", pStreamWas->Cfg.szName));
         AssertStmt(!pStreamWas->fDraining, pStreamWas->fDraining = false);
+    }
     RTCritSectLeave(&pStreamWas->CritSect);
 
@@ -2626 +2625 @@
         rc = VINF_SUCCESS;
     }
-    LogFlowFunc(("@%#RX64: cbWritten=%RU32 cMsDelta=%RU64 (%RU64 -> %RU64) {%s}\n", pStreamWas->offInternal, cbWritten,
+    LogFlowFunc(("@%#RX64: rc=%Rrc cbWritten=%RU32 cMsDelta=%RU64 (%RU64 -> %RU64) {%s}\n", pStreamWas->offInternal, rc, cbWritten,
                  msPrev ? msNow - msPrev : 0, msPrev, pStreamWas->msLastTransfer, drvHostWasStreamStatusString(pStreamWas) ));
-    return VINF_SUCCESS;
+    return rc;
 }
 
@@ -2774 +2773 @@
         rc = VINF_SUCCESS;
     }
-    LogFlowFunc(("@%#RX64: cbRead=%RU32 cMsDelta=%RU64 (%RU64 -> %RU64) {%s}\n", pStreamWas->offInternal, cbRead,
+    LogFlowFunc(("@%#RX64: rc=%Rrc cbRead=%RU32 cMsDelta=%RU64 (%RU64 -> %RU64) {%s}\n", pStreamWas->offInternal, rc, cbRead,
                  msPrev ? msNow - msPrev : 0, msPrev, pStreamWas->msLastTransfer, drvHostWasStreamStatusString(pStreamWas) ));
     return rc;