summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Laurent <elaurent@google.com>2011-07-21 19:35:01 -0700
committerEric Laurent <elaurent@google.com>2011-07-21 21:00:46 -0700
commit095086111f70ad538a97c7ef69f633cc74f2dbe6 (patch)
tree78346b22f8902dcffd22f0774f386a736874f005
parentec89a2b6063b3826373f5cbb85f0c620042f12e6 (diff)
downloadframeworks_base-095086111f70ad538a97c7ef69f633cc74f2dbe6.zip
frameworks_base-095086111f70ad538a97c7ef69f633cc74f2dbe6.tar.gz
frameworks_base-095086111f70ad538a97c7ef69f633cc74f2dbe6.tar.bz2
Fix issue 4988574: 8 bit PCM audio playback broken.
Fixed regression in audio track control block frame size calculation introduced by commit c310dcb. Change-Id: Ia731b946ae4e43316b98d80229e3b08a696e47d6
-rw-r--r--services/audioflinger/AudioFlinger.cpp2
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);
}
}