diff options
Diffstat (limited to 'audio/sysvad/TabletAudioSample/hdmiwavtable.h')
| -rw-r--r-- | audio/sysvad/TabletAudioSample/hdmiwavtable.h | 71 |
1 files changed, 8 insertions, 63 deletions
diff --git a/audio/sysvad/TabletAudioSample/hdmiwavtable.h b/audio/sysvad/TabletAudioSample/hdmiwavtable.h index a5f63c62..7d786a64 100644 --- a/audio/sysvad/TabletAudioSample/hdmiwavtable.h +++ b/audio/sysvad/TabletAudioSample/hdmiwavtable.h @@ -32,11 +32,11 @@ Abstract: #define HDMI_HOST_MIN_SAMPLE_RATE 44100 // Min Sample Rate #define HDMI_HOST_MAX_SAMPLE_RATE 96000 // Max Sample Rate -#define HDMI_LOOPBACK_MAX_CHANNELS 2 // Max Channels. -#define HDMI_LOOPBACK_MIN_BITS_PER_SAMPLE 16 // Min Bits Per Sample -#define HDMI_LOOPBACK_MAX_BITS_PER_SAMPLE 16 // Max Bits Per Sample -#define HDMI_LOOPBACK_MIN_SAMPLE_RATE 44100 // Min Sample Rate -#define HDMI_LOOPBACK_MAX_SAMPLE_RATE 48000 // Max Sample Rate +#define HDMI_LOOPBACK_MAX_CHANNELS HDMI_HOST_MAX_CHANNELS // Must be equal to host pin's Max Channels. +#define HDMI_LOOPBACK_MIN_BITS_PER_SAMPLE HDMI_HOST_MIN_BITS_PER_SAMPLE // Must be equal to host pin's Min Bits Per Sample +#define HDMI_LOOPBACK_MAX_BITS_PER_SAMPLE HDMI_HOST_MAX_BITS_PER_SAMPLE // Must be equal to host pin's Max Bits Per Sample +#define HDMI_LOOPBACK_MIN_SAMPLE_RATE HDMI_HOST_MIN_SAMPLE_RATE // Must be equal to host pin's Min Sample Rate +#define HDMI_LOOPBACK_MAX_SAMPLE_RATE HDMI_HOST_MAX_SAMPLE_RATE // Must be equal to host pin's Max Sample Rate #define HDMI_DOLBY_DIGITAL_MAX_CHANNELS 2 // Max Channels. #define HDMI_DOLBY_DIGITAL_MIN_BITS_PER_SAMPLE 16 // Min Bits Per Sample @@ -47,7 +47,7 @@ Abstract: // // Max # of pin instances. // -#define HDMI_MAX_INPUT_SYSTEM_STREAMS 2 // Raw + Default streams +#define HDMI_MAX_INPUT_SYSTEM_STREAMS 2 #define HDMI_MAX_OUTPUT_LOOPBACK_STREAMS MAX_OUTPUT_LOOPBACK_STREAMS @@ -207,61 +207,6 @@ KSDATAFORMAT_WAVEFORMATEXTENSIBLE HdmiHostPinSupportedDeviceFormats[] = } }; -static -KSDATAFORMAT_WAVEFORMATEXTENSIBLE HdmiLoopbackPinSupportedDeviceFormats[] = -{ - { // 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). // @@ -294,8 +239,8 @@ PIN_DEVICE_FORMATS_AND_MODES HdmiPinDeviceFormatsAndModes[] = }, { RenderLoopbackPin, - HdmiLoopbackPinSupportedDeviceFormats, - SIZEOF_ARRAY(HdmiLoopbackPinSupportedDeviceFormats), + HdmiHostPinSupportedDeviceFormats, // Must support all the formats supported by host pin + SIZEOF_ARRAY(HdmiHostPinSupportedDeviceFormats), NULL, // loopback doesn't support modes. 0 }, |