From 7895dd22785ddba5e973662ed942be3b3452b89d Mon Sep 17 00:00:00 2001
From: Daniel Rugerio <50124185+darugeri@users.noreply.github.com>
Date: Fri, 13 Aug 2021 15:05:12 -0700
Subject: audio: Updates for Windows 10 22000 (#655)

* Updates for Windows 10 22000.
* Change how WIL is consumed.
---
 audio/tests/PinResourceHelpers/TestResource.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'audio/tests/PinResourceHelpers/TestResource.cpp')

diff --git a/audio/tests/PinResourceHelpers/TestResource.cpp b/audio/tests/PinResourceHelpers/TestResource.cpp
index f3762b84..c7e06728 100644
--- a/audio/tests/PinResourceHelpers/TestResource.cpp
+++ b/audio/tests/PinResourceHelpers/TestResource.cpp
@@ -1,6 +1,6 @@
 // ------------------------------------------------------------------------------
 //
-// Copyright (C) Microsoft. All rights reserved.
+// Copyright (C) Microsoft Corporation. All rights reserved.
 //
 // File Name:
 //
@@ -95,7 +95,7 @@ CPinTestResource::Initialize
     }
 
     szMode = ModeName(m_spHalfApp->m_Mode);
-    szPin = PinName(m_spHalfApp->m_ConnectorType);
+    szPin = PinName(m_spHalfApp->m_ConnectorType, m_spHalfApp->m_bIsMVA);
 
     // Id: Combine device Id, pin type and mode
     m_szId.Attach(W2BSTR(m_spHalfApp->m_pwstrDeviceId.get()));
@@ -300,6 +300,7 @@ static const struct
     { AUDIO_SIGNALPROCESSINGMODE_MEDIA, L"MEDIA" },
     { AUDIO_SIGNALPROCESSINGMODE_MOVIE, L"MOVIE" },
     { AUDIO_SIGNALPROCESSINGMODE_NOTIFICATION, L"NOTIFICATION" },
+    { AUDIO_SIGNALPROCESSINGMODE_FAR_FIELD_SPEECH, L"FAR_FIELD_SPEECH" },
 };
 
 
@@ -313,7 +314,7 @@ LPWSTR CPinTestResource::ModeName(REFGUID guidMode)
     return L"UNKNOWN";
 }
 
-LPWSTR CPinTestResource::PinName(EndpointConnectorType eConnectorType)
+LPWSTR CPinTestResource::PinName(EndpointConnectorType eConnectorType, bool IsMVA)
 {
     switch (eConnectorType)
     {
@@ -324,7 +325,7 @@ LPWSTR CPinTestResource::PinName(EndpointConnectorType eConnectorType)
     case eLoopbackConnector:
         return L"LOOPBACK";
     case eKeywordDetectorConnector:
-        return L"KEYWORD";
+        return IsMVA?L"MVAKEYWORD":L"SVAKEYWORD";
     default:
         return L"UNKNOWN";
     }
-- 
cgit v1.3.1