soundtrigger: Apply clang-format to 2.0 default implementation (0bbc4aa6) · Commits · e / os / android_hardware_interfaces

soundtrigger/2.0/default/SoundTriggerHalImpl.cpp

+100 −147

Original line number	Diff line number	Diff line
		@@ -17,9 +17,8 @@
		#define LOG_TAG "SoundTriggerHalImpl"
		//#define LOG_NDEBUG 0

		#include <android/log.h>
		#include "SoundTriggerHalImpl.h"

		#include <android/log.h>

		namespace android {
		namespace hardware {
		@@ -29,8 +28,7 @@ namespace implementation {

		// static
		void SoundTriggerHalImpl::soundModelCallback(struct sound_trigger_model_event* halEvent,
		void *cookie)
		{
		void* cookie) {
		if (halEvent == NULL) {
		ALOGW("soundModelCallback called with NULL event");
		return;
		@@ -56,8 +54,7 @@ void SoundTriggerHalImpl::soundModelCallback(struct sound_trigger_model_event *h

		// static
		void SoundTriggerHalImpl::recognitionCallback(struct sound_trigger_recognition_event* halEvent,
		void *cookie)
		{
		void* cookie) {
		if (halEvent == NULL) {
		ALOGW("recognitionCallback call NULL event");
		return;
		@@ -81,11 +78,8 @@ void SoundTriggerHalImpl::recognitionCallback(struct sound_trigger_recognition_e
		delete event;
		}



		// Methods from ::android::hardware::soundtrigger::V2_0::ISoundTriggerHw follow.
		Return<void> SoundTriggerHalImpl::getProperties(getProperties_cb _hidl_cb)
		{
		Return<void> SoundTriggerHalImpl::getProperties(getProperties_cb _hidl_cb) {
		ALOGV("getProperties() mHwDevice %p", mHwDevice);
		int ret;
		struct sound_trigger_properties halProperties;
		@@ -100,8 +94,8 @@ Return<void> SoundTriggerHalImpl::getProperties(getProperties_cb _hidl_cb)

		convertPropertiesFromHal(&properties, &halProperties);

		ALOGV("getProperties implementor %s recognitionModes %08x",
		properties.implementor.c_str(), properties.recognitionModes);
		ALOGV("getProperties implementor %s recognitionModes %08x", properties.implementor.c_str(),
		properties.recognitionModes);

		exit:
		_hidl_cb(ret, properties);
		@@ -111,8 +105,7 @@ exit:
		int SoundTriggerHalImpl::doLoadSoundModel(const ISoundTriggerHw::SoundModel& soundModel,
		const sp<ISoundTriggerHwCallback>& callback,
		ISoundTriggerHwCallback::CallbackCookie cookie,
		uint32_t *modelId)
		{
		uint32_t* modelId) {
		int32_t ret = 0;
		struct sound_trigger_sound_model* halSoundModel;
		*modelId = 0;
		@@ -137,13 +130,13 @@ int SoundTriggerHalImpl::doLoadSoundModel(const ISoundTriggerHw::SoundModel& sou
		*modelId = nextUniqueId();
		} while (mClients.valueFor(modelId) != 0 && modelId != 0);
		}
		LOG_ALWAYS_FATAL_IF(*modelId == 0,
		"wrap around in sound model IDs, num loaded models %zu", mClients.size());
		LOG_ALWAYS_FATAL_IF(*modelId == 0, "wrap around in sound model IDs, num loaded models %zu",
		mClients.size());

		client = new SoundModelClient(*modelId, callback, cookie);

		ret = mHwDevice->load_sound_model(mHwDevice, halSoundModel, soundModelCallback,
		client.get(), &client->mHalHandle);
		ret = mHwDevice->load_sound_model(mHwDevice, halSoundModel, soundModelCallback, client.get(),
		&client->mHalHandle);

		free(halSoundModel);

		@@ -163,8 +156,7 @@ exit:
		Return<void> SoundTriggerHalImpl::loadSoundModel(const ISoundTriggerHw::SoundModel& soundModel,
		const sp<ISoundTriggerHwCallback>& callback,
		ISoundTriggerHwCallback::CallbackCookie cookie,
		loadSoundModel_cb _hidl_cb)
		{
		loadSoundModel_cb _hidl_cb) {
		uint32_t modelId = 0;
		int32_t ret = doLoadSoundModel(soundModel, callback, cookie, &modelId);

		@@ -174,20 +166,17 @@ Return<void> SoundTriggerHalImpl::loadSoundModel(const ISoundTriggerHw::SoundMod

		Return<void> SoundTriggerHalImpl::loadPhraseSoundModel(
		const ISoundTriggerHw::PhraseSoundModel& soundModel,
		const sp<ISoundTriggerHwCallback>& callback,
		ISoundTriggerHwCallback::CallbackCookie cookie,
		ISoundTriggerHw::loadPhraseSoundModel_cb _hidl_cb)
		{
		const sp<ISoundTriggerHwCallback>& callback, ISoundTriggerHwCallback::CallbackCookie cookie,
		ISoundTriggerHw::loadPhraseSoundModel_cb _hidl_cb) {
		uint32_t modelId = 0;
		int32_t ret = doLoadSoundModel((const ISoundTriggerHw::SoundModel&)soundModel,
		callback, cookie, &modelId);
		int32_t ret = doLoadSoundModel((const ISoundTriggerHw::SoundModel&)soundModel, callback, cookie,
		&modelId);

		_hidl_cb(ret, modelId);
		return Void();
		}

		Return<int32_t> SoundTriggerHalImpl::unloadSoundModel(SoundModelHandle modelHandle)
		{
		Return<int32_t> SoundTriggerHalImpl::unloadSoundModel(SoundModelHandle modelHandle) {
		int32_t ret;
		sp<SoundModelClient> client;

		@@ -213,11 +202,10 @@ exit:
		return ret;
		}

		Return<int32_t> SoundTriggerHalImpl::startRecognition(SoundModelHandle modelHandle,
		const ISoundTriggerHw::RecognitionConfig& config,
		Return<int32_t> SoundTriggerHalImpl::startRecognition(
		SoundModelHandle modelHandle, const ISoundTriggerHw::RecognitionConfig& config,
		const sp<ISoundTriggerHwCallback>& callback __unused,
		ISoundTriggerHwCallback::CallbackCookie cookie __unused)
		{
		ISoundTriggerHwCallback::CallbackCookie cookie __unused) {
		int32_t ret;
		sp<SoundModelClient> client;
		struct sound_trigger_recognition_config* halConfig;
		@@ -236,7 +224,6 @@ Return<int32_t> SoundTriggerHalImpl::startRecognition(SoundModelHandle modelHand
		}
		}


		halConfig = convertRecognitionConfigToHal(&config);

		if (halConfig == NULL) {
		@@ -252,8 +239,7 @@ exit:
		return ret;
		}

		Return<int32_t> SoundTriggerHalImpl::stopRecognition(SoundModelHandle modelHandle)
		{
		Return<int32_t> SoundTriggerHalImpl::stopRecognition(SoundModelHandle modelHandle) {
		int32_t ret;
		sp<SoundModelClient> client;
		if (mHwDevice == NULL) {
		@@ -276,8 +262,7 @@ exit:
		return ret;
		}

		Return<int32_t> SoundTriggerHalImpl::stopAllRecognitions()
		{
		Return<int32_t> SoundTriggerHalImpl::stopAllRecognitions() {
		int32_t ret;
		if (mHwDevice == NULL) {
		ret = -ENODEV;
		@@ -295,19 +280,16 @@ exit:
		}

		SoundTriggerHalImpl::SoundTriggerHalImpl()
		: mModuleName("primary"), mHwDevice(NULL), mNextModelId(1)
		{
		}
		: mModuleName("primary"), mHwDevice(NULL), mNextModelId(1) {}

		void SoundTriggerHalImpl::onFirstRef()
		{
		void SoundTriggerHalImpl::onFirstRef() {
		const hw_module_t* mod;
		int rc;

		rc = hw_get_module_by_class(SOUND_TRIGGER_HARDWARE_MODULE_ID, mModuleName, &mod);
		if (rc != 0) {
		ALOGE("couldn't load sound trigger module %s.%s (%s)",
		SOUND_TRIGGER_HARDWARE_MODULE_ID, mModuleName, strerror(-rc));
		ALOGE("couldn't load sound trigger module %s.%s (%s)", SOUND_TRIGGER_HARDWARE_MODULE_ID,
		mModuleName, strerror(-rc));
		return;
		}
		rc = sound_trigger_hw_device_open(mod, &mHwDevice);
		@@ -328,22 +310,18 @@ void SoundTriggerHalImpl::onFirstRef()
		ALOGI("onFirstRef() mModuleName %s mHwDevice %p", mModuleName, mHwDevice);
		}

		SoundTriggerHalImpl::~SoundTriggerHalImpl()
		{
		SoundTriggerHalImpl::~SoundTriggerHalImpl() {
		if (mHwDevice != NULL) {
		sound_trigger_hw_device_close(mHwDevice);
		}
		}

		uint32_t SoundTriggerHalImpl::nextUniqueId()
		{
		return (uint32_t) atomic_fetch_add_explicit(&mNextModelId,
		(uint_fast32_t) 1, memory_order_acq_rel);
		uint32_t SoundTriggerHalImpl::nextUniqueId() {
		return (uint32_t)atomic_fetch_add_explicit(&mNextModelId, (uint_fast32_t)1,
		memory_order_acq_rel);
		}

		void SoundTriggerHalImpl::convertUuidFromHal(Uuid *uuid,
		const sound_trigger_uuid_t *halUuid)
		{
		void SoundTriggerHalImpl::convertUuidFromHal(Uuid* uuid, const sound_trigger_uuid_t* halUuid) {
		uuid->timeLow = halUuid->timeLow;
		uuid->timeMid = halUuid->timeMid;
		uuid->versionAndTimeHigh = halUuid->timeHiAndVersion;
		@@ -351,9 +329,7 @@ void SoundTriggerHalImpl::convertUuidFromHal(Uuid *uuid,
		memcpy(&uuid->node[0], &halUuid->node[0], 6);
		}

		void SoundTriggerHalImpl::convertUuidToHal(sound_trigger_uuid_t *halUuid,
		const Uuid *uuid)
		{
		void SoundTriggerHalImpl::convertUuidToHal(sound_trigger_uuid_t* halUuid, const Uuid* uuid) {
		halUuid->timeLow = uuid->timeLow;
		halUuid->timeMid = uuid->timeMid;
		halUuid->timeHiAndVersion = uuid->versionAndTimeHigh;
		@@ -362,9 +338,7 @@ void SoundTriggerHalImpl::convertUuidToHal(sound_trigger_uuid_t *halUuid,
		}

		void SoundTriggerHalImpl::convertPropertiesFromHal(
		ISoundTriggerHw::Properties *properties,
		const struct sound_trigger_properties *halProperties)
		{
		ISoundTriggerHw::Properties* properties, const struct sound_trigger_properties* halProperties) {
		properties->implementor = halProperties->implementor;
		properties->description = halProperties->description;
		properties->version = halProperties->version;
		@@ -378,13 +352,10 @@ void SoundTriggerHalImpl::convertPropertiesFromHal(
		properties->concurrentCapture = halProperties->concurrent_capture;
		properties->triggerInEvent = halProperties->trigger_in_event;
		properties->powerConsumptionMw = halProperties->power_consumption_mw;

		}

		void SoundTriggerHalImpl::convertTriggerPhraseToHal(
		struct sound_trigger_phrase *halTriggerPhrase,
		const ISoundTriggerHw::Phrase *triggerPhrase)
		{
		void SoundTriggerHalImpl::convertTriggerPhraseToHal(struct sound_trigger_phrase* halTriggerPhrase,
		const ISoundTriggerHw::Phrase* triggerPhrase) {
		halTriggerPhrase->id = triggerPhrase->id;
		halTriggerPhrase->recognition_mode = triggerPhrase->recognitionModes;
		unsigned int i;
		@@ -395,15 +366,12 @@ void SoundTriggerHalImpl::convertTriggerPhraseToHal(
		halTriggerPhrase->users[i] = triggerPhrase->users[i];
		}

		strlcpy(halTriggerPhrase->locale,
		triggerPhrase->locale.c_str(), SOUND_TRIGGER_MAX_LOCALE_LEN);
		strlcpy(halTriggerPhrase->text,
		triggerPhrase->text.c_str(), SOUND_TRIGGER_MAX_STRING_LEN);
		strlcpy(halTriggerPhrase->locale, triggerPhrase->locale.c_str(), SOUND_TRIGGER_MAX_LOCALE_LEN);
		strlcpy(halTriggerPhrase->text, triggerPhrase->text.c_str(), SOUND_TRIGGER_MAX_STRING_LEN);
		}

		struct sound_trigger_sound_model* SoundTriggerHalImpl::convertSoundModelToHal(
		const ISoundTriggerHw::SoundModel *soundModel)
		{
		const ISoundTriggerHw::SoundModel* soundModel) {
		struct sound_trigger_sound_model* halModel = NULL;
		if (soundModel->type == SoundModelType::KEYPHRASE) {
		size_t allocSize =
		@@ -411,22 +379,21 @@ struct sound_trigger_sound_model *SoundTriggerHalImpl::convertSoundModelToHal(
		struct sound_trigger_phrase_sound_model* halKeyPhraseModel =
		static_cast<struct sound_trigger_phrase_sound_model*>(malloc(allocSize));
		LOG_ALWAYS_FATAL_IF(halKeyPhraseModel == NULL,
		"malloc failed for size %zu in convertSoundModelToHal PHRASE", allocSize);
		"malloc failed for size %zu in convertSoundModelToHal PHRASE",
		allocSize);

		const ISoundTriggerHw::PhraseSoundModel* keyPhraseModel =
		reinterpret_cast<const ISoundTriggerHw::PhraseSoundModel*>(soundModel);

		size_t i;
		for (i = 0; i < keyPhraseModel->phrases.size() && i < SOUND_TRIGGER_MAX_PHRASES; i++) {
		convertTriggerPhraseToHal(&halKeyPhraseModel->phrases[i],
		&keyPhraseModel->phrases[i]);
		convertTriggerPhraseToHal(&halKeyPhraseModel->phrases[i], &keyPhraseModel->phrases[i]);
		}
		halKeyPhraseModel->num_phrases = (unsigned int)i;
		halModel = reinterpret_cast<struct sound_trigger_sound_model*>(halKeyPhraseModel);
		halModel->data_offset = sizeof(struct sound_trigger_phrase_sound_model);
		} else {
		size_t allocSize =
		sizeof(struct sound_trigger_sound_model) + soundModel->data.size();
		size_t allocSize = sizeof(struct sound_trigger_sound_model) + soundModel->data.size();
		halModel = static_cast<struct sound_trigger_sound_model*>(malloc(allocSize));
		LOG_ALWAYS_FATAL_IF(halModel == NULL,
		"malloc failed for size %zu in convertSoundModelToHal GENERIC",
		@@ -446,9 +413,7 @@ struct sound_trigger_sound_model *SoundTriggerHalImpl::convertSoundModelToHal(
		}

		void SoundTriggerHalImpl::convertPhraseRecognitionExtraToHal(
		struct sound_trigger_phrase_recognition_extra *halExtra,
		const PhraseRecognitionExtra *extra)
		{
		struct sound_trigger_phrase_recognition_extra* halExtra, const PhraseRecognitionExtra* extra) {
		halExtra->id = extra->id;
		halExtra->recognition_modes = extra->recognitionModes;
		halExtra->confidence_level = extra->confidenceLevel;
		@@ -462,15 +427,13 @@ void SoundTriggerHalImpl::convertPhraseRecognitionExtraToHal(
		}

		struct sound_trigger_recognition_config* SoundTriggerHalImpl::convertRecognitionConfigToHal(
		const ISoundTriggerHw::RecognitionConfig *config)
		{
		const ISoundTriggerHw::RecognitionConfig* config) {
		size_t allocSize = sizeof(struct sound_trigger_recognition_config) + config->data.size();
		struct sound_trigger_recognition_config* halConfig =
		static_cast<struct sound_trigger_recognition_config*>(malloc(allocSize));

		LOG_ALWAYS_FATAL_IF(halConfig == NULL,
		"malloc failed for size %zu in convertRecognitionConfigToHal",
		allocSize);
		"malloc failed for size %zu in convertRecognitionConfigToHal", allocSize);

		halConfig->capture_handle = (audio_io_handle_t)config->captureHandle;
		halConfig->capture_device = (audio_devices_t)config->captureDevice;
		@@ -478,8 +441,7 @@ struct sound_trigger_recognition_config *SoundTriggerHalImpl::convertRecognition

		unsigned int i;
		for (i = 0; i < config->phrases.size() && i < SOUND_TRIGGER_MAX_PHRASES; i++) {
		convertPhraseRecognitionExtraToHal(&halConfig->phrases[i],
		&config->phrases[i]);
		convertPhraseRecognitionExtraToHal(&halConfig->phrases[i], &config->phrases[i]);
		}
		halConfig->num_phrases = i;

		@@ -492,9 +454,8 @@ struct sound_trigger_recognition_config *SoundTriggerHalImpl::convertRecognition
		}

		// static
		void SoundTriggerHalImpl::convertSoundModelEventFromHal(ISoundTriggerHwCallback::ModelEvent *event,
		const struct sound_trigger_model_event *halEvent)
		{
		void SoundTriggerHalImpl::convertSoundModelEventFromHal(
		ISoundTriggerHwCallback::ModelEvent* event, const struct sound_trigger_model_event* halEvent) {
		event->status = (ISoundTriggerHwCallback::SoundModelStatus)halEvent->status;
		// event->model to be remapped by called
		event->data.setToExternal(
		@@ -504,8 +465,7 @@ void SoundTriggerHalImpl::convertSoundModelEventFromHal(ISoundTriggerHwCallback:

		// static
		ISoundTriggerHwCallback::RecognitionEvent* SoundTriggerHalImpl::convertRecognitionEventFromHal(
		const struct sound_trigger_recognition_event *halEvent)
		{
		const struct sound_trigger_recognition_event* halEvent) {
		ISoundTriggerHwCallback::RecognitionEvent* event;

		if (halEvent->type == SOUND_MODEL_TYPE_KEYPHRASE) {
		@@ -550,15 +510,12 @@ ISoundTriggerHwCallback::RecognitionEvent *SoundTriggerHalImpl::convertRecogniti

		// static
		void SoundTriggerHalImpl::convertPhraseRecognitionExtraFromHal(
		PhraseRecognitionExtra *extra,
		const struct sound_trigger_phrase_recognition_extra *halExtra)
		{
		PhraseRecognitionExtra* extra, const struct sound_trigger_phrase_recognition_extra* halExtra) {
		extra->id = halExtra->id;
		extra->recognitionModes = halExtra->recognition_modes;
		extra->confidenceLevel = halExtra->confidence_level;

		ConfidenceLevel *levels =
		new ConfidenceLevel[halExtra->num_levels];
		ConfidenceLevel* levels = new ConfidenceLevel[halExtra->num_levels];
		for (unsigned int i = 0; i < halExtra->num_levels; i++) {
		levels[i].userId = halExtra->levels[i].user_id;
		levels[i].levelPercent = halExtra->levels[i].level;
		@@ -569,8 +526,7 @@ void SoundTriggerHalImpl::convertPhraseRecognitionExtraFromHal(
		delete[] levels;
		}

		ISoundTriggerHw HIDL_FETCH_ISoundTriggerHw(const char /* name */)
		{
		ISoundTriggerHw* HIDL_FETCH_ISoundTriggerHw(const char* /* name */) {
		return new SoundTriggerHalImpl();
		}
		} // namespace implementation
		@@ -578,6 +534,3 @@ ISoundTriggerHw HIDL_FETCH_ISoundTriggerHw(const char /* name */)
		} // namespace soundtrigger
		} // namespace hardware
		} // namespace android

soundtrigger/2.0/default/SoundTriggerHalImpl.h

+80 −89

Original line number	Diff line number	Diff line
		@@ -19,12 +19,12 @@

		#include <android/hardware/soundtrigger/2.0/ISoundTriggerHw.h>
		#include <android/hardware/soundtrigger/2.0/ISoundTriggerHwCallback.h>
		#include <hardware/sound_trigger.h>
		#include <hidl/Status.h>
		#include <stdatomic.h>
		#include <utils/threads.h>
		#include <utils/KeyedVector.h>
		#include <system/sound_trigger.h>
		#include <hardware/sound_trigger.h>
		#include <utils/KeyedVector.h>
		#include <utils/threads.h>

		namespace android {
		namespace hardware {
		@@ -35,7 +35,6 @@ namespace implementation {
		using ::android::hardware::audio::common::V2_0::Uuid;
		using ::android::hardware::soundtrigger::V2_0::ISoundTriggerHwCallback;


		class SoundTriggerHalImpl : public ISoundTriggerHw {
		public:
		SoundTriggerHalImpl();
		@@ -62,13 +61,10 @@ public:
		// RefBase
		virtual void onFirstRef();

		static void soundModelCallback(struct sound_trigger_model_event *halEvent,
		void *cookie);
		static void recognitionCallback(struct sound_trigger_recognition_event *halEvent,
		void *cookie);
		static void soundModelCallback(struct sound_trigger_model_event* halEvent, void* cookie);
		static void recognitionCallback(struct sound_trigger_recognition_event* halEvent, void* cookie);

		private:

		class SoundModelClient : public RefBase {
		public:
		SoundModelClient(uint32_t id, sp<ISoundTriggerHwCallback> callback,
		@@ -83,10 +79,8 @@ private:
		};

		uint32_t nextUniqueId();
		void convertUuidFromHal(Uuid *uuid,
		const sound_trigger_uuid_t *halUuid);
		void convertUuidToHal(sound_trigger_uuid_t *halUuid,
		const Uuid *uuid);
		void convertUuidFromHal(Uuid* uuid, const sound_trigger_uuid_t* halUuid);
		void convertUuidToHal(sound_trigger_uuid_t* halUuid, const Uuid* uuid);
		void convertPropertiesFromHal(ISoundTriggerHw::Properties* properties,
		const struct sound_trigger_properties* halProperties);
		void convertTriggerPhraseToHal(struct sound_trigger_phrase* halTriggerPhrase,
		@@ -94,25 +88,23 @@ private:
		// returned HAL sound model must be freed by caller
		struct sound_trigger_sound_model* convertSoundModelToHal(
		const ISoundTriggerHw::SoundModel* soundModel);
		void convertPhraseRecognitionExtraToHal(
		struct sound_trigger_phrase_recognition_extra *halExtra,
		void convertPhraseRecognitionExtraToHal(struct sound_trigger_phrase_recognition_extra* halExtra,
		const PhraseRecognitionExtra* extra);
		// returned recognition config must be freed by caller
		struct sound_trigger_recognition_config* convertRecognitionConfigToHal(
		const ISoundTriggerHw::RecognitionConfig* config);


		static void convertSoundModelEventFromHal(ISoundTriggerHwCallback::ModelEvent* event,
		const struct sound_trigger_model_event* halEvent);
		static ISoundTriggerHwCallback::RecognitionEvent* convertRecognitionEventFromHal(
		const struct sound_trigger_recognition_event* halEvent);
		static void convertPhraseRecognitionExtraFromHal(PhraseRecognitionExtra *extra,
		static void convertPhraseRecognitionExtraFromHal(
		PhraseRecognitionExtra* extra,
		const struct sound_trigger_phrase_recognition_extra* halExtra);

		int doLoadSoundModel(const ISoundTriggerHw::SoundModel& soundModel,
		const sp<ISoundTriggerHwCallback>& callback,
		ISoundTriggerHwCallback::CallbackCookie cookie,
		uint32_t *modelId);
		ISoundTriggerHwCallback::CallbackCookie cookie, uint32_t* modelId);

		virtual ~SoundTriggerHalImpl();

		@@ -132,4 +124,3 @@ extern "C" ISoundTriggerHw HIDL_FETCH_ISoundTriggerHw(const char name);
		} // namespace android

		#endif // ANDROID_HARDWARE_SOUNDTRIGGER_V2_0_IMPLEMENTATION_H