diff options
| author | Glenn Kasten <gkasten@google.com> | 2012-01-12 12:27:51 -0800 |
|---|---|---|
| committer | Glenn Kasten <gkasten@google.com> | 2012-01-20 14:41:34 -0800 |
| commit | 0a204ed0f58a9baaac5630864cd75495486c6cbe (patch) | |
| tree | 5f81caa2a24b7a993c231cbd76bfaacd955a0355 /core/jni/android_media_AudioRecord.cpp | |
| parent | 2772143eff6a69ae7182e0c2628809d8dbd8d355 (diff) | |
| download | frameworks_base-0a204ed0f58a9baaac5630864cd75495486c6cbe.zip frameworks_base-0a204ed0f58a9baaac5630864cd75495486c6cbe.tar.gz frameworks_base-0a204ed0f58a9baaac5630864cd75495486c6cbe.tar.bz2 | |
Use audio_format_t consistently, continued
Was int or uint32_t.
When AudioFlinger::format can't determine the correct format,
return INVALID rather than DEFAULT.
Init mFormat to INVALID rather than DEFAULT in the constructor.
Subclass constructors will set mFormat to the correct value.
Change-Id: I9b62640aa107d24d2d27925f5563d0d7407d1b73
Diffstat (limited to 'core/jni/android_media_AudioRecord.cpp')
| -rw-r--r-- | core/jni/android_media_AudioRecord.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/jni/android_media_AudioRecord.cpp b/core/jni/android_media_AudioRecord.cpp index 3052553..3f1af86 100644 --- a/core/jni/android_media_AudioRecord.cpp +++ b/core/jni/android_media_AudioRecord.cpp @@ -147,7 +147,7 @@ android_media_AudioRecord_setup(JNIEnv *env, jobject thiz, jobject weak_this, } int bytesPerSample = audioFormat==javaAudioRecordFields.PCM16 ? 2 : 1; - int format = audioFormat==javaAudioRecordFields.PCM16 ? + audio_format_t format = audioFormat==javaAudioRecordFields.PCM16 ? AUDIO_FORMAT_PCM_16_BIT : AUDIO_FORMAT_PCM_8_BIT; if (buffSizeInBytes == 0) { |