aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Frühberger <Peter.Fruehberger@gmail.com>2016-12-30 14:12:53 +0100
committerGitHub <noreply@github.com>2016-12-30 14:12:53 +0100
commit4ff114df71755a440de0db79f6cde44bb821afd3 (patch)
treef8899ff05444cb2b60b05c5a64582e798f090c29
parent1296ce347c2d1d2eda9c86d4d0903c88e264f2c4 (diff)
parent4d3c9236d1baace12816f9c7bf168d5deca94153 (diff)
Merge pull request #11307 from DaveTBlake/DirectSound
Backport AESinkDirectSound: Clamp samplerate to max 192 khz
-rw-r--r--xbmc/cores/AudioEngine/Sinks/AESinkDirectSound.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/xbmc/cores/AudioEngine/Sinks/AESinkDirectSound.cpp b/xbmc/cores/AudioEngine/Sinks/AESinkDirectSound.cpp
index 3a4677519c..f57de7e5d6 100644
--- a/xbmc/cores/AudioEngine/Sinks/AESinkDirectSound.cpp
+++ b/xbmc/cores/AudioEngine/Sinks/AESinkDirectSound.cpp
@@ -206,10 +206,13 @@ bool CAESinkDirectSound::Initialize(AEAudioFormat &format, std::string &device)
WAVEFORMATEXTENSIBLE wfxex = {0};
- // clamp samplerate to a minimum
+ // clamp samplerate between 44100 and 192000
if (format.m_sampleRate < 44100)
format.m_sampleRate = 44100;
+ if (format.m_sampleRate > 192000)
+ format.m_sampleRate = 192000;
+
//fill waveformatex
ZeroMemory(&wfxex, sizeof(WAVEFORMATEXTENSIBLE));
wfxex.Format.cbSize = sizeof(WAVEFORMATEXTENSIBLE)-sizeof(WAVEFORMATEX);