Changeset 94957 in vbox

Timestamp:

May 9, 2022 2:05:43 PM (3 years ago)

Author:

vboxsync

Message:

Main/src-client/DrvAudioRec.cpp: Adjust to the new rules wrt. to rc -> hrc,vrc usage, ​bugref:10223

File:

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

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

@@ -328 +328 @@
     const settings::RecordingScreenSettings &Screen0Settings = mVideoRecCfg.mapScreens[0];
 
-    int rc = pVMM->pfnCFGMR3InsertInteger(pLunCfg, "ContainerType", (uint64_t)Screen0Settings.enmDest);
-    AssertRCReturn(rc, rc);
+    int vrc = pVMM->pfnCFGMR3InsertInteger(pLunCfg, "ContainerType", (uint64_t)Screen0Settings.enmDest);
+    AssertRCReturn(vrc, vrc);
     if (Screen0Settings.enmDest == RecordingDestination_File)
     {
-        rc = pVMM->pfnCFGMR3InsertString(pLunCfg, "ContainerFileName", Utf8Str(Screen0Settings.File.strName).c_str());
-        AssertRCReturn(rc, rc);
-    }
-    rc = pVMM->pfnCFGMR3InsertInteger(pLunCfg, "CodecHz", Screen0Settings.Audio.uHz);
-    AssertRCReturn(rc, rc);
-    rc = pVMM->pfnCFGMR3InsertInteger(pLunCfg, "CodecBits", Screen0Settings.Audio.cBits);
-    AssertRCReturn(rc, rc);
-    rc = pVMM->pfnCFGMR3InsertInteger(pLunCfg, "CodecChannels", Screen0Settings.Audio.cChannels);
-    AssertRCReturn(rc, rc);
-    rc = pVMM->pfnCFGMR3InsertInteger(pLunCfg, "CodecBitrate", 0); /* Let Opus decide for now. */
-    AssertRCReturn(rc, rc);
+        vrc = pVMM->pfnCFGMR3InsertString(pLunCfg, "ContainerFileName", Utf8Str(Screen0Settings.File.strName).c_str());
+        AssertRCReturn(vrc, vrc);
+    }
+    vrc = pVMM->pfnCFGMR3InsertInteger(pLunCfg, "CodecHz", Screen0Settings.Audio.uHz);
+    AssertRCReturn(vrc, vrc);
+    vrc = pVMM->pfnCFGMR3InsertInteger(pLunCfg, "CodecBits", Screen0Settings.Audio.cBits);
+    AssertRCReturn(vrc, vrc);
+    vrc = pVMM->pfnCFGMR3InsertInteger(pLunCfg, "CodecChannels", Screen0Settings.Audio.cChannels);
+    AssertRCReturn(vrc, vrc);
+    vrc = pVMM->pfnCFGMR3InsertInteger(pLunCfg, "CodecBitrate", 0); /* Let Opus decide for now. */
+    AssertRCReturn(vrc, vrc);
 
     return AudioDriver::configureDriver(pLunCfg, pVMM);
@@ -410 +410 @@
 
 #ifdef VBOX_WITH_LIBOPUS
-    int rc = RTCircBufCreate(&pStreamAV->pCircBuf, pSink->Codec.Opus.cbFrame * 2 /* Use "double buffering" */);
-    if (RT_SUCCESS(rc))
+    int vrc = RTCircBufCreate(&pStreamAV->pCircBuf, pSink->Codec.Opus.cbFrame * 2 /* Use "double buffering" */);
+    if (RT_SUCCESS(vrc))
     {
         size_t cbScratchBuf = pSink->Codec.Opus.cbFrame;
@@ -438 +438 @@
             }
             else
-                rc = VERR_NO_MEMORY;
+                vrc = VERR_NO_MEMORY;
         }
         else
