diff options
| author | Martijn Kaijser <martijn@xbmc.org> | 2016-12-29 11:54:34 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-29 11:54:34 +0100 |
| commit | 1ecc95ac29fc3112b5ea9311e1855fce6e0de08e (patch) | |
| tree | cd2cdaa9ce3b1904f117c9a879df966c6705bfc7 | |
| parent | 32ff0e1005543adf2f8300404915a65bd156f057 (diff) | |
| parent | 81e13090dd177cd42406e192bc088b4de7be7b9e (diff) | |
Merge pull request #11293 from MartijnKaijser/1127617.0rc1-Krypton
AE: fix normalize volume on reconfigure
| -rw-r--r-- | xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEBuffer.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEBuffer.cpp b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEBuffer.cpp index 362fae6d4e..d38afea2b5 100644 --- a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEBuffer.cpp +++ b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEBuffer.cpp @@ -553,8 +553,7 @@ bool CActiveAEBufferPoolResample::ResampleBuffers(int64_t timestamp) void CActiveAEBufferPoolResample::ConfigureResampler(bool normalizelevels, bool dspenabled, bool stereoupmix, AEQuality quality) { bool normalize = true; - if ((m_format.m_channelLayout.Count() < m_inputFormat.m_channelLayout.Count()) && - normalizelevels) + if ((m_format.m_channelLayout.Count() < m_inputFormat.m_channelLayout.Count()) && !normalizelevels) normalize = false; /* Disable upmix if DSP layout > 2.0, becomes perfomed by DSP */ |