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

Commit a9bbf244 authored by Andy Hung's avatar Andy Hung Committed by Automerger Merge Worker
Browse files

Merge "AudioRecord:read() memcpy non PCM audio buffers" into main am: 0afdd803 

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2821396



Change-Id: Ie3f2e7727bc78ea912b112c4e6e9363088cdfe60
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 50d3ef51 0afdd803

media/libaudioclient/AudioRecord.cpp

+6 −2
Original line number Diff line number Diff line
@@ -1225,8 +1225,12 @@ ssize_t AudioRecord::read(void* buffer, size_t userSize, bool blocking) 
        }



        size_t bytesRead = audioBuffer.frameCount * mFrameSize;

        if (audio_is_linear_pcm(mFormat)) {

            memcpy_by_audio_format(buffer, mFormat, audioBuffer.raw, mServerConfig.format,

                                audioBuffer.mSize / mServerSampleSize);

        } else {

            memcpy(buffer, audioBuffer.raw, audioBuffer.mSize);

        }

        buffer = ((char *) buffer) + bytesRead;

        userSize -= bytesRead;

        read += bytesRead;