Merge "Use hexadecimal toString for AudioUuid" (f9628574) · Commits · e / os / android_frameworks_av

media/libaudiohal/impl/EffectProxy.cpp

+13 −11

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@
		//#define LOG_NDEBUG 0

		#include <fmq/AidlMessageQueue.h>
		#include <system/audio_aidl_utils.h>
		#include <utils/Log.h>

		#include "EffectProxy.h"
		@@ -32,6 +33,7 @@ using ::aidl::android::hardware::audio::effect::IFactory;
		using ::aidl::android::hardware::audio::effect::Parameter;
		using ::aidl::android::hardware::audio::effect::State;
		using ::aidl::android::media::audio::common::AudioUuid;
		using ::android::audio::utils::toString;

		namespace android {
		namespace effect {
		@@ -54,7 +56,7 @@ EffectProxy::~EffectProxy() {

		// sub effect must have same proxy UUID as EffectProxy, and the type UUID must match.
		ndk::ScopedAStatus EffectProxy::addSubEffect(const Descriptor& sub) {
		ALOGV("%s: %s", __func__, mIdentity.type.toString().c_str());
		ALOGV("%s: %s", __func__, toString(mIdentity.type).c_str());
		if (0 != mSubEffects.count(sub.common.id) \|\| !sub.common.id.proxy.has_value() \|\|
		sub.common.id.proxy.value() != mIdentity.uuid) {
		ALOGE("%s sub effect already exist or mismatch %s", __func__, sub.toString().c_str());
		@@ -92,15 +94,15 @@ ndk::ScopedAStatus EffectProxy::addSubEffect(const Descriptor& sub) {
		}

		ndk::ScopedAStatus EffectProxy::create() {
		ALOGV("%s: %s", __func__, mIdentity.type.toString().c_str());
		ALOGV("%s: %s", __func__, toString(mIdentity.type).c_str());
		ndk::ScopedAStatus status = ndk::ScopedAStatus::ok();

		for (auto& sub : mSubEffects) {
		auto& effectHandle = std::get<SubEffectTupleIndex::HANDLE>(sub.second);
		ALOGI("%s sub-effect %s", __func__, sub.first.uuid.toString().c_str());
		ALOGI("%s sub-effect %s", __func__, toString(sub.first.uuid).c_str());
		status = mFactory->createEffect(sub.first.uuid, &effectHandle);
		if (!status.isOk() \|\| !effectHandle) {
		ALOGE("%s sub-effect failed %s", __func__, sub.first.uuid.toString().c_str());
		ALOGE("%s sub-effect failed %s", __func__, toString(sub.first.uuid).c_str());
		break;
		}
		}
		@@ -113,7 +115,7 @@ ndk::ScopedAStatus EffectProxy::create() {
		}

		ndk::ScopedAStatus EffectProxy::destroy() {
		ALOGV("%s: %s", __func__, mIdentity.type.toString().c_str());
		ALOGV("%s: %s", __func__, toString(mIdentity.type).c_str());
		return runWithAllSubEffects([&](std::shared_ptr<IEffect>& effect) {
		ndk::ScopedAStatus status = mFactory->destroyEffect(effect);
		if (status.isOk()) {
		@@ -131,7 +133,7 @@ ndk::ScopedAStatus EffectProxy::setOffloadParam(const effect_offload_param_t* of
		const auto& itor = std::find_if(mSubEffects.begin(), mSubEffects.end(), [&](const auto& sub) {
		const auto& desc = std::get<SubEffectTupleIndex::DESCRIPTOR>(sub.second);
		ALOGI("%s: isOffload %d sub-effect: %s, flags %s", __func__, offload->isOffload,
		desc.common.id.uuid.toString().c_str(), desc.common.flags.toString().c_str());
		toString(desc.common.id.uuid).c_str(), desc.common.flags.toString().c_str());
		return offload->isOffload ==
		(desc.common.flags.hwAcceleratorMode == Flags::HardwareAccelerator::TUNNEL);
		});
		@@ -143,7 +145,7 @@ ndk::ScopedAStatus EffectProxy::setOffloadParam(const effect_offload_param_t* of

		mActiveSub = itor->first;
		ALOGI("%s: active %soffload sub-effect: %s, flags %s", __func__,
		offload->isOffload ? "" : "non-", mActiveSub.uuid.toString().c_str(),
		offload->isOffload ? "" : "non-", toString(mActiveSub.uuid).c_str(),
		std::get<SubEffectTupleIndex::DESCRIPTOR>(itor->second).common.flags.toString().c_str());
		return ndk::ScopedAStatus::ok();
		}
		@@ -152,14 +154,14 @@ ndk::ScopedAStatus EffectProxy::setOffloadParam(const effect_offload_param_t* of
		ndk::ScopedAStatus EffectProxy::open(const Parameter::Common& common,
		const std::optional<Parameter::Specific>& specific,
		IEffect::OpenEffectReturn* ret __unused) {
		ALOGV("%s: %s", __func__, mIdentity.type.toString().c_str());
		ALOGV("%s: %s", __func__, toString(mIdentity.type).c_str());
		ndk::ScopedAStatus status = ndk::ScopedAStatus::fromExceptionCodeWithMessage(
		EX_ILLEGAL_ARGUMENT, "nullEffectHandle");
		for (auto& sub : mSubEffects) {
		auto& effect = std::get<SubEffectTupleIndex::HANDLE>(sub.second);
		auto& openRet = std::get<SubEffectTupleIndex::RETURN>(sub.second);
		if (!effect \|\| !(status = effect->open(common, specific, &openRet)).isOk()) {
		ALOGE("%s: failed to open UUID %s", __func__, sub.first.uuid.toString().c_str());
		ALOGE("%s: failed to open UUID %s", __func__, toString(sub.first.uuid).c_str());
		break;
		}
		}
		@@ -173,7 +175,7 @@ ndk::ScopedAStatus EffectProxy::open(const Parameter::Common& common,
		}

		ndk::ScopedAStatus EffectProxy::close() {
		ALOGV("%s: %s", __func__, mIdentity.type.toString().c_str());
		ALOGV("%s: %s", __func__, toString(mIdentity.type).c_str());
		return runWithAllSubEffects([&](std::shared_ptr<IEffect>& effect) {
		return effect->close();
		});
		@@ -203,7 +205,7 @@ ndk::ScopedAStatus EffectProxy::getDescriptor(Descriptor* desc) {

		// Handle with active sub-effect first, only send to other sub-effects when success
		ndk::ScopedAStatus EffectProxy::command(CommandId id) {
		ALOGV("%s: %s, command %s", __func__, mIdentity.type.toString().c_str(),
		ALOGV("%s: %s, command %s", __func__, toString(mIdentity.type).c_str(),
		android::internal::ToString(id).c_str());
		return runWithActiveSubEffectThenOthers(
		[&](const std::shared_ptr<IEffect>& effect) -> ndk::ScopedAStatus {

media/libaudiohal/impl/EffectsFactoryHalAidl.cpp

+7 −5

Original line number	Diff line number	Diff line
		@@ -28,6 +28,7 @@
		#include <media/AidlConversionCppNdk.h>
		#include <media/AidlConversionEffect.h>
		#include <system/audio.h>
		#include <system/audio_aidl_utils.h>
		#include <utils/Log.h>

		#include "EffectBufferHalAidl.h"
		@@ -43,6 +44,7 @@ using ::aidl::android::hardware::audio::effect::Processing;
		using ::aidl::android::media::audio::common::AudioSource;
		using ::aidl::android::media::audio::common::AudioStreamType;
		using ::aidl::android::media::audio::common::AudioUuid;
		using ::android::audio::utils::toString;
		using ::android::base::unexpected;
		using ::android::detail::AudioHalVersionInfo;

		@@ -188,7 +190,7 @@ status_t EffectsFactoryHalAidl::createEffect(const effect_uuid_t* uuid, int32_t
		statusTFromBinderStatus(mFactory->createEffect(aidlUuid, &aidlEffect)));
		}
		if (aidlEffect == nullptr) {
		ALOGE("%s failed to create effect with UUID: %s", __func__, aidlUuid.toString().c_str());
		ALOGE("%s failed to create effect with UUID: %s", __func__, toString(aidlUuid).c_str());
		return NAME_NOT_FOUND;
		}
		Descriptor desc;
		@@ -244,10 +246,10 @@ status_t EffectsFactoryHalAidl::getHalDescriptorWithImplUuid(const AudioUuid& uu
		auto matchIt = std::find_if(list.begin(), list.end(),
		[&](const auto& desc) { return desc.common.id.uuid == uuid; });
		if (matchIt == list.end()) {
		ALOGE("%s UUID not found in HAL and proxy list %s", __func__, uuid.toString().c_str());
		ALOGE("%s UUID not found in HAL and proxy list %s", __func__, toString(uuid).c_str());
		return BAD_VALUE;
		}
		ALOGI("%s UUID impl found %s", __func__, uuid.toString().c_str());
		ALOGI("%s UUID impl found %s", __func__, toString(uuid).c_str());

		*pDescriptor = VALUE_OR_RETURN_STATUS(
		::aidl::android::aidl2legacy_Descriptor_effect_descriptor(*matchIt));
		@@ -266,10 +268,10 @@ status_t EffectsFactoryHalAidl::getHalDescriptorWithTypeUuid(
		std::copy_if(mProxyDescList.begin(), mProxyDescList.end(), std::back_inserter(result),
		[&](auto& desc) { return desc.common.id.type == type; });
		if (result.empty()) {
		ALOGW("%s UUID type not found in HAL and proxy list %s", __func__, type.toString().c_str());
		ALOGW("%s UUID type not found in HAL and proxy list %s", __func__, toString(type).c_str());
		return BAD_VALUE;
		}
		ALOGI("%s UUID type found %zu \n %s", __func__, result.size(), type.toString().c_str());
		ALOGI("%s UUID type found %zu \n %s", __func__, result.size(), toString(type).c_str());

		*descriptors = VALUE_OR_RETURN_STATUS(
		aidl::android::convertContainer<std::vector<effect_descriptor_t>>(