Updated for "Windows 10 Anniversary Update" (Version 1607)

1 files changed, 8 insertions, 63 deletions

diff --git a/audio/sysvad/TabletAudioSample/spdifwavtable.h b/audio/sysvad/TabletAudioSample/spdifwavtable.h
index 963822a8..36b0e903 100644
--- a/audio/sysvad/TabletAudioSample/spdifwavtable.h
+++ b/audio/sysvad/TabletAudioSample/spdifwavtable.h
@@ -35,11 +35,11 @@ Abstract:
 #define SPDIF_OFFLOAD_MIN_SAMPLE_RATE             44100   // Min Sample Rate
 #define SPDIF_OFFLOAD_MAX_SAMPLE_RATE             96000   // Max Sample Rate
 
-#define SPDIF_LOOPBACK_MAX_CHANNELS               2       // Max Channels.
-#define SPDIF_LOOPBACK_MIN_BITS_PER_SAMPLE        16      // Min Bits Per Sample
-#define SPDIF_LOOPBACK_MAX_BITS_PER_SAMPLE        16      // Max Bits Per Sample
-#define SPDIF_LOOPBACK_MIN_SAMPLE_RATE            44100   // Min Sample Rate
-#define SPDIF_LOOPBACK_MAX_SAMPLE_RATE            48000   // Max Sample Rate
+#define SPDIF_LOOPBACK_MAX_CHANNELS               SPDIF_HOST_MAX_CHANNELS          // Must be equal to host pin's Max Channels.
+#define SPDIF_LOOPBACK_MIN_BITS_PER_SAMPLE        SPDIF_HOST_MIN_BITS_PER_SAMPLE   // Must be equal to host pin's Min Bits Per Sample
+#define SPDIF_LOOPBACK_MAX_BITS_PER_SAMPLE        SPDIF_HOST_MAX_BITS_PER_SAMPLE   // Must be equal to host pin's Max Bits Per Sample
+#define SPDIF_LOOPBACK_MIN_SAMPLE_RATE            SPDIF_HOST_MIN_SAMPLE_RATE       // Must be equal to host pin's Min Sample Rate
+#define SPDIF_LOOPBACK_MAX_SAMPLE_RATE            SPDIF_HOST_MAX_SAMPLE_RATE       // Must be equal to host pin's Max Sample Rate
 
 #define SPDIF_DOLBY_DIGITAL_MAX_CHANNELS          2       // Max Channels.
 #define SPDIF_DOLBY_DIGITAL_MIN_BITS_PER_SAMPLE   16      // Min Bits Per Sample
@@ -50,7 +50,7 @@ Abstract:
 //
 // Max # of pin instances.
 //
-#define SPDIF_MAX_INPUT_SYSTEM_STREAMS            2       // Raw + Default streams
+#define SPDIF_MAX_INPUT_SYSTEM_STREAMS            2
 #define SPDIF_MAX_INPUT_OFFLOAD_STREAMS           MAX_INPUT_OFFLOAD_STREAMS
 #define SPDIF_MAX_OUTPUT_LOOPBACK_STREAMS         MAX_OUTPUT_LOOPBACK_STREAMS
 
@@ -421,61 +421,6 @@ KSDATAFORMAT_WAVEFORMATEXTENSIBLE SpdifOffloadPinSupportedDeviceFormats[] =
     }
 };
 
-static 
-KSDATAFORMAT_WAVEFORMATEXTENSIBLE SpdifLoopbackPinSupportedDeviceFormats[] =
-{
-    { // 0
-        {
-            sizeof(KSDATAFORMAT_WAVEFORMATEXTENSIBLE),
-            0,
-            0,
-            0,
-            STATICGUIDOF(KSDATAFORMAT_TYPE_AUDIO),
-            STATICGUIDOF(KSDATAFORMAT_SUBTYPE_PCM),
-            STATICGUIDOF(KSDATAFORMAT_SPECIFIER_WAVEFORMATEX)
-        },
-        {
-            {
-                WAVE_FORMAT_EXTENSIBLE,
-                2,
-                44100,
-                176400,
-                4,
-                16,
-                sizeof(WAVEFORMATEXTENSIBLE) - sizeof(WAVEFORMATEX)
-            },
-            16,
-            KSAUDIO_SPEAKER_STEREO,
-            STATICGUIDOF(KSDATAFORMAT_SUBTYPE_PCM)
-        }
-    },
-    { // 1
-        {
-            sizeof(KSDATAFORMAT_WAVEFORMATEXTENSIBLE),
-            0,
-            0,
-            0,
-            STATICGUIDOF(KSDATAFORMAT_TYPE_AUDIO),
-            STATICGUIDOF(KSDATAFORMAT_SUBTYPE_PCM),
-            STATICGUIDOF(KSDATAFORMAT_SPECIFIER_WAVEFORMATEX)
-        },
-        {
-            {
-                WAVE_FORMAT_EXTENSIBLE,
-                2,
-                48000,
-                192000,
-                4,
-                16,
-                sizeof(WAVEFORMATEXTENSIBLE) - sizeof(WAVEFORMATEX)
-            },
-            16,
-            KSAUDIO_SPEAKER_STEREO,
-            STATICGUIDOF(KSDATAFORMAT_SUBTYPE_PCM)
-        }
-    }
-};
-
 //
 // Supported modes (only on streaming pins).
 //
@@ -528,8 +473,8 @@ PIN_DEVICE_FORMATS_AND_MODES SpdifPinDeviceFormatsAndModes[] =
     },
     {
         RenderLoopbackPin,
-        SpdifLoopbackPinSupportedDeviceFormats,
-        SIZEOF_ARRAY(SpdifLoopbackPinSupportedDeviceFormats),
+        SpdifHostPinSupportedDeviceFormats,   // Must support all the formats supported by host pin
+        SIZEOF_ARRAY(SpdifHostPinSupportedDeviceFormats),
         NULL,   // loopback doesn't support modes.
         0
     },