diff options
| author | Andy Hung <hunga@google.com> | 2014-07-29 23:52:28 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-07-29 21:36:00 +0000 |
| commit | 8b685b9e56cc207d44b08d124148e7d752ef2241 (patch) | |
| tree | bd05bd91ffe8ba1d0e0200884448d0de8d5c60b6 /services/audiopolicy/AudioPolicyManager.h | |
| parent | a4daf0b4f934b800a49f199fb8c09409391c8fc0 (diff) | |
| parent | 9a60538b9ee2b097770dcd378281b31f4218ae56 (diff) | |
| download | frameworks_av-8b685b9e56cc207d44b08d124148e7d752ef2241.zip frameworks_av-8b685b9e56cc207d44b08d124148e7d752ef2241.tar.gz frameworks_av-8b685b9e56cc207d44b08d124148e7d752ef2241.tar.bz2 | |
Merge "Update multichannel audio policy handling" into lmp-dev
Diffstat (limited to 'services/audiopolicy/AudioPolicyManager.h')
| -rw-r--r-- | services/audiopolicy/AudioPolicyManager.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/services/audiopolicy/AudioPolicyManager.h b/services/audiopolicy/AudioPolicyManager.h index ec94144..e28a362 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. |