diff options
| author | Glenn Kasten <gkasten@google.com> | 2012-01-12 10:30:28 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-01-12 10:30:28 -0800 |
| commit | 1c66547ba25be6a1893df0ae26857f649474843a (patch) | |
| tree | 56b751b312560ea89f4d48ed49b5bd192ae1841d /core/jni/android_media_AudioTrack.cpp | |
| parent | cc9858049ddea5a28cbd1d6ee59dd814e21ef512 (diff) | |
| parent | 1c5a89d4af193e3ce9be9992ffee0ab0a4d8da5a (diff) | |
| download | frameworks_base-1c66547ba25be6a1893df0ae26857f649474843a.zip frameworks_base-1c66547ba25be6a1893df0ae26857f649474843a.tar.gz frameworks_base-1c66547ba25be6a1893df0ae26857f649474843a.tar.bz2 | |
Merge "Use audio_format_t consistently"
Diffstat (limited to 'core/jni/android_media_AudioTrack.cpp')
| -rw-r--r-- | core/jni/android_media_AudioTrack.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/jni/android_media_AudioTrack.cpp b/core/jni/android_media_AudioTrack.cpp index 4067324..d921685 100644 --- a/core/jni/android_media_AudioTrack.cpp +++ b/core/jni/android_media_AudioTrack.cpp @@ -240,7 +240,7 @@ android_media_AudioTrack_native_setup(JNIEnv *env, jobject thiz, jobject weak_th // compute the frame count int bytesPerSample = audioFormat == javaAudioTrackFields.PCM16 ? 2 : 1; - int format = audioFormat == javaAudioTrackFields.PCM16 ? + audio_format_t format = audioFormat == javaAudioTrackFields.PCM16 ? AUDIO_FORMAT_PCM_16_BIT : AUDIO_FORMAT_PCM_8_BIT; int frameCount = buffSizeInBytes / (nbChannels * bytesPerSample); |