diff options
| author | Paul McLean <pmclean@google.com> | 2015-06-17 10:10:11 -0700 |
|---|---|---|
| committer | Paul McLean <pmclean@google.com> | 2015-06-17 10:44:56 -0700 |
| commit | 4e5e9e9405dc626a03a653161644841102ad89f1 (patch) | |
| tree | 211b49ff068266d04d84a9446ab959a9427de610 /core/jni/android_media_AudioFormat.h | |
| parent | 52ca020722e8db42f9240de6959567d734f3ac6f (diff) | |
| download | frameworks_base-4e5e9e9405dc626a03a653161644841102ad89f1.zip frameworks_base-4e5e9e9405dc626a03a653161644841102ad89f1.tar.gz frameworks_base-4e5e9e9405dc626a03a653161644841102ad89f1.tar.bz2 | |
Map >= 24bit encodings to ENCODING_PCM_FLOAT
Bug: 21851140
Change-Id: I8203281f5ca7d194e1bd2f417e75d3ef2fd561c7
Diffstat (limited to 'core/jni/android_media_AudioFormat.h')
| -rw-r--r-- | core/jni/android_media_AudioFormat.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/core/jni/android_media_AudioFormat.h b/core/jni/android_media_AudioFormat.h index 5144457..bb13c35 100644 --- a/core/jni/android_media_AudioFormat.h +++ b/core/jni/android_media_AudioFormat.h @@ -80,6 +80,13 @@ static inline int audioFormatFromNative(audio_format_t nativeFormat) return ENCODING_PCM_8BIT; case AUDIO_FORMAT_PCM_FLOAT: return ENCODING_PCM_FLOAT; + + // map these to ENCODING_PCM_FLOAT + case AUDIO_FORMAT_PCM_8_24_BIT: + case AUDIO_FORMAT_PCM_24_BIT_PACKED: + case AUDIO_FORMAT_PCM_32_BIT: + return ENCODING_PCM_FLOAT; + case AUDIO_FORMAT_AC3: return ENCODING_AC3; case AUDIO_FORMAT_E_AC3: |