tequilaOS/platform_hardware_libhardware
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Fix sizeof warnings on unusual calloc" am: 4ca44e7615

Browse source 
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/2337324

Change-Id: I7303e88a3abe9645f537e271a0e156c4b083ea33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot 2022-12-09 23:28:20 +00:00 committed by Automerger Merge Worker
commit 3f31ee2d2a
1 changed files with 11 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
modules/soundtrigger/sound_trigger_hw.c
View file

@ -246,12 +246,10 @@ static void unload_all_sound_models(struct stub_sound_trigger_device *stdev);
static char *sound_trigger_keyphrase_event_alloc(sound_model_handle_t handle, static char *sound_trigger_keyphrase_event_alloc(sound_model_handle_t handle,
struct sound_trigger_recognition_config *config, struct sound_trigger_recognition_config *config,
int recognition_status) { int recognition_status) {
char *data; struct sound_trigger_phrase_recognition_event *event =
struct sound_trigger_phrase_recognition_event *event; calloc(1, sizeof(struct sound_trigger_phrase_recognition_event));
data = (char *)calloc(1, sizeof(struct sound_trigger_phrase_recognition_event)); if (!event)
if (!data)
return NULL; return NULL;
event = (struct sound_trigger_phrase_recognition_event *)data;
event->common.status = recognition_status; event->common.status = recognition_status;
event->common.type = SOUND_MODEL_TYPE_KEYPHRASE; event->common.type = SOUND_MODEL_TYPE_KEYPHRASE;
event->common.model = handle; event->common.model = handle;
@ -279,18 +277,16 @@ static char *sound_trigger_keyphrase_event_alloc(sound_model_handle_t handle,
event->common.audio_config.sample_rate = 16000; event->common.audio_config.sample_rate = 16000;
event->common.audio_config.channel_mask = AUDIO_CHANNEL_IN_MONO; event->common.audio_config.channel_mask = AUDIO_CHANNEL_IN_MONO;
event->common.audio_config.format = AUDIO_FORMAT_PCM_16_BIT; event->common.audio_config.format = AUDIO_FORMAT_PCM_16_BIT;
return data; return (char*) event;
} }
static char *sound_trigger_generic_event_alloc(sound_model_handle_t handle, static char *sound_trigger_generic_event_alloc(sound_model_handle_t handle,
struct sound_trigger_recognition_config *config, struct sound_trigger_recognition_config *config,
int recognition_status) { int recognition_status) {
char *data; struct sound_trigger_generic_recognition_event *event =
struct sound_trigger_generic_recognition_event *event; calloc(1, sizeof(struct sound_trigger_generic_recognition_event));
data = (char *)calloc(1, sizeof(struct sound_trigger_generic_recognition_event)); if (!event)
if (!data)
return NULL; return NULL;
event = (struct sound_trigger_generic_recognition_event *)data;
event->common.status = recognition_status; event->common.status = recognition_status;
event->common.type = SOUND_MODEL_TYPE_GENERIC; event->common.type = SOUND_MODEL_TYPE_GENERIC;
event->common.model = handle; event->common.model = handle;
@ -301,7 +297,7 @@ static char *sound_trigger_generic_event_alloc(sound_model_handle_t handle,
event->common.audio_config.sample_rate = 16000; event->common.audio_config.sample_rate = 16000;
event->common.audio_config.channel_mask = AUDIO_CHANNEL_IN_MONO; event->common.audio_config.channel_mask = AUDIO_CHANNEL_IN_MONO;
event->common.audio_config.format = AUDIO_FORMAT_PCM_16_BIT; event->common.audio_config.format = AUDIO_FORMAT_PCM_16_BIT;
return data; return (char*) event;
} }
void send_event_with_handle(sound_model_handle_t* model_handle_str, void send_event_with_handle(sound_model_handle_t* model_handle_str,
@ -338,15 +334,13 @@ void send_event_with_handle(sound_model_handle_t* model_handle_str,
ALOGI("Unknown Sound Model Type, No Event to Send"); ALOGI("Unknown Sound Model Type, No Event to Send");
} }
} else if (event_type == EVENT_SOUND_MODEL) { } else if (event_type == EVENT_SOUND_MODEL) {
char *data; struct sound_trigger_model_event *event =
data = (char *)calloc(1, sizeof(struct sound_trigger_model_event)); calloc(1, sizeof(struct sound_trigger_model_event));
if (!data) { if (!event) {
ALOGW("%s Could not allocate event", __func__); ALOGW("%s Could not allocate event", __func__);
return; return;
} }
struct sound_trigger_model_event *event;
event = (struct sound_trigger_model_event *)data;
event->status = SOUND_MODEL_STATUS_UPDATED; event->status = SOUND_MODEL_STATUS_UPDATED;
event->model = model_context->model_handle; event->model = model_context->model_handle;
if (event) { if (event) {