Changeset 88015 in vbox for trunk/src/VBox/Devices

Timestamp:

Mar 8, 2021 1:05:26 PM (4 years ago)

Author:

vboxsync

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

143143

Message:

Audio: DrvAudioHlpPCMPropsAreEqual -> DrvAudioHlpPcmPropsAreEqual & DrvAudioHlpStreamCfgMatchesPcmProps (overloading functions is confusing, esp. when only one variant was ever used). bugref:9890

Location:

trunk/src/VBox/Devices/Audio

Files:

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

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

@@ -1475 +1475 @@
         return rc;
 
-    if (DrvAudioHlpPCMPropsAreEqual(&pSink->PCMProps, pPCMProps)) /* Bail out early if PCM properties are equal. */
+    if (DrvAudioHlpPcmPropsAreEqual(&pSink->PCMProps, pPCMProps)) /* Bail out early if PCM properties are equal. */
     {
         rc = RTCritSectLeave(&pSink->CritSect);

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

@@ -2193 +2193 @@
         /* Only (re-)create the stream (and driver chain) if we really have to.
          * Otherwise avoid this and just reuse it, as this costs performance. */
-        if (   !DrvAudioHlpPCMPropsAreEqual(&Cfg.Props, &pStreamCC->State.Cfg.Props)
+        if (   !DrvAudioHlpStreamCfgMatchesPcmProps(&Cfg, &pStreamCC->State.Cfg.Props)
             || fForce)
         {

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

@@ -1839 +1839 @@
         Cfg.Props.cShift    = PDMAUDIOPCMPROPS_MAKE_SHIFT_PARMS(Cfg.Props.cbSample, Cfg.Props.cChannels);
 
-        if (!DrvAudioHlpPCMPropsAreEqual(&Cfg.Props, &pThis->Out.Cfg.Props))
+        if (!DrvAudioHlpStreamCfgMatchesPcmProps(&Cfg, &pThis->Out.Cfg.Props))
         {
             Cfg.enmDir      = PDMAUDIODIR_OUT;

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

@@ -217 +217 @@
 uint32_t DrvAudioHlpNanoToFrames(PCPDMAUDIOPCMPROPS pProps, uint64_t cNs);
 
-bool     DrvAudioHlpPCMPropsAreEqual(PCPDMAUDIOPCMPROPS pPCMProps1, PCPDMAUDIOPCMPROPS pPCMProps2);
-bool     DrvAudioHlpPCMPropsAreEqual(PCPDMAUDIOPCMPROPS pPCMProps, PCPDMAUDIOSTREAMCFG pCfg);
+bool     DrvAudioHlpPcmPropsAreEqual(PCPDMAUDIOPCMPROPS pPCMProps1, PCPDMAUDIOPCMPROPS pPCMProps2);
 bool     DrvAudioHlpPCMPropsAreValid(PCPDMAUDIOPCMPROPS pProps);
 void     DrvAudioHlpPcmPropsLog(PCPDMAUDIOPCMPROPS pProps);
@@ -225 +224 @@
 /** @name Audio configuration helper methods.
  * @{ */
-void DrvAudioHlpStreamCfgInit(PPDMAUDIOSTREAMCFG pCfg);
-int  DrvAudioHlpStreamCfgInitFromPcmProps(PPDMAUDIOSTREAMCFG pCfg, PCPDMAUDIOPCMPROPS pProps);
-bool DrvAudioHlpStreamCfgIsValid(PCPDMAUDIOSTREAMCFG pCfg);
-int DrvAudioHlpStreamCfgCopy(PPDMAUDIOSTREAMCFG pDstCfg, PCPDMAUDIOSTREAMCFG pSrcCfg);
+void    DrvAudioHlpStreamCfgInit(PPDMAUDIOSTREAMCFG pCfg);
+int     DrvAudioHlpStreamCfgInitFromPcmProps(PPDMAUDIOSTREAMCFG pCfg, PCPDMAUDIOPCMPROPS pProps);
+bool    DrvAudioHlpStreamCfgIsValid(PCPDMAUDIOSTREAMCFG pCfg);
+bool    DrvAudioHlpStreamCfgMatchesPcmProps(PCPDMAUDIOSTREAMCFG pCfg, PCPDMAUDIOPCMPROPS pProps);
+int     DrvAudioHlpStreamCfgCopy(PPDMAUDIOSTREAMCFG pDstCfg, PCPDMAUDIOSTREAMCFG pSrcCfg);
 PPDMAUDIOSTREAMCFG DrvAudioHlpStreamCfgDup(PCPDMAUDIOSTREAMCFG pCfg);
-void DrvAudioHlpStreamCfgFree(PPDMAUDIOSTREAMCFG pCfg);
-void DrvAudioHlpStreamCfgPrint(PCPDMAUDIOSTREAMCFG pCfg);
+void    DrvAudioHlpStreamCfgFree(PPDMAUDIOSTREAMCFG pCfg);
+void    DrvAudioHlpStreamCfgPrint(PCPDMAUDIOSTREAMCFG pCfg);
 /** @}  */
 

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

@@ -792 +792 @@
 
 /**
+ * Checks whether stream configuration matches the given PCM properties.
+ *
+ * @returns @c true if equal, @c false if not.
+ * @param   pCfg    Stream configuration.
+ * @param   pProps  PCM properties to match with.
+ */
+bool DrvAudioHlpStreamCfgMatchesPcmProps(PCPDMAUDIOSTREAMCFG pCfg, PCPDMAUDIOPCMPROPS pProps)
+{
+    AssertPtrReturn(pCfg, false);
+    return DrvAudioHlpPcmPropsAreEqual(pProps, &pCfg->Props);
+}
+
+/**
  * Frees an allocated audio stream configuration.
  *
@@ -1335 +1348 @@
  * @param   pProps2             Second properties to compare.
  */
-bool DrvAudioHlpPCMPropsAreEqual(PCPDMAUDIOPCMPROPS pProps1, PCPDMAUDIOPCMPROPS pProps2)
+bool DrvAudioHlpPcmPropsAreEqual(PCPDMAUDIOPCMPROPS pProps1, PCPDMAUDIOPCMPROPS pProps2)
 {
     AssertPtrReturn(pProps1, false);
@@ -1395 +1408 @@
 
     return fValid;
-}
-
-/**
- * Checks whether the given PCM properties are equal with the given
- * stream configuration.
- *
- * @returns @c true if equal, @c false if not.
- * @param   pProps              PCM properties to compare.
- * @param   pCfg                Stream configuration to compare.
- */
-bool DrvAudioHlpPCMPropsAreEqual(PCPDMAUDIOPCMPROPS pProps, PCPDMAUDIOSTREAMCFG pCfg)
-{
-    AssertPtrReturn(pProps, false);
-    AssertPtrReturn(pCfg,   false);
-
-    return DrvAudioHlpPCMPropsAreEqual(pProps, &pCfg->Props);
 }