-            rc = VERR_NO_MEMORY;
+            vrc = VERR_NO_MEMORY;
     }
 #else
     RT_NOREF(pThis, pSink, pStreamAV, pCfgReq, pCfgAcq);
-    int rc = VERR_NOT_SUPPORTED;
+    int vrc = VERR_NOT_SUPPORTED;
 #endif /* VBOX_WITH_LIBOPUS */
 
-    LogFlowFuncLeaveRC(rc);
-    return rc;
+    LogFlowFuncLeaveRC(vrc);
+    return vrc;
 }
 
@@ -472 +472 @@
     PAVRECSINK pSink = &pThis->Sink;
 
-    int rc = avRecCreateStreamOut(pThis, pStreamAV, pSink, pCfgReq, pCfgAcq);
+    int vrc = avRecCreateStreamOut(pThis, pStreamAV, pSink, pCfgReq, pCfgAcq);
     PDMAudioStrmCfgCopy(&pStreamAV->Cfg, pCfgAcq);
 
-    return rc;
+    return vrc;
 }
 
@@ -527 +527 @@
     RT_NOREF(fImmediate);
 
-    int rc = VINF_SUCCESS;
+    int vrc = VINF_SUCCESS;
     if (pStreamAV->Cfg.enmDir == PDMAUDIODIR_OUT)
-        rc = avRecDestroyStreamOut(pThis, pStreamAV);
-
-    return rc;
+        vrc = avRecDestroyStreamOut(pThis, pStreamAV);
+
+    return vrc;
 }
 
@@ -620 +620 @@
     AssertReturn(pcbWritten, VERR_INVALID_PARAMETER);
 
-    int rc = VINF_SUCCESS;
+    int vrc = VINF_SUCCESS;
 
     uint32_t cbWrittenTotal = 0;
@@ -736 +736 @@
                 case AVRECCONTAINERTYPE_MAIN_CONSOLE:
                 {
-                    HRESULT hr = pSink->Con.Main.pConsole->i_recordingSendAudio(pStreamAV->pvDstBuf, cbDst, uPTSMs);
-                    Assert(hr == S_OK);
-                    RT_NOREF(hr);
+                    HRESULT hrc = pSink->Con.Main.pConsole->i_recordingSendAudio(pStreamAV->pvDstBuf, cbDst, uPTSMs);
+                    Assert(hrc == S_OK);
+                    RT_NOREF(hrc);
                     break;
                 }
@@ -745 +745 @@
                 {
                     WebMWriter::BlockData_Opus blockData = { pStreamAV->pvDstBuf, cbDst, uPTSMs };
-                    rc = pSink->Con.WebM.pWebM->WriteBlock(pSink->Con.WebM.uTrack, &blockData, sizeof(blockData));
-                    AssertRC(rc);
+                    vrc = pSink->Con.WebM.pWebM->WriteBlock(pSink->Con.WebM.uTrack, &blockData, sizeof(blockData));
+                    AssertRC(vrc);
                     break;
                 }
 
                 default:
-                    AssertFailedStmt(rc = VERR_NOT_IMPLEMENTED);
+                    AssertFailedStmt(vrc = VERR_NOT_IMPLEMENTED);
                     break;
             }
@@ -758 +758 @@
         {
             AssertMsgFailed(("Encoding failed: %s\n", opus_strerror(cbWritten)));
-            rc = VERR_INVALID_PARAMETER;
+            vrc = VERR_INVALID_PARAMETER;
         }
 
-        if (RT_FAILURE(rc))
+        if (RT_FAILURE(vrc))
             break;
     }
@@ -770 +770 @@
     *pcbWritten = cbBuf;
 
-    rc = VERR_NOT_SUPPORTED;
+    vrc = VERR_NOT_SUPPORTED;
 #endif /* VBOX_WITH_LIBOPUS */
 
