Merge "Audio HAL: Simplify types updates for 'common' and 'audio' packages" (1e6c50e7) · Commits · e / os / android_frameworks_av

media/libaudiohal/impl/DeviceHalHidl.cpp

+4 −20

Original line number	Original line	Diff line number	Diff line
	@@ -31,33 +31,17 @@
	#include "StreamHalHidl.h"		#include "StreamHalHidl.h"
	#include "VersionUtils.h"		#include "VersionUtils.h"

	using ::android::hardware::audio::common::CPP_VERSION::AudioConfig;		using ::android::hardware::audio::common::CPP_VERSION::implementation::HidlUtils;
	using ::android::hardware::audio::common::CPP_VERSION::AudioDevice;
	using ::android::hardware::audio::common::CPP_VERSION::AudioInputFlag;
	using ::android::hardware::audio::common::CPP_VERSION::AudioOutputFlag;
	using ::android::hardware::audio::common::CPP_VERSION::AudioPatchHandle;
	using ::android::hardware::audio::common::CPP_VERSION::AudioPort;
	using ::android::hardware::audio::common::CPP_VERSION::AudioPortConfig;
	using ::android::hardware::audio::common::CPP_VERSION::AudioMode;
	using ::android::hardware::audio::common::CPP_VERSION::AudioSource;
	using ::android::hardware::audio::common::CPP_VERSION::HidlUtils;
	using ::android::hardware::audio::common::utils::EnumBitfield;		using ::android::hardware::audio::common::utils::EnumBitfield;
	using ::android::hardware::audio::CPP_VERSION::DeviceAddress;
	using ::android::hardware::audio::CPP_VERSION::IPrimaryDevice;
	using ::android::hardware::audio::CPP_VERSION::ParameterValue;
	using ::android::hardware::audio::CPP_VERSION::Result;
	using ::android::hardware::hidl_string;		using ::android::hardware::hidl_string;
	using ::android::hardware::hidl_vec;		using ::android::hardware::hidl_vec;

	#if MAJOR_VERSION == 4
	using ::android::hardware::audio::CPP_VERSION::SinkMetadata;
	#elif MAJOR_VERSION == 5
	using ::android::hardware::audio::common::CPP_VERSION::SinkMetadata;
	#endif

	namespace android {		namespace android {
	namespace CPP_VERSION {		namespace CPP_VERSION {

			using namespace ::android::hardware::audio::common::CPP_VERSION;
			using namespace ::android::hardware::audio::CPP_VERSION;

	namespace {		namespace {

	status_t deviceAddressFromHal(		status_t deviceAddressFromHal(

media/libaudiohal/impl/EffectHalHidl.cpp

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -31,9 +31,7 @@ using ::android::hardware::audio::effect::CPP_VERSION::EffectBufferAccess;
	using ::android::hardware::audio::effect::CPP_VERSION::EffectConfigParameters;		using ::android::hardware::audio::effect::CPP_VERSION::EffectConfigParameters;
	using ::android::hardware::audio::effect::CPP_VERSION::MessageQueueFlagBits;		using ::android::hardware::audio::effect::CPP_VERSION::MessageQueueFlagBits;
	using ::android::hardware::audio::effect::CPP_VERSION::Result;		using ::android::hardware::audio::effect::CPP_VERSION::Result;
	using ::android::hardware::audio::common::CPP_VERSION::HidlUtils;		using ::android::hardware::audio::common::CPP_VERSION::implementation::HidlUtils;
	using ::android::hardware::audio::common::CPP_VERSION::AudioChannelMask;
	using ::android::hardware::audio::common::CPP_VERSION::AudioFormat;
	using ::android::hardware::audio::common::utils::EnumBitfield;		using ::android::hardware::audio::common::utils::EnumBitfield;
	using ::android::hardware::hidl_vec;		using ::android::hardware::hidl_vec;
	using ::android::hardware::MQDescriptorSync;		using ::android::hardware::MQDescriptorSync;
	@@ -42,6 +40,8 @@ using ::android::hardware::Return;
	namespace android {		namespace android {
	namespace CPP_VERSION {		namespace CPP_VERSION {

			using namespace ::android::hardware::audio::common::CPP_VERSION;

	EffectHalHidl::EffectHalHidl(const sp<IEffect>& effect, uint64_t effectId)		EffectHalHidl::EffectHalHidl(const sp<IEffect>& effect, uint64_t effectId)
	: mEffect(effect), mEffectId(effectId), mBuffersChanged(true), mEfGroup(nullptr) {		: mEffect(effect), mEffectId(effectId), mBuffersChanged(true), mEfGroup(nullptr) {
	}		}

media/libaudiohal/impl/EffectsFactoryHalHidl.cpp

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -25,8 +25,7 @@
	#include "EffectHalHidl.h"		#include "EffectHalHidl.h"
	#include "HidlUtils.h"		#include "HidlUtils.h"

	using ::android::hardware::audio::common::CPP_VERSION::HidlUtils;		using ::android::hardware::audio::common::CPP_VERSION::implementation::HidlUtils;
	using ::android::hardware::audio::common::CPP_VERSION::Uuid;
	using ::android::hardware::audio::effect::CPP_VERSION::IEffect;		using ::android::hardware::audio::effect::CPP_VERSION::IEffect;
	using ::android::hardware::audio::effect::CPP_VERSION::Result;		using ::android::hardware::audio::effect::CPP_VERSION::Result;
	using ::android::hardware::Return;		using ::android::hardware::Return;
	@@ -34,6 +33,8 @@ using ::android::hardware::Return;
	namespace android {		namespace android {
	namespace CPP_VERSION {		namespace CPP_VERSION {

			using namespace ::android::hardware::audio::common::CPP_VERSION;

	EffectsFactoryHalHidl::EffectsFactoryHalHidl() : ConversionHelperHidl("EffectsFactory") {		EffectsFactoryHalHidl::EffectsFactoryHalHidl() : ConversionHelperHidl("EffectsFactory") {
	mEffectsFactory = IEffectsFactory::getService();		mEffectsFactory = IEffectsFactory::getService();
	if (mEffectsFactory == 0) {		if (mEffectsFactory == 0) {

media/libaudiohal/impl/StreamHalHidl.cpp

+15 −37

Original line number	Original line	Diff line number	Diff line
	@@ -28,44 +28,18 @@
	#include "StreamHalHidl.h"		#include "StreamHalHidl.h"
	#include "VersionUtils.h"		#include "VersionUtils.h"

	using ::android::hardware::audio::common::CPP_VERSION::AudioChannelMask;
	using ::android::hardware::audio::common::CPP_VERSION::AudioFormat;
	using ::android::hardware::audio::common::CPP_VERSION::ThreadInfo;
	using ::android::hardware::audio::CPP_VERSION::AudioDrain;
	using ::android::hardware::audio::CPP_VERSION::IStreamOutCallback;
	using ::android::hardware::audio::CPP_VERSION::MessageQueueFlagBits;
	using ::android::hardware::audio::CPP_VERSION::MmapBufferInfo;
	using ::android::hardware::audio::CPP_VERSION::MmapPosition;
	using ::android::hardware::audio::CPP_VERSION::ParameterValue;
	using ::android::hardware::audio::CPP_VERSION::Result;
	using ::android::hardware::audio::CPP_VERSION::TimeSpec;
	using ::android::hardware::MQDescriptorSync;		using ::android::hardware::MQDescriptorSync;
	using ::android::hardware::Return;		using ::android::hardware::Return;
	using ::android::hardware::Void;		using ::android::hardware::Void;
	using ReadCommand = ::android::hardware::audio::CPP_VERSION::IStreamIn::ReadCommand;

	#if MAJOR_VERSION >= 4
	using ::android::hardware::audio::common::CPP_VERSION::AudioContentType;
	using ::android::hardware::audio::common::CPP_VERSION::AudioSource;
	using ::android::hardware::audio::common::CPP_VERSION::AudioUsage;
	using ::android::hardware::audio::CPP_VERSION::MicrophoneInfo;
	#endif

	#if MAJOR_VERSION == 4
	using ::android::hardware::audio::CPP_VERSION::PlaybackTrackMetadata;
	using ::android::hardware::audio::CPP_VERSION::RecordTrackMetadata;
	using HalSinkMetadata = ::android::hardware::audio::CPP_VERSION::SinkMetadata;
	using HalSourceMetadata = ::android::hardware::audio::CPP_VERSION::SourceMetadata;
	#elif MAJOR_VERSION == 5
	using ::android::hardware::audio::common::CPP_VERSION::PlaybackTrackMetadata;
	using ::android::hardware::audio::common::CPP_VERSION::RecordTrackMetadata;
	using HalSinkMetadata = ::android::hardware::audio::common::CPP_VERSION::SinkMetadata;
	using HalSourceMetadata = ::android::hardware::audio::common::CPP_VERSION::SourceMetadata;
	#endif

	namespace android {		namespace android {
	namespace CPP_VERSION {		namespace CPP_VERSION {

			using ReadCommand = ::android::hardware::audio::CPP_VERSION::IStreamIn::ReadCommand;

			using namespace ::android::hardware::audio::common::CPP_VERSION;
			using namespace ::android::hardware::audio::CPP_VERSION;

	StreamHalHidl::StreamHalHidl(IStream *stream)		StreamHalHidl::StreamHalHidl(IStream *stream)
	: ConversionHelperHidl("Stream"),		: ConversionHelperHidl("Stream"),
	mStream(stream),		mStream(stream),
	@@ -609,7 +583,8 @@ status_t StreamOutHalHidl::getPresentationPosition(uint64_t *frames, struct time
	}		}

	#if MAJOR_VERSION == 2		#if MAJOR_VERSION == 2
	status_t StreamOutHalHidl::updateSourceMetadata(const SourceMetadata& /* sourceMetadata */) {		status_t StreamOutHalHidl::updateSourceMetadata(
			const StreamOutHalInterface::SourceMetadata& /* sourceMetadata */) {
	// Audio HAL V2.0 does not support propagating source metadata		// Audio HAL V2.0 does not support propagating source metadata
	return INVALID_OPERATION;		return INVALID_OPERATION;
	}		}
	@@ -623,8 +598,9 @@ static auto transformToHidlVec(const Values& values, ElementConverter converter)
	return result;		return result;
	}		}

	status_t StreamOutHalHidl::updateSourceMetadata(const SourceMetadata& sourceMetadata) {		status_t StreamOutHalHidl::updateSourceMetadata(
	HalSourceMetadata halMetadata = {		const StreamOutHalInterface::SourceMetadata& sourceMetadata) {
			CPP_VERSION::SourceMetadata halMetadata = {
	.tracks = transformToHidlVec(sourceMetadata.tracks,		.tracks = transformToHidlVec(sourceMetadata.tracks,
	[](const playback_track_metadata& metadata) -> PlaybackTrackMetadata {		[](const playback_track_metadata& metadata) -> PlaybackTrackMetadata {
	return {		return {
	@@ -838,7 +814,8 @@ status_t StreamInHalHidl::getActiveMicrophones(
	return INVALID_OPERATION;		return INVALID_OPERATION;
	}		}

	status_t StreamInHalHidl::updateSinkMetadata(const SinkMetadata& /* sinkMetadata */) {		status_t StreamInHalHidl::updateSinkMetadata(
			const StreamInHalInterface::SinkMetadata& /* sinkMetadata */) {
	// Audio HAL V2.0 does not support propagating sink metadata		// Audio HAL V2.0 does not support propagating sink metadata
	return INVALID_OPERATION;		return INVALID_OPERATION;
	}		}
	@@ -862,8 +839,9 @@ status_t StreamInHalHidl::getActiveMicrophones(
	return processReturn("getActiveMicrophones", ret, retval);		return processReturn("getActiveMicrophones", ret, retval);
	}		}

	status_t StreamInHalHidl::updateSinkMetadata(const SinkMetadata& sinkMetadata) {		status_t StreamInHalHidl::updateSinkMetadata(const
	HalSinkMetadata halMetadata = {		StreamInHalInterface::SinkMetadata& sinkMetadata) {
			CPP_VERSION::SinkMetadata halMetadata = {
	.tracks = transformToHidlVec(sinkMetadata.tracks,		.tracks = transformToHidlVec(sinkMetadata.tracks,
	[](const record_track_metadata& metadata) -> RecordTrackMetadata {		[](const record_track_metadata& metadata) -> RecordTrackMetadata {
	return {		return {