diff options
| author | Andy Hung <hunga@google.com> | 2015-01-15 22:56:03 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-01-15 22:56:03 +0000 |
| commit | dda683a2ccb84ccc840b76e2ced10052f65ce43e (patch) | |
| tree | dcea45fba84635e924e42c60c710ae2b8789c9d2 /services/audioflinger | |
| parent | d488982887e24f4a8e61f68d945a2f113f43579e (diff) | |
| parent | abdb990953ffe94a9dc544aea0bed17ef7d5f484 (diff) | |
| download | frameworks_av-dda683a2ccb84ccc840b76e2ced10052f65ce43e.zip frameworks_av-dda683a2ccb84ccc840b76e2ced10052f65ce43e.tar.gz frameworks_av-dda683a2ccb84ccc840b76e2ced10052f65ce43e.tar.bz2 | |
Merge "Allow AUDIO_FORMAT_PCM_8_BIT AudioTrack buffers"
Diffstat (limited to 'services/audioflinger')
| -rw-r--r-- | services/audioflinger/AudioMixer.h | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/services/audioflinger/AudioMixer.h b/services/audioflinger/AudioMixer.h index c2ff985..c5df08a 100644 --- a/services/audioflinger/AudioMixer.h +++ b/services/audioflinger/AudioMixer.h @@ -127,10 +127,16 @@ public: size_t getUnreleasedFrames(int name) const; static inline bool isValidPcmTrackFormat(audio_format_t format) { - return format == AUDIO_FORMAT_PCM_16_BIT || - format == AUDIO_FORMAT_PCM_24_BIT_PACKED || - format == AUDIO_FORMAT_PCM_32_BIT || - format == AUDIO_FORMAT_PCM_FLOAT; + switch (format) { + case AUDIO_FORMAT_PCM_8_BIT: + case AUDIO_FORMAT_PCM_16_BIT: + case AUDIO_FORMAT_PCM_24_BIT_PACKED: + case AUDIO_FORMAT_PCM_32_BIT: + case AUDIO_FORMAT_PCM_FLOAT: + return true; + default: + return false; + } } private: |