WASAPI: Round sample size to the nearest multiple of 8 bits

This allows to use formats such as 24 bit PCM with a 32 bit container.
mumble-voip · Mar 19, 2024 · 8208f26 · 8208f26
1 parent 24f71f0
commit 8208f26
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -26,7 +26,7 @@ set(CMAKE_C_STANDARD_REQUIRED ON)
 set(CMAKE_C_VISIBILITY_PRESET hidden)
 
 set(CMAKE_CXX_EXTENSIONS OFF)
-set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_VISIBILITY_PRESET hidden)
 

diff --git a/src/backends/WASAPI/WASAPI.cpp b/src/backends/WASAPI/WASAPI.cpp
@@ -7,6 +7,7 @@
 
 #include "Backend.h"
 
+#include <bit>
 #include <cstring>
 #include <functional>
 #include <thread>
@@ -665,7 +666,7 @@ static constexpr WAVEFORMATEXTENSIBLE configToWaveFormat(const FluxConfig &confi
 	fmtBasic.wFormatTag      = WAVE_FORMAT_EXTENSIBLE;
 	fmtBasic.nChannels       = config.channels;
 	fmtBasic.nSamplesPerSec  = config.sampleRate;
-	fmtBasic.wBitsPerSample  = fmt.Samples.wValidBitsPerSample;
+	fmtBasic.wBitsPerSample  = std::bit_ceil(config.sampleBits);
 	fmtBasic.nBlockAlign     = fmtBasic.nChannels * fmtBasic.wBitsPerSample / 8;
 	fmtBasic.nAvgBytesPerSec = fmtBasic.nBlockAlign * fmtBasic.nSamplesPerSec;