Changeset 82252 in vbox for trunk/src/VBox/Main/src-client/DrvAudioRec.cpp

Timestamp:

Nov 27, 2019 9:31:53 PM (5 years ago)

Author:

vboxsync

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

135070

Message:

vmm/pdmaudioifs.h: Style, docs and other nits. First, it's always _FLAGS_ never _FLAG_. Second, enums generally should start with _INVALID = 0 to ensure we don't mistake zero-initialized memory for valid data. Struct member names shall be indented on a tab (+4) boundrary. PDM is part of the VMM, so it follows the VMM coding guidelines strictly. Skip the 'Structure for keeping a ... around' fluff, the first sentence of a structure (or anything else for that matter) documentation shall be brief and to the point. It is automatically turned into a @brief. Furthermore, additional text should be a separate paragraph as it provides details the reader doesn't necessarily need to read. bugref:9218

File:

• trunk/src/VBox/Main/src-client/DrvAudioRec.cpp (modified) (10 diffs)

trunk/src/VBox/Main/src-client/DrvAudioRec.cpp

@@ -308 +308 @@
 {
     uint32_t uHz       = pCodecParms->PCMProps.uHz;
-    uint8_t  cBytes    = pCodecParms->PCMProps.cBytes;
+    uint8_t  cBytes    = pCodecParms->PCMProps.cbSample;
     uint8_t  cChannels = pCodecParms->PCMProps.cChannels;
     uint32_t uBitrate  = pCodecParms->uBitrate;
@@ -427 +427 @@
         pCodec->Parms.PCMProps.uHz       = uHz;
         pCodec->Parms.PCMProps.cChannels = cChannels;
-        pCodec->Parms.PCMProps.cBytes    = cBytes;
-        pCodec->Parms.PCMProps.cShift    = PDMAUDIOPCMPROPS_MAKE_SHIFT_PARMS(pSink->Codec.Parms.PCMProps.cBytes,
+        pCodec->Parms.PCMProps.cbSample  = cBytes;
+        pCodec->Parms.PCMProps.cShift    = PDMAUDIOPCMPROPS_MAKE_SHIFT_PARMS(pSink->Codec.Parms.PCMProps.cbSample,
                                                                              pSink->Codec.Parms.PCMProps.cChannels);
         pCodec->Parms.uBitrate           = uBitrate;
@@ -522 +522 @@
     AssertPtrReturn(pCfgAcq,   VERR_INVALID_POINTER);
 
-    if (pCfgReq->DestSource.Dest != PDMAUDIOPLAYBACKDEST_FRONT)
-    {
+    if (pCfgReq->u.enmDst != PDMAUDIOPLAYBACKDST_FRONT)
+    {
+        LogRel2(("Recording: Support for surround audio not implemented yet\n"));
         AssertFailed();
-
-        LogRel2(("Recording: Support for surround audio not implemented yet\n"));
         return VERR_NOT_SUPPORTED;
     }
 
-    int rc = VINF_SUCCESS;
-
 #ifdef VBOX_WITH_LIBOPUS
-    rc = RTCircBufCreate(&pStreamAV->pCircBuf, pSink->Codec.Opus.cbFrame * 2 /* Use "double buffering" */);
+    int rc = RTCircBufCreate(&pStreamAV->pCircBuf, pSink->Codec.Opus.cbFrame * 2 /* Use "double buffering" */);
     if (RT_SUCCESS(rc))
     {
@@ -554 +551 @@
                      * a specific sampling rate Opus is optimized for. */
                     pCfgAcq->Props.uHz         = pSink->Codec.Parms.PCMProps.uHz;
-                    pCfgAcq->Props.cShift      = PDMAUDIOPCMPROPS_MAKE_SHIFT_PARMS(pCfgAcq->Props.cBytes, pCfgAcq->Props.cChannels);
+                    pCfgAcq->Props.cShift      = PDMAUDIOPCMPROPS_MAKE_SHIFT_PARMS(pCfgAcq->Props.cbSample, pCfgAcq->Props.cChannels);
 
                     /* Every Opus frame marks a period for now. Optimize this later. */
@@ -570 +567 @@
 #else
     RT_NOREF(pThis, pSink, pStreamAV, pCfgReq, pCfgAcq);
-    rc = VERR_NOT_SUPPORTED;
+    int rc = VERR_NOT_SUPPORTED;
 #endif /* VBOX_WITH_LIBOPUS */
 
@@ -599 +596 @@
         Assert(pStreamAV->cbSrcBuf);
         RTMemFree(pStreamAV->pvSrcBuf);
+        pStreamAV->pvSrcBuf = NULL;
         pStreamAV->cbSrcBuf = 0;
     }
@@ -606 +604 @@
         Assert(pStreamAV->cbDstBuf);
         RTMemFree(pStreamAV->pvDstBuf);
+        pStreamAV->pvDstBuf = NULL;
         pStreamAV->cbDstBuf = 0;
     }
@@ -657 +656 @@
 
     LogRel(("Recording: Audio driver is using %RU32Hz, %RU16bit, %RU8 %s\n",
-            pThis->CodecParms.PCMProps.uHz, pThis->CodecParms.PCMProps.cBytes * 8,
+            pThis->CodecParms.PCMProps.uHz, pThis->CodecParms.PCMProps.cbSample * 8,
             pThis->CodecParms.PCMProps.cChannels, pThis->CodecParms.PCMProps.cChannels == 1 ? "channel" : "channels"));
 
@@ -1204 +1203 @@
     rc = CFGMR3QueryU32(pCfg, "CodecHz", &pPCMProps->uHz);
     AssertRCReturn(rc, rc);
-    rc = CFGMR3QueryU8(pCfg,  "CodecBits", &pPCMProps->cBytes);
+    rc = CFGMR3QueryU8(pCfg,  "CodecBits", &pPCMProps->cbSample); /** @todo CodecBits != CodecBytes */
     AssertRCReturn(rc, rc);
+    pPCMProps->cbSample /= 8; /* Bits to bytes. */
     rc = CFGMR3QueryU8(pCfg,  "CodecChannels", &pPCMProps->cChannels);
     AssertRCReturn(rc, rc);
@@ -1211 +1211 @@
     AssertRCReturn(rc, rc);
 
-    pPCMProps->cBytes      = pPCMProps->cBytes / 8; /* Bits to bytes. */
-    pPCMProps->cShift      = PDMAUDIOPCMPROPS_MAKE_SHIFT_PARMS(pPCMProps->cBytes, pPCMProps->cChannels);
+    pPCMProps->cShift      = PDMAUDIOPCMPROPS_MAKE_SHIFT_PARMS(pPCMProps->cbSample, pPCMProps->cChannels);
     pPCMProps->fSigned     = true;
     pPCMProps->fSwapEndian = false;