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

Commit 1281c1d4 authored by Phil Burk's avatar Phil Burk Committed by Automerger Merge Worker
Browse files

Merge changes from topic "aaudio-callback-close" into rvc-qpr-dev am: 27514853 

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

Change-Id: I520180492759313fd28baea43e43ec0af1f6c334
parents af69d220 27514853

services/oboeservice/AAudioServiceEndpointCapture.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -69,7 +69,7 @@ void *AAudioServiceEndpointCapture::callbackLoop() { 
        // Read audio data from stream using a blocking read.

        // Read audio data from stream using a blocking read.

        result = getStreamInternal()->read(mDistributionBuffer, getFramesPerBurst(), timeoutNanos);

        result = getStreamInternal()->read(mDistributionBuffer, getFramesPerBurst(), timeoutNanos);

        if (result == AAUDIO_ERROR_DISCONNECTED) {

        if (result == AAUDIO_ERROR_DISCONNECTED) {

            disconnectRegisteredStreams();

            ALOGV("%s() read() returned AAUDIO_ERROR_DISCONNECTED, break", __func__);

            break;

            break;

        } else if (result != getFramesPerBurst()) {

        } else if (result != getFramesPerBurst()) {

            ALOGW("callbackLoop() read %d / %d",

            ALOGW("callbackLoop() read %d / %d",

services/oboeservice/AAudioServiceEndpointPlay.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -145,7 +145,7 @@ void *AAudioServiceEndpointPlay::callbackLoop() { 
        result = getStreamInternal()->write(mMixer.getOutputBuffer(),

        result = getStreamInternal()->write(mMixer.getOutputBuffer(),

                                            getFramesPerBurst(), timeoutNanos);

                                            getFramesPerBurst(), timeoutNanos);

        if (result == AAUDIO_ERROR_DISCONNECTED) {

        if (result == AAUDIO_ERROR_DISCONNECTED) {

            AAudioServiceEndpointShared::disconnectRegisteredStreams();

            ALOGV("%s() write() returned AAUDIO_ERROR_DISCONNECTED, break", __func__);

            break;

            break;

        } else if (result != getFramesPerBurst()) {

        } else if (result != getFramesPerBurst()) {

            ALOGW("callbackLoop() wrote %d / %d",

            ALOGW("callbackLoop() wrote %d / %d",