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

Commit 080d6b39 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

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

parents 6bb0136d 2be5078e
Loading
Loading
Loading
Loading
+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;