From e8963b8255035b62c385522494abd38fdbbf5844 Mon Sep 17 00:00:00 2001 From: Cameron Gutman Date: Tue, 2 May 2023 22:30:15 -0500 Subject: [PATCH] Only modify channel-related format attributes Specifying sample rate will fail on devices using 192 KHz sample rate --- tools/audio.cpp | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/tools/audio.cpp b/tools/audio.cpp index 25ccc269..37f9a69c 100644 --- a/tools/audio.cpp +++ b/tools/audio.cpp @@ -29,7 +29,6 @@ const IID IID_IMMDeviceEnumerator = __uuidof(IMMDeviceEnumerator); const IID IID_IAudioClient = __uuidof(IAudioClient); const IID IID_IAudioCaptureClient = __uuidof(IAudioCaptureClient); -constexpr auto SAMPLE_RATE = 48000; int device_state_filter = DEVICE_STATE_ACTIVE; namespace audio { @@ -157,28 +156,6 @@ namespace audio { return nullptr; } - wave_format->wBitsPerSample = 16; - wave_format->nSamplesPerSec = SAMPLE_RATE; - switch (wave_format->wFormatTag) { - case WAVE_FORMAT_PCM: - break; - case WAVE_FORMAT_IEEE_FLOAT: - break; - case WAVE_FORMAT_EXTENSIBLE: { - auto wave_ex = (PWAVEFORMATEXTENSIBLE) wave_format.get(); - if (IsEqualGUID(KSDATAFORMAT_SUBTYPE_IEEE_FLOAT, wave_ex->SubFormat)) { - wave_ex->SubFormat = KSDATAFORMAT_SUBTYPE_PCM; - wave_ex->Samples.wValidBitsPerSample = 16; - break; - } - - std::cout << "Unsupported Sub Format for WAVE_FORMAT_EXTENSIBLE: [0x"sv << util::hex(wave_ex->SubFormat).to_string_view() << ']' << std::endl; - } - default: - std::cout << "Unsupported Wave Format: [0x"sv << util::hex(wave_format->wFormatTag).to_string_view() << ']' << std::endl; - return nullptr; - }; - set_wave_format(wave_format, format); status = audio_client->Initialize(