Merge remote-tracking branch 'upstream/master'

1 files changed, 11 insertions, 4 deletions

diff --git a/audio/tests/wavetest/comptest.cpp b/audio/tests/wavetest/comptest.cpp
index ef41972c..db823156 100644
--- a/audio/tests/wavetest/comptest.cpp
+++ b/audio/tests/wavetest/comptest.cpp
@@ -17,8 +17,8 @@
 #include "tests.h"
 
 // ------------------------------------------------------------------------------
-// Test_VerifyPinSupportsPullMode: Test the requirement that WaveRT drivers must support pull mode audio streaming technology.
-void Test_VerifyPinSupportsPullMode(void)
+// Test_VerifyPinSupportsPullMode: Test the requirement that new drivers must be WaveRT and WaveRT drivers must support event driven audio streaming technology.
+void Test_VerifyPinWaveRTConformance(void)
 {
     CHalfApp*                       pHalfApp = g_pWaveTest->m_pHalf;
     BOOL                            bIsRTCapable = false;
@@ -28,10 +28,17 @@ void Test_VerifyPinSupportsPullMode(void)
 
     VERIFY_SUCCEEDED(pHalfApp->m_pAudioDeviceEndpoint->GetRTCaps(&bIsRTCapable));
 
-    // Only require pull mode for WaveRT drivers
+    // Check for our new requirement - new drivers must be WaveRT. Here we skip the test on AVStream (UAC1/HFP/A2dp)
+    // For other old drivers that are not WaveRT, may issue Errata to cover the failure.
+    if (!pHalfApp->m_bIsAVStream)
+    {
+        VERIFY_IS_TRUE(bIsRTCapable);
+    }
+
+    // Only require event driven for WaveRT drivers
     if (bIsRTCapable)
     {
         VERIFY_SUCCEEDED(pHalfApp->m_pAudioDeviceEndpoint->GetEventDrivenCapable(&bIsEventCapable));
         VERIFY_IS_TRUE(bIsEventCapable);
     }
-}
\ No newline at end of file
+}