commit 02743e21156fa3063dc3718982e291cf60ec37cd
author Mikhail Naganov <mnaganov@google.com> Wed Nov 28 15:56:55 2018 -0800
committer Mikhail Naganov <mnaganov@google.com> Thu Nov 29 19:21:45 2018 +0000
tree 0339c12971b8145ebca1b5c523390dc02654b945
parent e4eb88fa5fe62a9b6b709fbf2ff26f37acf6db20

Audio policy: Use surround formats from audio config instead of hardcoded

This is a follow-up to ag/3835377, where the intention was to
use SURROND_FORMATS array, which is lately been replaced by
an array from APM's config.

Bug: 67479735
Bug: 117602867
Test: make
Change-Id: I31f63856d8fb06ff9ac0f03b9ec1600f0fcee30b

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

diff --git a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
index 61405bc..18c5567 100644
--- a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
+++ b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
@@ -5895,18 +5895,8 @@
             // Add reported surround sound formats to enabled surround formats.
             for (size_t formatIndex = 0; formatIndex < formats.size(); formatIndex++) {
                 audio_format_t format = formats[formatIndex];
-                switch(format) {
-                    case AUDIO_FORMAT_AC3:
-                    case AUDIO_FORMAT_E_AC3:
-                    case AUDIO_FORMAT_DTS:
-                    case AUDIO_FORMAT_DTS_HD:
-                    case AUDIO_FORMAT_AAC_LC:
-                    case AUDIO_FORMAT_DOLBY_TRUEHD:
-                    case AUDIO_FORMAT_E_AC3_JOC:
-                        mSurroundFormats.insert(format);
-                        break;
-                    default:
-                        break;
+                if (mConfig.getSurroundFormats().count(format) != 0) {
+                    mSurroundFormats.insert(format);
                 }
             }
         }