Merge "Spatializer: allow vendor extension parameters" into main (658922e9) · Commits · e / devices / smdk4412 / android_frameworks_av

media/libaudiohal/impl/effectsAidlConversion/AidlConversionSpatializer.cpp

+7 −4

Original line number	Original line	Diff line number	Diff line
	@@ -147,8 +147,12 @@ status_t AidlConversionSpatializer::setParameter(EffectParamReader& param) {
	return statusTFromBinderStatus(mEffect->setParameter(aidlParam));		return statusTFromBinderStatus(mEffect->setParameter(aidlParam));
	}		}
	default: {		default: {
	ALOGE("%s %d invalid command %u", __func__, __LINE__, command);		// for vendor extension, copy data area to the DefaultExtension, parameter ignored
	return BAD_VALUE;		VendorExtension ext = VALUE_OR_RETURN_STATUS(
			aidl::android::legacy2aidl_EffectParameterReader_VendorExtension(param));
			aidlParam =
			MAKE_SPECIFIC_PARAMETER(Spatializer, spatializer, vendor, ext);
			break;
	}		}
	}		}
	} else {		} else {
	@@ -321,8 +325,7 @@ status_t AidlConversionSpatializer::getParameter(EffectParamWriter& param) {
	return OK;		return OK;
	}		}
	default: {		default: {
	ALOGE("%s %d invalid command %u", __func__, __LINE__, command);		VENDOR_EXTENSION_GET_AND_RETURN(Spatializer, spatializer, param);
	return BAD_VALUE;
	}		}
	}		}
	} else {		} else {