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

Commit 3bc169c7 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "audio: Prolong reading attempts from the remote submix pipe" into main am: 080d6b39 

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3180240



Change-Id: I26764afcb8072af834778d303da0515c8eb0dc28
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9114f6d7 080d6b39

audio/aidl/default/r_submix/StreamRemoteSubmix.cpp

+6 −3
Original line number Diff line number Diff line
@@ -285,9 +285,12 @@ size_t StreamRemoteSubmix::getStreamPipeSizeInFrames() { 
    char* buff = (char*)buffer;

    size_t actuallyRead = 0;

    long remainingFrames = frameCount;

    const int64_t deadlineTimeNs =

            ::android::uptimeNanos() +

            getDelayInUsForFrameCount(frameCount) * NANOS_PER_MICROSECOND / 2;

    // Try to wait as long as possible for the audio duration, but leave some time for the call to

    // 'transfer' to complete. 'kReadAttemptSleepUs' is a good constant for this purpose because it

    // is by definition "strictly inferior" to the typical buffer duration.

    const long durationUs =

            std::max(0L, getDelayInUsForFrameCount(frameCount) - kReadAttemptSleepUs);

    const int64_t deadlineTimeNs = ::android::uptimeNanos() + durationUs * NANOS_PER_MICROSECOND;

    while (remainingFrames > 0) {

        ssize_t framesRead = source->read(buff, remainingFrames);

        LOG(VERBOSE) << __func__ << ": frames read " << framesRead;