diff options
| author | Eric Laurent <elaurent@google.com> | 2011-07-22 11:04:07 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-07-22 11:04:07 -0700 |
| commit | 35f0837325240b7612d33bbdd0654cf013ffdea6 (patch) | |
| tree | 59d1e017f018f656555b965a0d5a94b252ea51cf | |
| parent | 8cbe6e9cef46adc14b6c3e0f3ea303b78232a8b9 (diff) | |
| parent | 095086111f70ad538a97c7ef69f633cc74f2dbe6 (diff) | |
| download | frameworks_base-35f0837325240b7612d33bbdd0654cf013ffdea6.zip frameworks_base-35f0837325240b7612d33bbdd0654cf013ffdea6.tar.gz frameworks_base-35f0837325240b7612d33bbdd0654cf013ffdea6.tar.bz2 | |
Merge "Fix issue 4988574: 8 bit PCM audio playback broken."
| -rw-r--r-- | services/audioflinger/AudioFlinger.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp index 482336b..0323fe0 100644 --- a/services/audioflinger/AudioFlinger.cpp +++ b/services/audioflinger/AudioFlinger.cpp @@ -2954,7 +2954,7 @@ AudioFlinger::PlaybackThread::Track::Track( mStreamType = streamType; // NOTE: audio_track_cblk_t::frameSize for 8 bit PCM data is based on a sample size of // 16 bit because data is converted to 16 bit before being stored in buffer by AudioTrack - mCblk->frameSize = audio_is_linear_pcm(format) ? mChannelCount * audio_bytes_per_sample(format) : sizeof(uint8_t); + mCblk->frameSize = audio_is_linear_pcm(format) ? mChannelCount * sizeof(int16_t) : sizeof(uint8_t); } } |