Merge "Audio AIDL : Rename AutomaticGainControl to AutomaticGainControlV2" (607ba428) · Commits · e / os / android_frameworks_av

media/audioaidlconversion/AidlConversionEffect.cpp

+16 −15

Original line number	Diff line number	Diff line
		@@ -30,7 +30,7 @@ namespace aidl {
		namespace android {

		using ::aidl::android::hardware::audio::effect::AcousticEchoCanceler;
		using ::aidl::android::hardware::audio::effect::AutomaticGainControl;
		using ::aidl::android::hardware::audio::effect::AutomaticGainControlV2;
		using ::aidl::android::hardware::audio::effect::BassBoost;
		using ::aidl::android::hardware::audio::effect::Descriptor;
		using ::aidl::android::hardware::audio::effect::Downmix;
		@@ -260,46 +260,47 @@ ConversionResult<Parameter> legacy2aidl_uint32_mobileMode_Parameter_aec(uint32_t
		ConversionResult<uint32_t> aidl2legacy_Parameter_agc_uint32_fixedDigitalGain(
		const Parameter& aidl) {
		int gain = VALUE_OR_RETURN(
		GET_PARAMETER_SPECIFIC_FIELD(aidl, AutomaticGainControl, automaticGainControl,
		AutomaticGainControl::fixedDigitalGainMb, int));
		GET_PARAMETER_SPECIFIC_FIELD(aidl, AutomaticGainControlV2, automaticGainControlV2,
		AutomaticGainControlV2::fixedDigitalGainMb, int));
		return VALUE_OR_RETURN(convertReinterpret<uint32_t>(gain));
		}

		ConversionResult<Parameter> legacy2aidl_uint32_fixedDigitalGain_Parameter_agc(uint32_t legacy) {
		int gain = VALUE_OR_RETURN(convertReinterpret<int>(legacy));
		return MAKE_SPECIFIC_PARAMETER(AutomaticGainControl, automaticGainControl, fixedDigitalGainMb,
		gain);
		return MAKE_SPECIFIC_PARAMETER(AutomaticGainControlV2, automaticGainControlV2,
		fixedDigitalGainMb, gain);
		}

		ConversionResult<uint32_t> aidl2legacy_Parameter_agc_uint32_levelEstimator(
		const Parameter& aidl) {
		const auto& le = VALUE_OR_RETURN(GET_PARAMETER_SPECIFIC_FIELD(
		aidl, AutomaticGainControl, automaticGainControl, AutomaticGainControl::levelEstimator,
		AutomaticGainControl::LevelEstimator));
		aidl, AutomaticGainControlV2, automaticGainControlV2,
		AutomaticGainControlV2::levelEstimator, AutomaticGainControlV2::LevelEstimator));
		return static_cast<uint32_t>(le);
		}

		ConversionResult<Parameter> legacy2aidl_uint32_levelEstimator_Parameter_agc(uint32_t legacy) {
		if (legacy > (uint32_t) AutomaticGainControl::LevelEstimator::PEAK) {
		if (legacy > (uint32_t)AutomaticGainControlV2::LevelEstimator::PEAK) {
		return unexpected(BAD_VALUE);
		}
		AutomaticGainControl::LevelEstimator le =
		static_cast<AutomaticGainControl::LevelEstimator>(legacy);
		return MAKE_SPECIFIC_PARAMETER(AutomaticGainControl, automaticGainControl, levelEstimator, le);
		AutomaticGainControlV2::LevelEstimator le =
		static_cast<AutomaticGainControlV2::LevelEstimator>(legacy);
		return MAKE_SPECIFIC_PARAMETER(AutomaticGainControlV2, automaticGainControlV2, levelEstimator,
		le);
		}

		ConversionResult<uint32_t> aidl2legacy_Parameter_agc_uint32_saturationMargin(
		const Parameter& aidl) {
		int saturationMargin = VALUE_OR_RETURN(
		GET_PARAMETER_SPECIFIC_FIELD(aidl, AutomaticGainControl, automaticGainControl,
		AutomaticGainControl::saturationMarginMb, int));
		GET_PARAMETER_SPECIFIC_FIELD(aidl, AutomaticGainControlV2, automaticGainControlV2,
		AutomaticGainControlV2::saturationMarginMb, int));
		return VALUE_OR_RETURN(convertIntegral<uint32_t>(saturationMargin));
		}

		ConversionResult<Parameter> legacy2aidl_uint32_saturationMargin_Parameter_agc(uint32_t legacy) {
		int saturationMargin = VALUE_OR_RETURN(convertIntegral<int>(legacy));
		return MAKE_SPECIFIC_PARAMETER(AutomaticGainControl, automaticGainControl, saturationMarginMb,
		saturationMargin);
		return MAKE_SPECIFIC_PARAMETER(AutomaticGainControlV2, automaticGainControlV2,
		saturationMarginMb, saturationMargin);
		}

		ConversionResult<uint16_t> aidl2legacy_Parameter_BassBoost_uint16_strengthPm(

media/libaudiohal/impl/effectsAidlConversion/AidlConversionAgc2.cpp

+7 −7

Original line number	Diff line number	Diff line
		@@ -34,7 +34,7 @@ namespace android {
		namespace effect {

		using ::aidl::android::aidl_utils::statusTFromBinderStatus;
		using ::aidl::android::hardware::audio::effect::AutomaticGainControl;
		using ::aidl::android::hardware::audio::effect::AutomaticGainControlV2;
		using ::aidl::android::hardware::audio::effect::Parameter;
		using ::android::status_t;
		using utils::EffectParamReader;
		@@ -84,8 +84,8 @@ status_t AidlConversionAgc2::getParameter(EffectParamWriter& param) {
		switch (type) {
		case AGC2_PARAM_FIXED_DIGITAL_GAIN: {
		Parameter::Id id =
		MAKE_SPECIFIC_PARAMETER_ID(AutomaticGainControl, automaticGainControlTag,
		AutomaticGainControl::fixedDigitalGainMb);
		MAKE_SPECIFIC_PARAMETER_ID(AutomaticGainControlV2, automaticGainControlV2Tag,
		AutomaticGainControlV2::fixedDigitalGainMb);
		RETURN_STATUS_IF_ERROR(statusTFromBinderStatus(mEffect->getParameter(id, &aidlParam)));
		value = VALUE_OR_RETURN_STATUS(
		aidl::android::aidl2legacy_Parameter_agc_uint32_fixedDigitalGain(aidlParam));
		@@ -93,8 +93,8 @@ status_t AidlConversionAgc2::getParameter(EffectParamWriter& param) {
		}
		case AGC2_PARAM_ADAPT_DIGI_LEVEL_ESTIMATOR: {
		Parameter::Id id =
		MAKE_SPECIFIC_PARAMETER_ID(AutomaticGainControl, automaticGainControlTag,
		AutomaticGainControl::levelEstimator);
		MAKE_SPECIFIC_PARAMETER_ID(AutomaticGainControlV2, automaticGainControlV2Tag,
		AutomaticGainControlV2::levelEstimator);
		RETURN_STATUS_IF_ERROR(statusTFromBinderStatus(mEffect->getParameter(id, &aidlParam)));
		value = VALUE_OR_RETURN_STATUS(
		aidl::android::aidl2legacy_Parameter_agc_uint32_levelEstimator(aidlParam));
		@@ -102,8 +102,8 @@ status_t AidlConversionAgc2::getParameter(EffectParamWriter& param) {
		}
		case AGC2_PARAM_ADAPT_DIGI_EXTRA_SATURATION_MARGIN: {
		Parameter::Id id =
		MAKE_SPECIFIC_PARAMETER_ID(AutomaticGainControl, automaticGainControlTag,
		AutomaticGainControl::saturationMarginMb);
		MAKE_SPECIFIC_PARAMETER_ID(AutomaticGainControlV2, automaticGainControlV2Tag,
		AutomaticGainControlV2::saturationMarginMb);
		RETURN_STATUS_IF_ERROR(statusTFromBinderStatus(mEffect->getParameter(id, &aidlParam)));
		value = VALUE_OR_RETURN_STATUS(
		aidl::android::aidl2legacy_Parameter_agc_uint32_saturationMargin(aidlParam));