Merge "Declare `ConversionResult` in `android` namespace" into udc-dev (82de5fdf) · Commits · e / os / android_frameworks_av

media/audioaidlconversion/include/media/AidlConversionUtil.h

+15 −3

Original line number	Diff line number	Diff line
		@@ -24,6 +24,14 @@
		#include <binder/Status.h>
		#include <error/Result.h>

		namespace android {
		// `ConversionResult` is always defined in the `::android` namespace,
		// so that it can be found from any nested namespace.
		// See below for the convenience alias specific to the NDK backend.
		template <typename T>
		using ConversionResult = ::android::error::Result<T>;
		} // namespace android

		#if defined(BACKEND_NDK)
		#include <android/binder_auto_utils.h>
		#include <android/binder_enums.h>
		@@ -32,12 +40,16 @@
		namespace aidl {
		#else
		#include <binder/Enums.h>
		#endif
		#endif // BACKEND_NDK
		namespace android {

		#if defined(BACKEND_NDK)
		// This adds `::aidl::android::ConversionResult` for convenience.
		// Otherwise, it would be required to write `::android::ConversionResult` everywhere.
		template <typename T>
		using ConversionResult = ::android::error::Result<T>;
		using ConversionResult = ::android::ConversionResult<T>;
		#endif // BACKEND_NDK

		namespace android {
		/**
		* A generic template to safely cast between integral types, respecting limits of the destination
		* type.

media/libaudiohal/impl/StreamHalAidl.cpp

+2 −2

Original line number	Diff line number	Diff line
		@@ -486,7 +486,7 @@ status_t StreamHalAidl::updateCountersIfNeeded(
		}

		// static
		::aidl::ConversionResult<::aidl::android::hardware::audio::common::SourceMetadata>
		ConversionResult<::aidl::android::hardware::audio::common::SourceMetadata>
		StreamOutHalAidl::legacy2aidl_SourceMetadata(const StreamOutHalInterface::SourceMetadata& legacy) {
		::aidl::android::hardware::audio::common::SourceMetadata aidl;
		aidl.tracks = VALUE_OR_RETURN(
		@@ -804,7 +804,7 @@ status_t StreamOutHalAidl::filterAndUpdateOffloadMetadata(AudioParameter &parame
		}

		// static
		::aidl::ConversionResult<::aidl::android::hardware::audio::common::SinkMetadata>
		ConversionResult<::aidl::android::hardware::audio::common::SinkMetadata>
		StreamInHalAidl::legacy2aidl_SinkMetadata(const StreamInHalInterface::SinkMetadata& legacy) {
		::aidl::android::hardware::audio::common::SinkMetadata aidl;
		aidl.tracks = VALUE_OR_RETURN(

media/libaudiohal/impl/StreamHalAidl.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -313,7 +313,7 @@ class StreamOutHalAidl : public StreamOutHalInterface, public StreamHalAidl {
		private:
		friend class sp<StreamOutHalAidl>;

		static ::aidl::ConversionResult<::aidl::android::hardware::audio::common::SourceMetadata>
		static ConversionResult<::aidl::android::hardware::audio::common::SourceMetadata>
		legacy2aidl_SourceMetadata(const StreamOutHalInterface::SourceMetadata& legacy);

		const std::shared_ptr<::aidl::android::hardware::audio::core::IStreamOut> mStream;
		@@ -365,7 +365,7 @@ class StreamInHalAidl : public StreamInHalInterface, public StreamHalAidl {
		private:
		friend class sp<StreamInHalAidl>;

		static ::aidl::ConversionResult<::aidl::android::hardware::audio::common::SinkMetadata>
		static ConversionResult<::aidl::android::hardware::audio::common::SinkMetadata>
		legacy2aidl_SinkMetadata(const StreamInHalInterface::SinkMetadata& legacy);

		const std::shared_ptr<::aidl::android::hardware::audio::core::IStreamIn> mStream;

media/libaudiohal/impl/effectsAidlConversion/AidlConversionDynamicsProcessing.cpp

+5 −5

Original line number	Diff line number	Diff line
		@@ -221,7 +221,7 @@ status_t AidlConversionDp::getParameter(EffectParamWriter& param) {
		}
		}

		aidl::ConversionResult<DynamicsProcessing::ChannelConfig>
		ConversionResult<DynamicsProcessing::ChannelConfig>
		AidlConversionDp::readChannelConfigFromParam(EffectParamReader& param) {
		int32_t enable, channel;
		RETURN_IF_ERROR(param.readFromParameter(&channel));
		@@ -231,7 +231,7 @@ AidlConversionDp::readChannelConfigFromParam(EffectParamReader& param) {
		{.enable = VALUE_OR_RETURN(convertIntegral<bool>(enable)), .channel = channel});
		}

		aidl::ConversionResult<DynamicsProcessing::EqBandConfig>
		ConversionResult<DynamicsProcessing::EqBandConfig>
		AidlConversionDp::readEqBandConfigFromParam(EffectParamReader& param) {
		DynamicsProcessing::EqBandConfig config;
		int32_t enable;
		@@ -245,7 +245,7 @@ AidlConversionDp::readEqBandConfigFromParam(EffectParamReader& param) {
		return config;
		}

		aidl::ConversionResult<DynamicsProcessing::MbcBandConfig>
		ConversionResult<DynamicsProcessing::MbcBandConfig>
		AidlConversionDp::readMbcBandConfigFromParam(EffectParamReader& param) {
		DynamicsProcessing::MbcBandConfig config;
		int32_t enable;
		@@ -267,7 +267,7 @@ AidlConversionDp::readMbcBandConfigFromParam(EffectParamReader& param) {
		return config;
		}

		aidl::ConversionResult<DynamicsProcessing::LimiterConfig>
		ConversionResult<DynamicsProcessing::LimiterConfig>
		AidlConversionDp::readLimiterConfigFromParam(EffectParamReader& param) {
		DynamicsProcessing::LimiterConfig config;
		int32_t enable, inUse;
		@@ -285,7 +285,7 @@ AidlConversionDp::readLimiterConfigFromParam(EffectParamReader& param) {
		return config;
		}

		aidl::ConversionResult<DynamicsProcessing::EngineArchitecture>
		ConversionResult<DynamicsProcessing::EngineArchitecture>
		AidlConversionDp::readEngineArchitectureFromParam(EffectParamReader& param) {
		DynamicsProcessing::EngineArchitecture engine;
		int32_t variant, preEqInUse, mbcInUse, postEqInUse, limiterInUse;

media/libaudiohal/impl/effectsAidlConversion/AidlConversionDynamicsProcessing.h

+5 −5

Original line number	Diff line number	Diff line
		@@ -36,18 +36,18 @@ class AidlConversionDp : public EffectConversionHelperAidl {
		status_t setParameter(utils::EffectParamReader& param) override;
		status_t getParameter(utils::EffectParamWriter& param) override;

		aidl::ConversionResult<
		ConversionResult<
		aidl::android::hardware::audio::effect::DynamicsProcessing::ChannelConfig>
		readChannelConfigFromParam(utils::EffectParamReader& param);
		aidl::ConversionResult<aidl::android::hardware::audio::effect::DynamicsProcessing::EqBandConfig>
		ConversionResult<aidl::android::hardware::audio::effect::DynamicsProcessing::EqBandConfig>
		readEqBandConfigFromParam(utils::EffectParamReader& param);
		aidl::ConversionResult<
		ConversionResult<
		aidl::android::hardware::audio::effect::DynamicsProcessing::MbcBandConfig>
		readMbcBandConfigFromParam(utils::EffectParamReader& param);
		aidl::ConversionResult<
		ConversionResult<
		aidl::android::hardware::audio::effect::DynamicsProcessing::LimiterConfig>
		readLimiterConfigFromParam(utils::EffectParamReader& param);
		aidl::ConversionResult<
		ConversionResult<
		aidl::android::hardware::audio::effect::DynamicsProcessing::EngineArchitecture>
		readEngineArchitectureFromParam(utils::EffectParamReader& param);