diff options
| author | Eric Laurent <elaurent@google.com> | 2014-07-22 02:11:17 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-07-21 15:42:19 +0000 |
| commit | eeaf40a8e413780bd2aacde172ac820e2ce12eb3 (patch) | |
| tree | f0716de6ba05862b9adae40ae96c9bb5f020a752 /services | |
| parent | 225d5b20409fd400bfa4ed5e9bc1d5babb498471 (diff) | |
| parent | a204994e7dd7dab931297176c66b5d3b82e2c90b (diff) | |
| download | frameworks_av-eeaf40a8e413780bd2aacde172ac820e2ce12eb3.zip frameworks_av-eeaf40a8e413780bd2aacde172ac820e2ce12eb3.tar.gz frameworks_av-eeaf40a8e413780bd2aacde172ac820e2ce12eb3.tar.bz2 | |
Merge "audio policy: add missing formats to audio_policy.conf parser." into lmp-dev
Diffstat (limited to 'services')
| -rw-r--r-- | services/audiopolicy/AudioPolicyManager.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/services/audiopolicy/AudioPolicyManager.cpp b/services/audiopolicy/AudioPolicyManager.cpp index cca1b34..d9acb56 100644 --- a/services/audiopolicy/AudioPolicyManager.cpp +++ b/services/audiopolicy/AudioPolicyManager.cpp @@ -5316,7 +5316,9 @@ audio_channel_mask_t AudioPolicyManager::AudioPort::pickChannelMask() const const audio_format_t AudioPolicyManager::AudioPort::sPcmFormatCompareTable[] = { AUDIO_FORMAT_DEFAULT, AUDIO_FORMAT_PCM_16_BIT, + AUDIO_FORMAT_PCM_8_24_BIT, AUDIO_FORMAT_PCM_24_BIT_PACKED, + AUDIO_FORMAT_PCM_32_BIT, }; int AudioPolicyManager::AudioPort::compareFormats(audio_format_t format1, |