Merge "Audio r_submix : Handle the usecase when no data is available to read." into main (0bc307a5) · Commits · e / os / android_hardware_interfaces

audio/aidl/default/r_submix/StreamRemoteSubmix.cpp

+14 −12

Original line number	Diff line number	Diff line
		@@ -280,15 +280,19 @@ size_t StreamRemoteSubmix::getStreamPipeSizeInFrames() {
		size_t* actualFrameCount) {
		// about to read from audio source
		sp<MonoPipeReader> source = mCurrentRoute->getSource();
		if (source == nullptr \|\| source->availableToRead() == 0) {
		if (source == nullptr) {
		int readErrorCount = mCurrentRoute->notifyReadError();
		if (readErrorCount < kMaxReadErrorLogs) {
		LOG(ERROR)
		<< __func__
		<< ": no audio pipe yet we're trying to read! (not all errors will be logged)";
		LOG(ERROR) << __func__
		<< ": no audio pipe yet we're trying to read! (not all errors will be "
		"logged)";
		} else {
		LOG(ERROR) << __func__ << ": Read errors " << readErrorCount;
		}
		} else {
		LOG(INFO) << __func__ << ": no data to read yet, providing empty data";
		}
		const size_t delayUs = static_cast<size_t>(
		std::roundf(frameCount * MICROS_PER_SECOND / mStreamConfig.sampleRate));
		usleep(delayUs);
		@@ -344,11 +348,9 @@ size_t StreamRemoteSubmix::getStreamPipeSizeInFrames() {
		// recording (including this call): it's converted to usec and compared to how long we've been
		// recording for, which gives us how long we must wait to sync the projected recording time, and
		// the observed recording time.
		static constexpr float kScaleFactor = .8f;
		const size_t projectedVsObservedOffsetUs =
		kScaleFactor * (static_cast<size_t>(std::roundf((readCounterFrames * MICROS_PER_SECOND /
		mStreamConfig.sampleRate) -
		recordDurationUs.count())));
		const size_t projectedVsObservedOffsetUs = static_cast<size_t>(
		std::roundf((readCounterFrames * MICROS_PER_SECOND / mStreamConfig.sampleRate) -
		recordDurationUs.count()));

		LOG(VERBOSE) << __func__ << ": record duration " << recordDurationUs.count()
		<< " microseconds, will wait: " << projectedVsObservedOffsetUs << " microseconds";