diff options
| author | Eric Laurent <elaurent@google.com> | 2014-03-05 22:48:11 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-05 22:48:11 +0000 |
| commit | 0c937b4946fae178447d9f8d29200fa2798c05f9 (patch) | |
| tree | b5c507e70c853037602d4e898b75c2d307ae2c4d /services/audioflinger | |
| parent | 57f87026a30f3e461f6a804e94b6dab7b385f3ca (diff) | |
| parent | eb16bb5dcecf430bfec1c2a4bd15851c83b9c3cc (diff) | |
| download | frameworks_av-0c937b4946fae178447d9f8d29200fa2798c05f9.zip frameworks_av-0c937b4946fae178447d9f8d29200fa2798c05f9.tar.gz frameworks_av-0c937b4946fae178447d9f8d29200fa2798c05f9.tar.bz2 | |
am eb16bb5d: am 7028a2c8: am 7e92abea: audioflinger: fix offload write buffer offset
* commit 'eb16bb5dcecf430bfec1c2a4bd15851c83b9c3cc':
audioflinger: fix offload write buffer offset
Diffstat (limited to 'services/audioflinger')
| -rw-r--r-- | services/audioflinger/Threads.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/services/audioflinger/Threads.cpp b/services/audioflinger/Threads.cpp index f0f5a4d..cac785a 100644 --- a/services/audioflinger/Threads.cpp +++ b/services/audioflinger/Threads.cpp @@ -1917,7 +1917,7 @@ ssize_t AudioFlinger::PlaybackThread::threadLoop_write() // otherwise use the HAL / AudioStreamOut directly } else { // Direct output and offload threads - size_t offset = (mCurrentWriteLength - mBytesRemaining) / sizeof(int16_t); + size_t offset = (mCurrentWriteLength - mBytesRemaining); if (mUseAsyncWrite) { ALOGW_IF(mWriteAckSequence & 1, "threadLoop_write(): out of sequence write request"); mWriteAckSequence += 2; @@ -1928,7 +1928,7 @@ ssize_t AudioFlinger::PlaybackThread::threadLoop_write() // FIXME We should have an implementation of timestamps for direct output threads. // They are used e.g for multichannel PCM playback over HDMI. bytesWritten = mOutput->stream->write(mOutput->stream, - mMixBuffer + offset, mBytesRemaining); + (char *)mMixBuffer + offset, mBytesRemaining); if (mUseAsyncWrite && ((bytesWritten < 0) || (bytesWritten == (ssize_t)mBytesRemaining))) { // do not wait for async callback in case of error of full write |