From 136a4c1ea0f4440583e2f11e8adb60a95a41cf27 Mon Sep 17 00:00:00 2001 From: fritsch Date: Mon, 9 Mar 2020 19:56:58 +0100 Subject: [PATCH] Revert "AESinkAudioTrack: Support multi channel float" This reverts commit 12abe3193561d340a5f484e2102b7909dda0828d. --- .../cores/AudioEngine/Sinks/AESinkAUDIOTRACK.cpp | 16 +--------------- xbmc/cores/AudioEngine/Sinks/AESinkAUDIOTRACK.h | 1 - 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/xbmc/cores/AudioEngine/Sinks/AESinkAUDIOTRACK.cpp b/xbmc/cores/AudioEngine/Sinks/AESinkAUDIOTRACK.cpp index 0f3fadfa89865..ff80aeb2855b0 100644 --- a/xbmc/cores/AudioEngine/Sinks/AESinkAUDIOTRACK.cpp +++ b/xbmc/cores/AudioEngine/Sinks/AESinkAUDIOTRACK.cpp @@ -247,7 +247,6 @@ int CAESinkAUDIOTRACK::AudioTrackWrite(char* audioData, int sizeInBytes, int64_t CAEDeviceInfo CAESinkAUDIOTRACK::m_info; std::set CAESinkAUDIOTRACK::m_sink_sampleRates; bool CAESinkAUDIOTRACK::m_sinkSupportsFloat = false; -bool CAESinkAUDIOTRACK::m_sinkSupportsMultiChannelFloat = false; //////////////////////////////////////////////////////////////////////////////////////////// CAESinkAUDIOTRACK::CAESinkAUDIOTRACK() @@ -378,12 +377,7 @@ bool CAESinkAUDIOTRACK::Initialize(AEAudioFormat &format, std::string &device) { m_passthrough = false; m_format.m_sampleRate = m_sink_sampleRate; - if (m_sinkSupportsMultiChannelFloat) - { - m_encoding = CJNIAudioFormat::ENCODING_PCM_FLOAT; - m_format.m_dataFormat = AE_FMT_FLOAT; - } - else if (m_sinkSupportsFloat && m_format.m_channelLayout.Count() == 2) + if (m_sinkSupportsFloat && m_format.m_channelLayout.Count() == 2) { m_encoding = CJNIAudioFormat::ENCODING_PCM_FLOAT; m_format.m_dataFormat = AE_FMT_FLOAT; @@ -1009,10 +1003,6 @@ void CAESinkAUDIOTRACK::UpdateAvailablePCMCapabilities() int encoding = CJNIAudioFormat::ENCODING_PCM_16BIT; m_sinkSupportsFloat = VerifySinkConfiguration(native_sampleRate, CJNIAudioFormat::CHANNEL_OUT_STEREO, CJNIAudioFormat::ENCODING_PCM_FLOAT); - // Only try for Android 7 or later - there are a lot of old devices that open successfully - // but won't work correctly under the hood (famouse example: old FireTV) - if (CJNIAudioManager::GetSDKVersion() > 23) - m_sinkSupportsMultiChannelFloat = VerifySinkConfiguration(native_sampleRate, CJNIAudioFormat::CHANNEL_OUT_7POINT1_SURROUND, CJNIAudioFormat::ENCODING_PCM_FLOAT); if (m_sinkSupportsFloat) { @@ -1020,10 +1010,6 @@ void CAESinkAUDIOTRACK::UpdateAvailablePCMCapabilities() m_info.m_dataFormats.push_back(AE_FMT_FLOAT); CLog::Log(LOGNOTICE, "Float is supported"); } - if (m_sinkSupportsMultiChannelFloat) - { - CLog::Log(LOGNOTICE, "Multi channel Float is supported"); - } // Still AML API 21 and 22 get hardcoded samplerates - we can drop that // when we stop supporting API < 23 - let's only add the default diff --git a/xbmc/cores/AudioEngine/Sinks/AESinkAUDIOTRACK.h b/xbmc/cores/AudioEngine/Sinks/AESinkAUDIOTRACK.h index 647ca62d47b51..187257c17424e 100644 --- a/xbmc/cores/AudioEngine/Sinks/AESinkAUDIOTRACK.h +++ b/xbmc/cores/AudioEngine/Sinks/AESinkAUDIOTRACK.h @@ -75,7 +75,6 @@ class CAESinkAUDIOTRACK : public IAESink static CAEDeviceInfo m_info; static std::set m_sink_sampleRates; static bool m_sinkSupportsFloat; - static bool m_sinkSupportsMultiChannelFloat; AEAudioFormat m_format; double m_volume;