Merge "audio: Fix output blocking condition in the remote submix" into main (759e587a) · Commits · e / os / android_hardware_interfaces

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;
		}

+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) {

+251 −103

File changed.

Preview size limit exceeded, changes collapsed.