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

Commit 84b14e04 authored by Mikhail Naganov's avatar Mikhail Naganov Committed by Automerger Merge Worker
Browse files

Merge "audio: Fix output blocking condition in the remote submix" into main... 

Merge "audio: Fix output blocking condition in the remote submix" into main am: 759e587a am: beab8e3d

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



Change-Id: I89a8091731a81414364efc3e52ca43b7c8ca6a52
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 370ef59f beab8e3d

audio/aidl/default/r_submix/StreamRemoteSubmix.cpp

+2 −4
Original line number Diff line number Diff line
@@ -77,17 +77,15 @@ StreamRemoteSubmix::~StreamRemoteSubmix() { 
}



::android::status_t StreamRemoteSubmix::drain(StreamDescriptor::DrainMode) {

    usleep(1000);

    return ::android::OK;

}



::android::status_t StreamRemoteSubmix::flush() {

    usleep(1000);

    return ::android::OK;

    // TODO(b/372951987): consider if this needs to be done from 'StreamInWorkerLogic::cycle'.

    return mIsInput ? standby() : ::android::OK;

}



::android::status_t StreamRemoteSubmix::pause() {

    usleep(1000);

    return ::android::OK;

}

audio/aidl/default/r_submix/SubmixRoute.cpp

+2 −2
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ bool SubmixRoute::hasAtleastOneStreamOpen() { 
//   start was delayed

bool SubmixRoute::shouldBlockWrite() {

    std::lock_guard guard(mLock);

    return (mStreamInOpen || (mStreamInStandby && (mReadCounterFrames != 0)));

    return mStreamInOpen && (!mStreamInStandby || mReadCounterFrames == 0);

}



long SubmixRoute::updateReadCounterFrames(size_t frameCount) {

audio/aidl/vts/VtsHalAudioCoreModuleTargetTest.cpp

+251 −103

File changed.

Preview size limit exceeded, changes collapsed.