-    LogFlowFunc(("csReadTotal=%RU32, rc=%Rrc\n", cbWrittenTotal, rc));
-    return rc;
+    LogFlowFunc(("csReadTotal=%RU32, vrc=%Rrc\n", cbWrittenTotal, vrc));
+    return vrc;
 }
 
@@ -848 +848 @@
                          pSink->Con.WebM.pWebM->GetFileName().c_str(), pSink->Con.WebM.pWebM->GetFileSize()));
 
-                int rc2 = pSink->Con.WebM.pWebM->Close();
-                AssertRC(rc2);
+                int vrc2 = pSink->Con.WebM.pWebM->Close();
+                AssertRC(vrc2);
 
                 delete pSink->Con.WebM.pWebM;
@@ -977 +977 @@
     }
 
-    int rc = VINF_SUCCESS;
+    int vrc = VINF_SUCCESS;
 
     try
@@ -990 +990 @@
                 }
                 else
-                    rc = VERR_NOT_SUPPORTED;
+                    vrc = VERR_NOT_SUPPORTED;
                 break;
             }
@@ -1004 +1004 @@
 
                     pSink->Con.WebM.pWebM = new WebMWriter();
-                    rc = pSink->Con.WebM.pWebM->Open(pszFile,
-                                                     /** @todo Add option to add some suffix if file exists instead of overwriting? */
-                                                     RTFILE_O_CREATE_REPLACE | RTFILE_O_WRITE | RTFILE_O_DENY_NONE,
-                                                     WebMWriter::AudioCodec_Opus, WebMWriter::VideoCodec_None);
-                    if (RT_SUCCESS(rc))
+                    vrc = pSink->Con.WebM.pWebM->Open(pszFile,
+                                                      /** @todo Add option to add some suffix if file exists instead of overwriting? */
+                                                      RTFILE_O_CREATE_REPLACE | RTFILE_O_WRITE | RTFILE_O_DENY_NONE,
+                                                      WebMWriter::AudioCodec_Opus, WebMWriter::VideoCodec_None);
+                    if (RT_SUCCESS(vrc))
                     {
-                        rc = pSink->Con.WebM.pWebM->AddAudioTrack(uHz, cChannels, cbSample * 8 /* Bits */,
-                                                                  &pSink->Con.WebM.uTrack);
-                        if (RT_SUCCESS(rc))
+                        vrc = pSink->Con.WebM.pWebM->AddAudioTrack(uHz, cChannels, cbSample * 8 /* Bits */,
+                                                                   &pSink->Con.WebM.uTrack);
+                        if (RT_SUCCESS(vrc))
                         {
                             LogRel(("Recording: Recording audio to audio file '%s'\n", pszFile));
                         }
                         else
-                            LogRel(("Recording: Error creating audio track for audio file '%s' (%Rrc)\n", pszFile, rc));
+                            LogRel(("Recording: Error creating audio track for audio file '%s' (%Rrc)\n", pszFile, vrc));
                     }
                     else
-                        LogRel(("Recording: Error creating audio file '%s' (%Rrc)\n", pszFile, rc));
+                        LogRel(("Recording: Error creating audio file '%s' (%Rrc)\n", pszFile, vrc));
                 }
                 break;
@@ -1026 +1026 @@
 
             default:
-                rc = VERR_NOT_SUPPORTED;
+                vrc = VERR_NOT_SUPPORTED;
                 break;
         }
@@ -1032 +1032 @@
     catch (std::bad_alloc &)
     {
-        rc = VERR_NO_MEMORY;
-    }
-
-    if (RT_SUCCESS(rc))
+        vrc = VERR_NO_MEMORY;
+    }
+
+    if (RT_SUCCESS(vrc))
     {
         pSink->Con.Parms.enmType     = pConParms->enmType;
@@ -1066 +1066 @@
         }
 
-        LogRel(("Recording: Error creating sink (%Rrc)\n", rc));
-    }
-
-    return rc;
+        LogRel(("Recording: Error creating sink (%Rrc)\n", vrc));
+    }
+
+    return vrc;
 }
 
