diff options
| author | Andy Hung <hunga@google.com> | 2014-07-30 18:08:00 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-07-29 22:44:51 +0000 |
| commit | a6d28be0be0fa813080a021bd6a5920a8cb4fbb1 (patch) | |
| tree | 260d1b84861f406f39868f21af454c379297c7ff /services/audiopolicy | |
| parent | e1d37b784f3970e44a7331c189cbfdca15404648 (diff) | |
| parent | 3a0fe12fbd08b13e9f57d79b0391186be05072f5 (diff) | |
| download | frameworks_av-a6d28be0be0fa813080a021bd6a5920a8cb4fbb1.zip frameworks_av-a6d28be0be0fa813080a021bd6a5920a8cb4fbb1.tar.gz frameworks_av-a6d28be0be0fa813080a021bd6a5920a8cb4fbb1.tar.bz2 | |
Merge "Add Quad channel output to AudioPolicyManager" into lmp-dev
Diffstat (limited to 'services/audiopolicy')
| -rw-r--r-- | services/audiopolicy/AudioPolicyManager.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/services/audiopolicy/AudioPolicyManager.cpp b/services/audiopolicy/AudioPolicyManager.cpp index f0446f2..65d52d0 100644 --- a/services/audiopolicy/AudioPolicyManager.cpp +++ b/services/audiopolicy/AudioPolicyManager.cpp @@ -148,6 +148,7 @@ const StringToEnum sFormatNameToEnumTable[] = { const StringToEnum sOutChannelsNameToEnumTable[] = { STRING_TO_ENUM(AUDIO_CHANNEL_OUT_MONO), STRING_TO_ENUM(AUDIO_CHANNEL_OUT_STEREO), + STRING_TO_ENUM(AUDIO_CHANNEL_OUT_QUAD), STRING_TO_ENUM(AUDIO_CHANNEL_OUT_5POINT1), STRING_TO_ENUM(AUDIO_CHANNEL_OUT_7POINT1), }; |