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

Timestamp:

Feb 9, 2018 10:44:14 AM (7 years ago)

Author:

vboxsync

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

120756

Message:

Audio/DrvHostDSound.cpp: Cleanup / docs.

File:

• trunk/src/VBox/Devices/Audio/DrvHostDSound.cpp (modified) (50 diffs)

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

@@ -258 +258 @@
 }
 
-
 static int dsoundWaveFmtFromCfg(PPDMAUDIOSTREAMCFG pCfg, PWAVEFORMATEX pFmt)
 {
@@ -277 +276 @@
 }
 
-
 /**
  * Retrieves the number of free bytes available for writing to a DirectSound output stream.
@@ -356 +354 @@
 }
 
-
 static char *dsoundGUIDToUtf8StrA(LPCGUID pGUID)
 {
@@ -375 +372 @@
     return RTStrDup("{Default device}");
 }
-
 
 /**
@@ -397 +393 @@
     Assert(RTListIsEmpty(&pThis->lstDevOutput));
 }
-
 
 static HRESULT directSoundPlayRestore(PDRVHOSTDSOUND pThis, LPDIRECTSOUNDBUFFER8 pDSB)
@@ -411 +406 @@
 }
 
-
 static HRESULT directSoundPlayUnlock(PDRVHOSTDSOUND pThis, LPDIRECTSOUNDBUFFER8 pDSB,
                                      PVOID pv1, PVOID pv2,
@@ -423 +417 @@
 }
 
-
 static HRESULT directSoundCaptureUnlock(LPDIRECTSOUNDCAPTUREBUFFER8 pDSCB,
                                         PVOID pv1, PVOID pv2,
@@ -433 +426 @@
     return hr;
 }
-
 
 static HRESULT directSoundPlayLock(PDRVHOSTDSOUND pThis, PDSOUNDSTREAM pStreamDS,
@@ -482 +474 @@
 }
 
-
 static HRESULT directSoundCaptureLock(PDSOUNDSTREAM pStreamDS,
                                       DWORD dwOffset, DWORD dwBytes,
@@ -519 +510 @@
 }
 
-
 /*
  * DirectSound playback
@@ -534 +524 @@
     }
 }
-
 
 static HRESULT directSoundPlayInterfaceCreate(PDRVHOSTDSOUND pThis)
@@ -575 +564 @@
 }
 
-
 static HRESULT directSoundPlayClose(PDRVHOSTDSOUND pThis, PDSOUNDSTREAM pStreamDS)
 {
@@ -621 +609 @@
     return hr;
 }
-
 
 static HRESULT directSoundPlayOpen(PDRVHOSTDSOUND pThis, PDSOUNDSTREAM pStreamDS,
@@ -814 +801 @@
 }
 
-
 static void dsoundPlayClearBuffer(PDRVHOSTDSOUND pThis, PDSOUNDSTREAM pStreamDS)
 {
@@ -845 +831 @@
 }
 
-
 static HRESULT directSoundPlayGetStatus(PDRVHOSTDSOUND pThis, LPDIRECTSOUNDBUFFER8 pDSB, DWORD *pdwStatus)
 {
@@ -879 +864 @@
     return hr;
 }
-
 
 static HRESULT directSoundPlayStop(PDRVHOSTDSOUND pThis, PDSOUNDSTREAM pStreamDS, bool fFlush)
@@ -927 +911 @@
 
     pStreamDS->fEnabled           = true;
+    /* Note: Playing back via DirectSound starts in the notification thread
+     *       once enough audio output data is available. */
 
     pStreamDS->Out.fFirstPlayback = true;
@@ -1073 +1059 @@
 }
 
-
 static HRESULT directSoundCaptureClose(PDRVHOSTDSOUND pThis, PDSOUNDSTREAM pStreamDS)
 {
@@ -1097 +1082 @@
     return hr;
 }
-
 
 static HRESULT directSoundCaptureOpen(PDRVHOSTDSOUND pThis, PDSOUNDSTREAM pStreamDS,
@@ -1259 +1243 @@
 }
 
-
 static HRESULT directSoundCaptureStop(PDRVHOSTDSOUND pThis, PDSOUNDSTREAM pStreamDS, bool fFlush)
 {
@@ -1293 +1276 @@
 }
 
-
 static HRESULT directSoundCaptureStart(PDRVHOSTDSOUND pThis, PDSOUNDSTREAM pStreamDS)
 {
-    AssertPtrReturn(pThis,     VERR_INVALID_POINTER);
-    AssertPtrReturn(pStreamDS, VERR_INVALID_POINTER);
+    AssertPtrReturn(pThis,     E_POINTER);
+    AssertPtrReturn(pStreamDS, E_POINTER);
+
+    Assert(pStreamDS->fEnabled == false);
 
     HRESULT hr;
@@ -1324 +1308 @@
                     pStreamDS->fEnabled = true;
 
-                    pStreamDS->In.cOverruns = 0;
+                    pStreamDS->In.offReadPos = 0;
+                    pStreamDS->In.cOverruns  = 0;
                 }
                 else
