Add isProxy in effect AIDL conversion helper constructor am: 323273de10 am:... (8e62caca) · Commits · e / os / android_frameworks_av

media/libaudiohal/impl/EffectConversionHelperAidl.cpp

+2 −3

Original line number	Original line	Diff line number	Diff line
	@@ -72,14 +72,13 @@ const std::map<uint32_t /* effect_command_e */, EffectConversionHelperAidl::Comm

	EffectConversionHelperAidl::EffectConversionHelperAidl(		EffectConversionHelperAidl::EffectConversionHelperAidl(
	std::shared_ptr<::aidl::android::hardware::audio::effect::IEffect> effect,		std::shared_ptr<::aidl::android::hardware::audio::effect::IEffect> effect,
	int32_t sessionId, int32_t ioId, const Descriptor& desc)		int32_t sessionId, int32_t ioId, const Descriptor& desc, bool isProxy)
	: mSessionId(sessionId),		: mSessionId(sessionId),
	mIoId(ioId),		mIoId(ioId),
	mDesc(desc),		mDesc(desc),
	mEffect(std::move(effect)),		mEffect(std::move(effect)),
	mIsInputStream(mDesc.common.flags.type == Flags::Type::PRE_PROC),		mIsInputStream(mDesc.common.flags.type == Flags::Type::PRE_PROC),
	mIsProxyEffect(mDesc.common.id.proxy.has_value() &&		mIsProxyEffect(isProxy) {
	mDesc.common.id.proxy.value() == mDesc.common.id.uuid) {
	mCommon.session = sessionId;		mCommon.session = sessionId;
	mCommon.ioHandle = ioId;		mCommon.ioHandle = ioId;
	mCommon.input = mCommon.output = kDefaultAudioConfig;		mCommon.input = mCommon.output = kDefaultAudioConfig;

media/libaudiohal/impl/EffectConversionHelperAidl.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -54,7 +54,7 @@ class EffectConversionHelperAidl {
	EffectConversionHelperAidl(		EffectConversionHelperAidl(
	std::shared_ptr<::aidl::android::hardware::audio::effect::IEffect> effect,		std::shared_ptr<::aidl::android::hardware::audio::effect::IEffect> effect,
	int32_t sessionId, int32_t ioId,		int32_t sessionId, int32_t ioId,
	const ::aidl::android::hardware::audio::effect::Descriptor& desc);		const ::aidl::android::hardware::audio::effect::Descriptor& desc, bool isProxy);

	status_t handleSetParameter(uint32_t cmdSize, const void* pCmdData, uint32_t* replySize,		status_t handleSetParameter(uint32_t cmdSize, const void* pCmdData, uint32_t* replySize,
	void* pReplyData);		void* pReplyData);

media/libaudiohal/impl/EffectHalAidl.cpp

+23 −23

Original line number	Original line	Diff line number	Diff line
	@@ -89,64 +89,64 @@ status_t EffectHalAidl::createAidlConversion(
	ALOGI("%s create UUID %s", __func__, typeUuid.toString().c_str());		ALOGI("%s create UUID %s", __func__, typeUuid.toString().c_str());
	if (typeUuid ==		if (typeUuid ==
	::aidl::android::hardware::audio::effect::getEffectTypeUuidAcousticEchoCanceler()) {		::aidl::android::hardware::audio::effect::getEffectTypeUuidAcousticEchoCanceler()) {
	mConversion =		mConversion = std::make_unique<android::effect::AidlConversionAec>(effect, sessionId, ioId,
	std::make_unique<android::effect::AidlConversionAec>(effect, sessionId, ioId, desc);		desc, mIsProxyEffect);
	} else if (typeUuid == ::aidl::android::hardware::audio::effect::		} else if (typeUuid == ::aidl::android::hardware::audio::effect::
	getEffectTypeUuidAutomaticGainControlV1()) {		getEffectTypeUuidAutomaticGainControlV1()) {
	mConversion = std::make_unique<android::effect::AidlConversionAgc1>(effect, sessionId, ioId,		mConversion = std::make_unique<android::effect::AidlConversionAgc1>(effect, sessionId, ioId,
	desc);		desc, mIsProxyEffect);
	} else if (typeUuid == ::aidl::android::hardware::audio::effect::		} else if (typeUuid == ::aidl::android::hardware::audio::effect::
	getEffectTypeUuidAutomaticGainControlV2()) {		getEffectTypeUuidAutomaticGainControlV2()) {
	mConversion = std::make_unique<android::effect::AidlConversionAgc2>(effect, sessionId, ioId,		mConversion = std::make_unique<android::effect::AidlConversionAgc2>(effect, sessionId, ioId,
	desc);		desc, mIsProxyEffect);
	} else if (typeUuid == ::aidl::android::hardware::audio::effect::getEffectTypeUuidBassBoost()) {		} else if (typeUuid == ::aidl::android::hardware::audio::effect::getEffectTypeUuidBassBoost()) {
	mConversion = std::make_unique<android::effect::AidlConversionBassBoost>(effect, sessionId,		mConversion = std::make_unique<android::effect::AidlConversionBassBoost>(
	ioId, desc);		effect, sessionId, ioId, desc, mIsProxyEffect);
	} else if (typeUuid == ::aidl::android::hardware::audio::effect::getEffectTypeUuidDownmix()) {		} else if (typeUuid == ::aidl::android::hardware::audio::effect::getEffectTypeUuidDownmix()) {
	mConversion = std::make_unique<android::effect::AidlConversionDownmix>(effect, sessionId,		mConversion = std::make_unique<android::effect::AidlConversionDownmix>(
	ioId, desc);		effect, sessionId, ioId, desc, mIsProxyEffect);
	} else if (typeUuid ==		} else if (typeUuid ==
	::aidl::android::hardware::audio::effect::getEffectTypeUuidDynamicsProcessing()) {		::aidl::android::hardware::audio::effect::getEffectTypeUuidDynamicsProcessing()) {
	mConversion =		mConversion = std::make_unique<android::effect::AidlConversionDp>(effect, sessionId, ioId,
	std::make_unique<android::effect::AidlConversionDp>(effect, sessionId, ioId, desc);		desc, mIsProxyEffect);
	} else if (typeUuid == ::aidl::android::hardware::audio::effect::getEffectTypeUuidEnvReverb()) {		} else if (typeUuid == ::aidl::android::hardware::audio::effect::getEffectTypeUuidEnvReverb()) {
	mConversion = std::make_unique<android::effect::AidlConversionEnvReverb>(effect, sessionId,		mConversion = std::make_unique<android::effect::AidlConversionEnvReverb>(
	ioId, desc);		effect, sessionId, ioId, desc, mIsProxyEffect);
	} else if (typeUuid == ::aidl::android::hardware::audio::effect::getEffectTypeUuidEqualizer()) {		} else if (typeUuid == ::aidl::android::hardware::audio::effect::getEffectTypeUuidEqualizer()) {
	mConversion =		mConversion = std::make_unique<android::effect::AidlConversionEq>(effect, sessionId, ioId,
	std::make_unique<android::effect::AidlConversionEq>(effect, sessionId, ioId, desc);		desc, mIsProxyEffect);
	} else if (typeUuid ==		} else if (typeUuid ==
	::aidl::android::hardware::audio::effect::getEffectTypeUuidHapticGenerator()) {		::aidl::android::hardware::audio::effect::getEffectTypeUuidHapticGenerator()) {
	mConversion = std::make_unique<android::effect::AidlConversionHapticGenerator>(		mConversion = std::make_unique<android::effect::AidlConversionHapticGenerator>(
	effect, sessionId, ioId, desc);		effect, sessionId, ioId, desc, mIsProxyEffect);
	} else if (typeUuid ==		} else if (typeUuid ==
	::aidl::android::hardware::audio::effect::getEffectTypeUuidLoudnessEnhancer()) {		::aidl::android::hardware::audio::effect::getEffectTypeUuidLoudnessEnhancer()) {
	mConversion = std::make_unique<android::effect::AidlConversionLoudnessEnhancer>(		mConversion = std::make_unique<android::effect::AidlConversionLoudnessEnhancer>(
	effect, sessionId, ioId, desc);		effect, sessionId, ioId, desc, mIsProxyEffect);
	} else if (typeUuid ==		} else if (typeUuid ==
	::aidl::android::hardware::audio::effect::getEffectTypeUuidNoiseSuppression()) {		::aidl::android::hardware::audio::effect::getEffectTypeUuidNoiseSuppression()) {
	mConversion = std::make_unique<android::effect::AidlConversionNoiseSuppression>(		mConversion = std::make_unique<android::effect::AidlConversionNoiseSuppression>(
	effect, sessionId, ioId, desc);		effect, sessionId, ioId, desc, mIsProxyEffect);
	} else if (typeUuid ==		} else if (typeUuid ==
	::aidl::android::hardware::audio::effect::getEffectTypeUuidPresetReverb()) {		::aidl::android::hardware::audio::effect::getEffectTypeUuidPresetReverb()) {
	mConversion = std::make_unique<android::effect::AidlConversionPresetReverb>(		mConversion = std::make_unique<android::effect::AidlConversionPresetReverb>(
	effect, sessionId, ioId, desc);		effect, sessionId, ioId, desc, mIsProxyEffect);
	} else if (typeUuid ==		} else if (typeUuid ==
	::aidl::android::hardware::audio::effect::getEffectTypeUuidSpatializer()) {		::aidl::android::hardware::audio::effect::getEffectTypeUuidSpatializer()) {
	mConversion = std::make_unique<android::effect::AidlConversionSpatializer>(		mConversion = std::make_unique<android::effect::AidlConversionSpatializer>(
	effect, sessionId, ioId, desc);		effect, sessionId, ioId, desc, mIsProxyEffect);
	} else if (typeUuid ==		} else if (typeUuid ==
	::aidl::android::hardware::audio::effect::getEffectTypeUuidVirtualizer()) {		::aidl::android::hardware::audio::effect::getEffectTypeUuidVirtualizer()) {
	mConversion = std::make_unique<android::effect::AidlConversionVirtualizer>(		mConversion = std::make_unique<android::effect::AidlConversionVirtualizer>(
	effect, sessionId, ioId, desc);		effect, sessionId, ioId, desc, mIsProxyEffect);
	} else if (typeUuid ==		} else if (typeUuid ==
	::aidl::android::hardware::audio::effect::getEffectTypeUuidVisualizer()) {		::aidl::android::hardware::audio::effect::getEffectTypeUuidVisualizer()) {
	mConversion = std::make_unique<android::effect::AidlConversionVisualizer>(effect, sessionId,		mConversion = std::make_unique<android::effect::AidlConversionVisualizer>(
	ioId, desc);		effect, sessionId, ioId, desc, mIsProxyEffect);
	} else {		} else {
	// For unknown UUID, use vendor extension implementation		// For unknown UUID, use vendor extension implementation
	mConversion = std::make_unique<android::effect::AidlConversionVendorExtension>(		mConversion = std::make_unique<android::effect::AidlConversionVendorExtension>(
	effect, sessionId, ioId, desc);		effect, sessionId, ioId, desc, mIsProxyEffect);
	}		}
	return OK;		return OK;
	}		}

media/libaudiohal/impl/effectsAidlConversion/AidlConversionAec.h

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -26,8 +26,9 @@ class AidlConversionAec : public EffectConversionHelperAidl {
	public:		public:
	AidlConversionAec(std::shared_ptr<::aidl::android::hardware::audio::effect::IEffect> effect,		AidlConversionAec(std::shared_ptr<::aidl::android::hardware::audio::effect::IEffect> effect,
	int32_t sessionId, int32_t ioId,		int32_t sessionId, int32_t ioId,
	const ::aidl::android::hardware::audio::effect::Descriptor& desc)		const ::aidl::android::hardware::audio::effect::Descriptor& desc,
	: EffectConversionHelperAidl(effect, sessionId, ioId, desc) {}		bool isProxyEffect)
			: EffectConversionHelperAidl(effect, sessionId, ioId, desc, isProxyEffect) {}
	~AidlConversionAec() {}		~AidlConversionAec() {}

	private:		private:

media/libaudiohal/impl/effectsAidlConversion/AidlConversionAgc1.h

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -26,8 +26,9 @@ class AidlConversionAgc1 : public EffectConversionHelperAidl {
	public:		public:
	AidlConversionAgc1(std::shared_ptr<::aidl::android::hardware::audio::effect::IEffect> effect,		AidlConversionAgc1(std::shared_ptr<::aidl::android::hardware::audio::effect::IEffect> effect,
	int32_t sessionId, int32_t ioId,		int32_t sessionId, int32_t ioId,
	const ::aidl::android::hardware::audio::effect::Descriptor& desc)		const ::aidl::android::hardware::audio::effect::Descriptor& desc,
	: EffectConversionHelperAidl(effect, sessionId, ioId, desc) {}		bool isProxyEffect)
			: EffectConversionHelperAidl(effect, sessionId, ioId, desc, isProxyEffect) {}
	~AidlConversionAgc1() {}		~AidlConversionAgc1() {}

	private:		private: