summaryrefslogtreecommitdiffstats
path: root/services/audiopolicy/AudioPolicyManager.h
diff options
context:
space:
mode:
authorAndy Hung <hunga@google.com>2014-07-28 16:16:31 -0700
committerAndy Hung <hunga@google.com>2014-07-28 16:16:31 -0700
commit9a60538b9ee2b097770dcd378281b31f4218ae56 (patch)
tree2c1e28a60d4d561e7131d1b77ff67e933b9210d0 /services/audiopolicy/AudioPolicyManager.h
parent141670d465d7673dfa6ad712ad100f84882dfa95 (diff)
downloadframeworks_av-9a60538b9ee2b097770dcd378281b31f4218ae56.zip
frameworks_av-9a60538b9ee2b097770dcd378281b31f4218ae56.tar.gz
frameworks_av-9a60538b9ee2b097770dcd378281b31f4218ae56.tar.bz2
Update multichannel audio policy handling
Ensure AUDIO_FORMAT_PCM_FLOAT and AUDIO_FORMAT_PCM_32_BIT have proper precedence. Allow more mixer channels than 2. Change-Id: I02af97dad6218b25cbada4d93077a213314c6725
Diffstat (limited to 'services/audiopolicy/AudioPolicyManager.h')
-rw-r--r--services/audiopolicy/AudioPolicyManager.h5
1 files changed, 1 insertions, 4 deletions
diff --git a/services/audiopolicy/AudioPolicyManager.h b/services/audiopolicy/AudioPolicyManager.h
index 62b3ce5..13a9cf0 100644
--- a/services/audiopolicy/AudioPolicyManager.h
+++ b/services/audiopolicy/AudioPolicyManager.h
@@ -53,10 +53,7 @@ namespace android {
#define OFFLOAD_DEFAULT_MIN_DURATION_SECS 60
#define MAX_MIXER_SAMPLING_RATE 48000
-#define MAX_MIXER_CHANNEL_COUNT 2
-// See AudioPort::compareFormats()
-#define WORST_MIXER_FORMAT AUDIO_FORMAT_PCM_16_BIT
-#define BEST_MIXER_FORMAT AUDIO_FORMAT_PCM_24_BIT_PACKED
+#define MAX_MIXER_CHANNEL_COUNT 8
// ----------------------------------------------------------------------------
// AudioPolicyManager implements audio policy manager behavior common to all platforms.