Changeset 88010 in vbox for trunk

Timestamp:

Mar 8, 2021 12:39:21 PM (4 years ago)

Author:

vboxsync

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

143138

Message:

Audio: DrvAudioHlpPCMPropsToStreamCfg -> DrvAudioHlpStreamCfgInitFromPcmProps. bugref:9890

Location:

trunk/src/VBox/Devices/Audio

Files:

• AudioMixer.cpp (modified) (1 diff)
• DrvAudio.h (modified) (2 diffs)
• DrvAudioCommon.cpp (modified) (2 diffs)

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

@@ -618 +618 @@
 
     PDMAUDIOSTREAMCFG CfgHost;
-    rc = DrvAudioHlpPCMPropsToStreamCfg(&pSink->PCMProps, &CfgHost);
+    rc = DrvAudioHlpStreamCfgInitFromPcmProps(&CfgHost, &pSink->PCMProps);
     AssertRCReturn(rc, rc);
 

trunk/src/VBox/Devices/Audio/DrvAudio.h

@@ -221 +221 @@
 bool     DrvAudioHlpPCMPropsAreValid(PCPDMAUDIOPCMPROPS pProps);
 void     DrvAudioHlpPCMPropsPrint(PCPDMAUDIOPCMPROPS pProps);
-int      DrvAudioHlpPCMPropsToStreamCfg(PCPDMAUDIOPCMPROPS pPCMProps, PPDMAUDIOSTREAMCFG pCfg);
 /** @}  */
 
@@ -227 +226 @@
  * @{ */
 void DrvAudioHlpStreamCfgInit(PPDMAUDIOSTREAMCFG pCfg);
+int  DrvAudioHlpStreamCfgInitFromPcmProps(PPDMAUDIOSTREAMCFG pCfg, PCPDMAUDIOPCMPROPS pPCMProps);
 bool DrvAudioHlpStreamCfgIsValid(PCPDMAUDIOSTREAMCFG pCfg);
 int DrvAudioHlpStreamCfgCopy(PPDMAUDIOSTREAMCFG pDstCfg, PCPDMAUDIOSTREAMCFG pSrcCfg);

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

@@ -749 +749 @@
 
     pCfg->Backend.cFramesPreBuffering = UINT32_MAX; /* Explicitly set to "undefined". */
+}
+
+/**
+ * Initializes a stream configuration from PCM properties.
+ *
+ * @return  IPRT status code.
+ * @param   pCfg        Stream configuration to initialize.
+ * @param   pProps      PCM properties to use.
+ */
+int DrvAudioHlpStreamCfgInitFromPcmProps(PPDMAUDIOSTREAMCFG pCfg, PCPDMAUDIOPCMPROPS pProps)
+{
+    AssertPtrReturn(pProps, VERR_INVALID_POINTER);
+    AssertPtrReturn(pCfg,   VERR_INVALID_POINTER);
+
+    DrvAudioHlpStreamCfgInit(pCfg);
+
+    memcpy(&pCfg->Props, pProps, sizeof(PDMAUDIOPCMPROPS));
+    return VINF_SUCCESS;
 }
 
@@ -1418 +1436 @@
     Log(("uHz=%RU32, cChannels=%RU8, cBits=%RU8%s",
          pProps->uHz, pProps->cChannels, pProps->cbSample * 8, pProps->fSigned ? "S" : "U"));
-}
-
-/**
- * Converts PCM properties to a audio stream configuration.
- *
- * @return  IPRT status code.
- * @param   pProps              PCM properties to convert.
- * @param   pCfg                Stream configuration to store result into.
- * @todo r=bird: Rename to DrvAudioHlpStreamCfgInitFromPCMProps.
- */
-int DrvAudioHlpPCMPropsToStreamCfg(PCPDMAUDIOPCMPROPS pProps, PPDMAUDIOSTREAMCFG pCfg)
-{
-    AssertPtrReturn(pProps, VERR_INVALID_POINTER);
-    AssertPtrReturn(pCfg,   VERR_INVALID_POINTER);
-
-    DrvAudioHlpStreamCfgInit(pCfg);
-
-    memcpy(&pCfg->Props, pProps, sizeof(PDMAUDIOPCMPROPS));
-    return VINF_SUCCESS;
 }