@@ -1334 +1319 @@
         hr = E_UNEXPECTED;
 
-    if (SUCCEEDED(hr))
-
-
     LogFlowFunc(("Returning %Rhrc\n", hr));
     return hr;
 }
-
 
 static int dsoundDevAdd(PRTLISTANCHOR pList, LPGUID pGUID, LPCWSTR pwszDescription, PDSOUNDDEV *ppDev)
@@ -1368 +1349 @@
 }
 
-
 static void dsoundDeviceRemove(PDSOUNDDEV pDev)
 {
@@ -1385 +1365 @@
     }
 }
-
 
 static void dsoundLogDevice(const char *pszType, LPGUID pGUID, LPCWSTR pwszDescription, LPCWSTR pwszModule)
@@ -1396 +1375 @@
 }
 
-
 static BOOL CALLBACK dsoundDevicesEnumCbPlayback(LPGUID pGUID, LPCWSTR pwszDescription, LPCWSTR pwszModule, PVOID lpContext)
 {
@@ -1422 +1400 @@
 }
 
-
 static BOOL CALLBACK dsoundDevicesEnumCbCapture(LPGUID pGUID, LPCWSTR pwszDescription, LPCWSTR pwszModule, PVOID lpContext)
 {
@@ -1444 +1421 @@
     return TRUE;
 }
-
 
 /**
@@ -1500 +1476 @@
 }
 
-
 /**
  * Updates this host driver's internal status, according to the global, overall input/output
@@ -1546 +1521 @@
 }
 
-
 static void dsoundUpdateStatusInternal(PDRVHOSTDSOUND pThis)
 {
     dsoundUpdateStatusInternalEx(pThis, NULL /* pCfg */, 0 /* fEnum */);
 }
-
 
 static int dsoundCreateStreamOut(PDRVHOSTDSOUND pThis, PDSOUNDSTREAM pStreamDS,
@@ -1557 +1530 @@
 {
     LogFlowFunc(("pStreamDS=%p, pCfgReq=%p\n", pStreamDS, pCfgReq));
+
+    pStreamDS->cbBufSize = 0;
 
     pStreamDS->Out.pDSB = NULL;
@@ -1565 +1540 @@
     pStreamDS->Out.fFirstPlayback = true;
     pStreamDS->Out.tsLastPlayMs = 0;
-    pStreamDS->cbBufSize = 0;
 
     int rc = VINF_SUCCESS;
@@ -1697 +1671 @@
 }
 
-
 static int dsoundDestroyStreamOut(PDRVHOSTDSOUND pThis, PPDMAUDIOBACKENDSTREAM pStream)
 {
@@ -1722 +1695 @@
 
     /* Init the stream structure and save relevant information to it. */
+    pStreamDS->cbBufSize     = 0;
+
+    pStreamDS->In.pDSCB      = NULL;
     pStreamDS->In.offReadPos = 0;
-    pStreamDS->cbBufSize     = 0;
-    pStreamDS->In.pDSCB      = NULL;
+    pStreamDS->In.cOverruns  = 0;
 
     int rc = VINF_SUCCESS;
@@ -1859 +1834 @@
     return VINF_SUCCESS;
 }
-
 
 /**
@@ -2206 +2180 @@
 }
 
-
 /**
  * @interface_method_impl{PDMIHOSTAUDIO,pfnInit}
@@ -2259 +2232 @@
 }
 
-
 static LPCGUID dsoundConfigQueryGUID(PCFGMNODE pCfg, const char *pszName, RTUUID *pUuid)
 {
@@ -2280 +2252 @@
 }
 
-
 static int dsoundConfigInit(PDRVHOSTDSOUND pThis, PCFGMNODE pCfg)
 {
@@ -2298 +2269 @@
 }
 
-
 /**
  * @interface_method_impl{PDMIHOSTAUDIO,pfnGetStatus}
@@ -2309 +2279 @@
     return PDMAUDIOBACKENDSTS_RUNNING;
 }
-
 
 /**
@@ -2341 +2310 @@
 }
 
-
 /**
  * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamDestroy}
@@ -2371 +2339 @@
 }
 
-
 /**
  * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamControl}
@@ -2396 +2363 @@
 }
 
-
 /**
  * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamGetReadable}
@@ -2416 +2382 @@
 }
 
-
 /**
  * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamGetWritable}
@@ -2432 +2397 @@
     return 0;
 }
-
 
 /**
@@ -2478 +2442 @@
 }
 
-
 /**
  * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamGetStatus}
@@ -2506 +2469 @@
     return strmSts;
 }
-
 
 /**
@@ -2565 +2527 @@
 #endif
 
-
 /*********************************************************************************************************************************
 *   PDMDRVINS::IBase Interface                                                                                                   *
@@ -2583 +2544 @@
 }
 
-
 /*********************************************************************************************************************************
 *   PDMDRVREG Interface                                                                                                          *
@@ -2616 +2576 @@
     LogFlowFuncLeave();
 }
-
 
 /**