diff options
| author | Eric Laurent <elaurent@google.com> | 2014-03-05 22:41:53 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-05 22:41:53 +0000 |
| commit | 7028a2c8106ee5a22db88da5dad581820ee07254 (patch) | |
| tree | afcb2b29c856c84809893e5dda8a68f68054ed75 /services | |
| parent | 6b2604259c12ee28b49f26ab2adac96eefe30934 (diff) | |
| parent | 7e92abeafb184e8a34213d7149592e95a72601b0 (diff) | |
| download | frameworks_av-7028a2c8106ee5a22db88da5dad581820ee07254.zip frameworks_av-7028a2c8106ee5a22db88da5dad581820ee07254.tar.gz frameworks_av-7028a2c8106ee5a22db88da5dad581820ee07254.tar.bz2 | |
am 7e92abea: audioflinger: fix offload write buffer offset
* commit '7e92abeafb184e8a34213d7149592e95a72601b0':
audioflinger: fix offload write buffer offset
Diffstat (limited to 'services')
| -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 dfab0cc..14629de 100644 --- a/services/audioflinger/Threads.cpp +++ b/services/audioflinger/Threads.cpp @@ -1915,7 +1915,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; @@ -1926,7 +1926,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 |