ActiveAE: nail sampling rate to 48khz for transcode

diff --git a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp
index 6a59c54..c805360 100644 (file)
--- a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp
+++ b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp
@@ -896,6 +896,7 @@ void CActiveAE::Configure(AEAudioFormat *desiredFmt)
     {
       outputFormat = inputFormat;
       outputFormat.m_dataFormat = AE_FMT_FLOATP;
+      outputFormat.m_sampleRate = 48000;
 
       if (g_advancedSettings.m_audioResample)
       {
@@ -903,14 +904,6 @@ void CActiveAE::Configure(AEAudioFormat *desiredFmt)
         CLog::Log(LOGINFO, "CActiveAE::Configure - Forcing samplerate to %d", inputFormat.m_sampleRate);
       }
 
-      // check for valid sampling rates
-      if (inputFormat.m_sampleRate != 48000 &&
-          inputFormat.m_sampleRate != 44100 &&
-          inputFormat.m_sampleRate != 32000)
-      {
-        outputFormat.m_sampleRate = 48000;
-      }
-
       // setup encoder
       if (!m_encoder)
       {