Snap for 11302939 from cadbe176ec14debd859ae1feb30c207436f2d81c to 24Q2-release (5657f62f) · Commits · e / os / android_hardware_interfaces

audio/aidl/TEST_MAPPING

+15 −0

Original line number	Diff line number	Diff line
		@@ -55,6 +55,21 @@
		"postsubmit": [
		{
		"name": "VtsHalSpatializerTargetTest"
		},
		{
		"name": "audiorecord_tests"
		},
		{
		"name": "audioeffect_tests"
		},
		{
		"name": "audiorouting_tests"
		},
		{
		"name": "trackplayerbase_tests"
		},
		{
		"name": "audiosystem_tests"
		}
		]
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -57,7 +57,7 @@ class ModuleRemoteSubmix : public Module {
		ndk::ScopedAStatus onMasterVolumeChanged(float volume) override;
		int32_t getNominalLatencyMs(
		const ::aidl::android::media::audio::common::AudioPortConfig& portConfig) override;
		// TODO(b/307586684): Report proper minimum stream buffer size by overriding 'setAudioPatch'.
		binder_status_t dump(int fd, const char** args, uint32_t numArgs) override;
		};

		} // namespace aidl::android::hardware::audio::core

+1 −0

Original line number	Diff line number	Diff line
		@@ -67,6 +67,7 @@ class StreamRemoteSubmix : public StreamCommonImpl {
		int64_t mStartTimeNs = 0;
		long mFramesSinceStart = 0;
		int mReadErrorCount = 0;
		int mReadFailureCount = 0;
		};

		class StreamInRemoteSubmix final : public StreamIn, public StreamSwitcher {

+6 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@

		#define LOG_TAG "AHAL_ModuleRemoteSubmix"

		#include <stdio.h>
		#include <vector>

		#include <android-base/logging.h>
		@@ -174,4 +175,9 @@ int32_t ModuleRemoteSubmix::getNominalLatencyMs(const AudioPortConfig&) {
		return kMinLatencyMs;
		}

		binder_status_t ModuleRemoteSubmix::dump(int fd, const char** /args/, uint32_t /numArgs/) {
		dprintf(fd, "\nSubmixRoutes:\n%s\n", r_submix::SubmixRoute::dumpRoutes().c_str());
		return STATUS_OK;
		}

		} // namespace aidl::android::hardware::audio::core

+7 −1

Original line number	Diff line number	Diff line
		@@ -267,6 +267,7 @@ size_t StreamRemoteSubmix::getStreamPipeSizeInFrames() {
		}
		return ::android::OK;
		}
		mReadErrorCount = 0;

		LOG(VERBOSE) << __func__ << ": " << mDeviceAddress.toString() << ", " << frameCount
		<< " frames";
		@@ -294,7 +295,12 @@ size_t StreamRemoteSubmix::getStreamPipeSizeInFrames() {
		}
		}
		if (actuallyRead < frameCount) {
		LOG(WARNING) << __func__ << ": read " << actuallyRead << " vs. requested " << frameCount;
		if (++mReadFailureCount < kMaxReadFailureAttempts) {
		LOG(WARNING) << __func__ << ": read " << actuallyRead << " vs. requested " << frameCount
		<< " (not all errors will be logged)";
		}
		} else {
		mReadFailureCount = 0;
		}
		mCurrentRoute->updateReadCounterFrames(*actualFrameCount);
		return ::android::OK;