Changeset 92452 in vbox

Timestamp:

Nov 16, 2021 10:43:51 AM (4 years ago)

Author:

vboxsync

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

148308

Message:

Audio/Validation Kit: Fixes for going to the next recording / playing state when no audio beacons are being used. bugref:10008

Location:

trunk/src/VBox

Files:

• Devices/Audio/DrvHostAudioValidationKit.cpp (modified) (4 diffs)
• ValidationKit/utils/audio/vkatCommon.cpp (modified) (2 diffs)

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

@@ -1153 +1153 @@
                          PDMAudioPropsBytesToMilli(&pStream->pStream->Cfg.Props, AudioTestBeaconGetRemaining(pBeacon))));
 
+                bool fGoToNextStage = false;
+
                 if (    AudioTestBeaconGetSize(pBeacon)
                     && !AudioTestBeaconIsComplete(pBeacon))
@@ -1182 +1184 @@
                                  pTst->idxTest, AudioTestBeaconTypeGetName(pBeacon->enmType)));
 
-                        if (pTst->enmState == AUDIOTESTSTATE_PRE)
-                            pTst->enmState = AUDIOTESTSTATE_RUN;
-                        else if (pTst->enmState == AUDIOTESTSTATE_POST)
-                            pTst->enmState = AUDIOTESTSTATE_DONE;
+                        fGoToNextStage = true;
                     }
                 }
-                else /* Go to the next state. */
-                    pTst->enmState = AUDIOTESTSTATE_RUN;
+                else
+                    fGoToNextStage = true;
+
+                if (fGoToNextStage)
+                {
+                    if (pTst->enmState == AUDIOTESTSTATE_PRE)
+                        pTst->enmState = AUDIOTESTSTATE_RUN;
+                    else if (pTst->enmState == AUDIOTESTSTATE_POST)
+                        pTst->enmState = AUDIOTESTSTATE_DONE;
+                }
                 break;
             }
@@ -1380 +1387 @@
         case AUDIOTESTSTATE_POST:
         {
+            bool fGoToNextStage = false;
+
             PAUDIOTESTTONEBEACON pBeacon = &pTst->t.TestTone.Beacon;
             if (    AudioTestBeaconGetSize(pBeacon)
@@ -1404 +1413 @@
                              pTst->idxTest, AudioTestBeaconTypeGetName(pBeacon->enmType)));
 
-                    if (pTst->enmState == AUDIOTESTSTATE_PRE)
-                        pTst->enmState = AUDIOTESTSTATE_RUN;
-                    else if (pTst->enmState == AUDIOTESTSTATE_POST)
-                        pTst->enmState = AUDIOTESTSTATE_DONE;
+                    fGoToNextStage = true;
                 }
             }
-            else /* Go to the next state. */
-                pTst->enmState = AUDIOTESTSTATE_RUN;
+            else
+                fGoToNextStage = true;
+
+            if (fGoToNextStage)
+            {
+                if (pTst->enmState == AUDIOTESTSTATE_PRE)
+                    pTst->enmState = AUDIOTESTSTATE_RUN;
+                else if (pTst->enmState == AUDIOTESTSTATE_POST)
+                    pTst->enmState = AUDIOTESTSTATE_DONE;
+            }
             break;
         }

trunk/src/VBox/ValidationKit/utils/audio/vkatCommon.cpp

@@ -814 +814 @@
                         case AUDIOTESTSTATE_POST:
                         {
+                            bool fGoToNextStage = false;
+
                             if (    AudioTestBeaconGetSize(&Beacon)
                                 && !AudioTestBeaconIsComplete(&Beacon))
@@ -844 +846 @@
                                         RTTestPrintf(g_hTest, RTTESTLVL_ALWAYS, "Detected %s beacon\n",
                                                      AudioTestBeaconTypeGetName(Beacon.enmType));
-
-                                    if (enmState == AUDIOTESTSTATE_PRE)
-                                        enmState = AUDIOTESTSTATE_RUN;
-                                    else if (enmState == AUDIOTESTSTATE_POST)
-                                        enmState = AUDIOTESTSTATE_DONE;
+                                    fGoToNextStage = true;
                                 }
+                            }
+                            else
+                                fGoToNextStage = true;
+
+                            if (fGoToNextStage)
+                            {
+                                if (enmState == AUDIOTESTSTATE_PRE)
+                                    enmState = AUDIOTESTSTATE_RUN;
+                                else if (enmState == AUDIOTESTSTATE_POST)
+                                    enmState = AUDIOTESTSTATE_DONE;
                             }
                             break;