Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7e92abea authored by Eric Laurent's avatar Eric Laurent
Browse files

audioflinger: fix offload write buffer offset 

Fix current audio HAL write buffer offset calculation
which assumes that the frame size is a multiple of 2.
'
Bug: 12823725.

Change-Id: I0195ed5cfef225a6f114e7dd405a02680bb7254e
parent 85b3013e

services/audioflinger/Threads.cpp

+2 −2
Original line number Diff line number Diff line
@@ -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