@@ -1152 +1152 @@
     RT_ZERO(pThis->CodecParms);
 
-    int rc = pHlp->pfnCFGMQueryU32(pCfg, "ContainerType", (uint32_t *)&pConParams->enmType);
-    AssertRCReturn(rc, rc);
+    int vrc = pHlp->pfnCFGMQueryU32(pCfg, "ContainerType", (uint32_t *)&pConParams->enmType);
+    AssertRCReturn(vrc, vrc);
 
     switch (pConParams->enmType)
     {
         case AVRECCONTAINERTYPE_WEBM:
-            rc = pHlp->pfnCFGMQueryStringAlloc(pCfg, "ContainerFileName", &pConParams->WebM.pszFile);
-            AssertRCReturn(rc, rc);
+            vrc = pHlp->pfnCFGMQueryStringAlloc(pCfg, "ContainerFileName", &pConParams->WebM.pszFile);
+            AssertRCReturn(vrc, vrc);
             break;
 
@@ -1167 +1167 @@
 
     uint32_t uHz = 0;
-    rc = pHlp->pfnCFGMQueryU32(pCfg, "CodecHz", &uHz);
-    AssertRCReturn(rc, rc);
+    vrc = pHlp->pfnCFGMQueryU32(pCfg, "CodecHz", &uHz);
+    AssertRCReturn(vrc, vrc);
 
     uint8_t cSampleBits = 0;
-    rc = pHlp->pfnCFGMQueryU8(pCfg,  "CodecBits", &cSampleBits); /** @todo CodecBits != CodecBytes */
-    AssertRCReturn(rc, rc);
+    vrc = pHlp->pfnCFGMQueryU8(pCfg,  "CodecBits", &cSampleBits); /** @todo CodecBits != CodecBytes */
+    AssertRCReturn(vrc, vrc);
 
     uint8_t cChannels = 0;
-    rc = pHlp->pfnCFGMQueryU8(pCfg,  "CodecChannels", &cChannels);
-    AssertRCReturn(rc, rc);
+    vrc = pHlp->pfnCFGMQueryU8(pCfg,  "CodecChannels", &cChannels);
+    AssertRCReturn(vrc, vrc);
 
     PDMAudioPropsInit(&pCodecParms->PCMProps, cSampleBits / 8, true /*fSigned*/, cChannels, uHz);
@@ -1182 +1182 @@
                     ("Configuration error: Audio configuration is invalid!\n"), VERR_PDM_DRVINS_UNKNOWN_CFG_VALUES); /** @todo wrong status code. */
 
-    rc = pHlp->pfnCFGMQueryU32(pCfg, "CodecBitrate", &pCodecParms->uBitrate);
-    AssertRCReturn(rc, rc);
+    vrc = pHlp->pfnCFGMQueryU32(pCfg, "CodecBitrate", &pCodecParms->uBitrate);
+    AssertRCReturn(vrc, vrc);
 
     /*
@@ -1206 +1206 @@
             PDMAudioPropsChannels(&pThis->CodecParms.PCMProps), PDMAudioPropsChannels(&pThis->CodecParms.PCMProps) == 1 ? "" : "s"));
 
-    rc = avRecSinkInit(pThis, &pThis->Sink, &pThis->ContainerParms, &pThis->CodecParms);
-    if (RT_SUCCESS(rc))
+    vrc = avRecSinkInit(pThis, &pThis->Sink, &pThis->ContainerParms, &pThis->CodecParms);
+    if (RT_SUCCESS(vrc))
         LogRel2(("Recording: Audio recording driver initialized\n"));
     else
-        LogRel(("Recording: Audio recording driver initialization failed: %Rrc\n", rc));
-
-    return rc;
+        LogRel(("Recording: Audio recording driver initialization failed: %Rrc\n", vrc));
+
+    return vrc;
 }