Changeset 89506 in vbox

Timestamp:

Jun 4, 2021 12:11:56 PM (3 years ago)

Author:

vboxsync

Message:

pdmaudioinline.h/PDMAudioPropsAreEqual: Compare channel IDs too. bugref:9890

File:

• trunk/include/VBox/vmm/pdmaudioinline.h (modified) (2 diffs)

trunk/include/VBox/vmm/pdmaudioinline.h

@@ -1012 +1012 @@
 DECLINLINE(bool) PDMAudioPropsAreEqual(PCPDMAUDIOPCMPROPS pProps1, PCPDMAUDIOPCMPROPS pProps2)
 {
+    uintptr_t idxCh;
     AssertPtrReturn(pProps1, false);
     AssertPtrReturn(pProps2, false);
@@ -1018 +1019 @@
         return true;
 
-    return pProps1->uHz         == pProps2->uHz
-        && pProps1->cChannelsX  == pProps2->cChannelsX
-        && pProps1->cbSampleX   == pProps2->cbSampleX
-        && pProps1->fSigned     == pProps2->fSigned
-        && pProps1->fSwapEndian == pProps2->fSwapEndian;
+    if (pProps1->uHz != pProps2->uHz)
+        return false;
+    if (pProps1->cChannelsX  != pProps2->cChannelsX)
+        return false;
+    if (pProps1->cbSampleX   != pProps2->cbSampleX)
+        return false;
+    if (pProps1->fSigned     != pProps2->fSigned)
+        return false;
+    if (pProps1->fSwapEndian != pProps2->fSwapEndian)
+        return false;
+    if (pProps1->fRaw        != pProps2->fRaw)
+        return false;
+
+    idxCh = pProps1->cChannelsX;
+    while (idxCh-- > 0)
+        if (pProps1->aidChannels[idxCh] != pProps2->aidChannels[idxCh])
+            return false;
+
+    return true;
 }