Merge "Revised and addressed vendors' comments" into nyc-dev
diff --git a/include/hardware/vehicle_camera.h b/include/hardware/vehicle_camera.h
new file mode 100644
index 0000000..8075aee
--- /dev/null
+++ b/include/hardware/vehicle_camera.h
@@ -0,0 +1,188 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef ANDROID_VEHICLE_CAMERA_INTERFACE_H
+#define ANDROID_VEHICLE_CAMERA_INTERFACE_H
+
+#include <errno.h>
+#include <stdint.h>
+#include <sys/cdefs.h>
+#include <sys/types.h>
+
+#include <hardware/hardware.h>
+#include <cutils/native_handle.h>
+#include <system/window.h>
+
+__BEGIN_DECLS
+
+/*****************************************************************************/
+
+#define VEHICLE_CAMERA_HEADER_VERSION 1
+#define VEHICLE_CAMERA_MODULE_API_VERSION_1_0 HARDWARE_MODULE_API_VERSION(1, 0)
+#define VEHICLE_CAMERA_DEVICE_API_VERSION_1_0 HARDWARE_DEVICE_API_VERSION_2(1, 0, VEHICLE_CAMERA_HEADER_VERSION)
+
+/**
+ * Vehicle Camera to provide interfaces for controlling cameras
+ */
+
+/**
+ * The id of this module
+ */
+#define VEHICLE_CAMERA_HARDWARE_MODULE_ID "vehicle_camera"
+
+/**
+ * Name of the vehicle device to open. Extend this list as
+ * more cameras are added. Each camera defined in vehicle_camera_type_t
+ * shall have a string defined for it.
+ */
+#define VEHICLE_CAMERA_RVC_DEVICE "vehicle_camera_rvc_device"
+
+/**
+ * Each camera on the car shall be enumerated
+ */
+typedef enum {
+ VEHICLE_CAMERA_RVC = 1,
+} vehicle_camera_type_t;
+
+/**
+ * Describes the current state of camera device
+ */
+typedef struct {
+ uint32_t overlay_on;
+ uint32_t camera_on;
+} vehicle_camera_state_t;
+
+/**
+ * Bitmask of features supported by a camera module
+ */
+enum {
+ VEHICLE_CAMERA_CONFIG_FLAG_ANDROID_OVERLAY_SUPPORT = 0x1,
+ VEHICLE_CAMERA_CONFIG_FLAG_CAMERA_CROP_SUPPORT = 0x2,
+ VEHICLE_CAMERA_CONFIG_FLAG_CAMERA_POSITIONING_SUPPORT = 0x4
+} vehicle_camera_config_flag;
+
+typedef struct {
+ uint32_t capabilites_flags;
+ uint32_t camera_width;
+ uint32_t camera_height;
+ uint32_t display_width;
+ uint32_t display_height;
+} vehicle_camera_cap_t;
+
+/************************************************************************************/
+
+/**
+ * Every hardware module must have a data structure named HAL_MODULE_INFO_SYM
+ * and the fields of this data structure must begin with hw_module_t
+ * followed by module specific information.
+ */
+typedef struct {
+ struct hw_module_t common;
+ /**
+ * Queries the HW for the cameras installed on the vehicle
+ * @param num_cameras - number of camera devices available. If
+ * 0 is returned, an error has occurred and
+ * the return pointer shall be NULL.
+ * @return pointer to an array of vehicle_camera_type_t to
+ * denote which cameras are installed. This pointer is
+ * only valid while the vehicle hal is loaded. If the
+ * pointer is NULL, then an error has occurred and
+ * num_cameras shall be 0.
+ */
+ const uint32_t * (*get_camera_device_list)(uint32_t *num_cameras);
+} vehicle_camera_module_t;
+
+
+typedef struct vehicle_camera_device_t {
+ struct hw_device_t common;
+
+ const uint32_t camera_type;
+
+ /**
+ * Returns the capabilities of this camera.
+ * @param device - device handle
+ * @param cap - pointer to capabilities flags being returned
+ * @return 0 on success
+ * -EPERM if device is invalid or not initialized
+ */
+ int (*get_capabilities)(struct vehicle_camera_device_t *device, vehicle_camera_cap_t *cap);
+
+ /**
+ * Gets the current camera crop settings.
+ * @param device - device handle
+ * @param rect - current camera crop settings
+ * @return 0 on success
+ * -EPERM if device is not initialized
+ * -errno on error
+ */
+ int (*get_camera_crop)(struct vehicle_camera_device_t *device, android_native_rect_t *rect);
+
+ /**
+ * Sets the camera crop.
+ * @param device - device handle
+ * @param rect - area of camera input to crop. Must fit within
+ * camera width and height from camera capabilities.
+ * @return 0 on success
+ * -EPERM if device is not initialized
+ * -errno on error
+ */
+ int (*set_camera_crop)(struct vehicle_camera_device_t *device, const android_native_rect_t *rect);
+
+ /**
+ * Gets position of the camera on the display.
+ * @param device - device handle
+ * @param rect - area of display the camera will appear when on
+ * @return 0 on success
+ * -EPERM if device is not initialized
+ * -errno on error
+ */
+ int (*get_camera_position)(struct vehicle_camera_device_t *device, android_native_rect_t *rect);
+
+ /**
+ * Sets position of the camera on the display.
+ * @param device - device handle
+ * @param rect - area of display the camera will appear when on.
+ * Must fit within display width and height from
+ * camera capabilities.
+ * @return 0 on success
+ * -EPERM if device is not initialized
+ * -errno on error
+ */
+ int (*set_camera_position)(struct vehicle_camera_device_t *device, const android_native_rect_t *rect);
+
+ /**
+ * Gets the current camera state.
+ * @param device - device handle
+ * @param state - last setting for the camera
+ * @return 0 on success
+ * -EPERM if device is not initialized
+ */
+ int (*get_camera_state)(struct vehicle_camera_device_t *device, vehicle_camera_state_t *state);
+
+ /**
+ * Sets the camera state.
+ * @param device - device handle
+ * @param state - desired setting for the camera
+ * @return 0 on success
+ * -EPERM if device is not initialized
+ * -errno on error
+ */
+ int (*set_camera_state)(struct vehicle_camera_device_t *device, const vehicle_camera_state_t *state);
+} vehicle_camera_device_t;
+
+__END_DECLS
+
+#endif // ANDROID_VEHICLE_CAMERA_INTERFACE_H
diff --git a/include/hardware/vehicle_rvc.h b/include/hardware/vehicle_rvc.h
deleted file mode 100644
index 05d57e4..0000000
--- a/include/hardware/vehicle_rvc.h
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef ANDROID_VEHICLE_RVC_INTERFACE_H
-#define ANDROID_VEHICLE_RVC_INTERFACE_H
-
-#include <stdint.h>
-#include <sys/cdefs.h>
-#include <sys/types.h>
-#include <errno.h>
-
-#include <hardware/hardware.h>
-#include <cutils/native_handle.h>
-
-__BEGIN_DECLS
-
-/*****************************************************************************/
-
-#define VEHICLE_RVC_HEADER_VERSION 1
-#define VEHICLE_RVC_MODULE_API_VERSION_1_0 HARDWARE_MODULE_API_VERSION(1, 0)
-#define VEHICLE_RVC_DEVICE_API_VERSION_1_0 HARDWARE_DEVICE_API_VERSION_2(1, 0, VEHICLE_RVC_HEADER_VERSION)
-
-/**
- * Vehicle Rearview Camera to provide interfaces for controlling
- * the RVC.
- */
-
-/**
- * The id of this module
- */
-#define VEHICLE_RVC_HARDWARE_MODULE_ID "vehicle_rvc"
-
-/**
- * Name of the vehicle device to open
- */
-#define VEHICLE_RVC_HARDWARE_DEVICE "vehicle_rvc_hw_device"
-
-/**
- * Describes the current state of RVC module
- */
-typedef struct {
- uint32_t overlay_on;
- uint32_t rvc_on;
-} vehicle_rvc_state_t;
-
-/**
- * Describes a rectangle for cropping and positioning objects
- * uint32_t left Position of left border of rectangle
- * uint32_t top Position of top border of rectangle
- * uint32_t width Width of rectangle
- * uint32_t height Height of rectangle
- */
-typedef struct {
- uint32_t left;
- uint32_t top;
- uint32_t width;
- uint32_t height;
-} vehicle_rvc_rect_t;
-
-/**
- * Bitmask of features supported by RVC module
- */
-enum vehicle_rvc_config_flag {
- ANDROID_OVERLAY_SUPPORT_FLAG = 0x1,
- CAMERA_CROP_SUPPORT_FLAG = 0x2,
- CAMERA_POSITIONING_SUPPORT_FLAG = 0x4
-};
-
-typedef struct {
- uint32_t capabilites_flags;
- uint32_t camera_width;
- uint32_t camera_height;
- uint32_t display_width;
- uint32_t display_height;
-} vehicle_rvc_cap_t;
-
-/************************************************************************************/
-
-/**
- * Every hardware module must have a data structure named HAL_MODULE_INFO_SYM
- * and the fields of this data structure must begin with hw_module_t
- * followed by module specific information.
- */
-typedef struct {
- struct hw_module_t common;
-} vehicle_rvc_module_t;
-
-
-typedef struct vehicle_rvc_device_t {
- struct hw_device_t common;
-
- /**
- * Returns the capabilities of this RVC.
- * @param device
- * @return
- */
- int (*get_capabilities)(struct vehicle_rvc_device_t *device, vehicle_rvc_cap_t *cap);
- /**
- * Gets the current RVC crop settings.
- * @param device
- * @return
- */
- int (*get_rvc_crop)(struct vehicle_rvc_device_t *device, vehicle_rvc_rect_t *rect);
- /**
- * Sets the RVC crop.
- * @param device
- * @param rect Area of RVC camera input to crop
- * @return
- */
- int (*set_rvc_crop)(struct vehicle_rvc_device_t *device, const vehicle_rvc_rect_t *rect);
- /**
- * Gets position of the RVC on the dispaly.
- * @param device
- * @param rect Area of display the RVC will appear when on
- * @return
- */
- int (*get_rvc_position)(struct vehicle_rvc_device_t *device, vehicle_rvc_rect_t *rect);
- /**
- * Sets position of the RVC on the display.
- * @param device
- * @param rect
- * @return
- */
- int (*set_rvc_position)(struct vehicle_rvc_device_t *device, const vehicle_rvc_rect_t *rect);
- /**
- * Gets the current camera state.
- * @param device
- * @return
- */
- int (*get_camera_state)(struct vehicle_rvc_device_t *device, vehicle_rvc_state_t *state);
- /**
- * Sets the camera state. Calling this function will generate a
- * callback notifying the user that the camera state has
- * changed.
- * @param device
- * @return
- */
- int (*set_camera_state)(struct vehicle_rvc_device_t *device, const vehicle_rvc_state_t *state);
-} vehicle_rvc_device_t;
-
-__END_DECLS
-
-#endif // ANDROID_VEHICLE_RVC_INTERFACE_H
diff --git a/modules/soundtrigger/sound_trigger_hw.c b/modules/soundtrigger/sound_trigger_hw.c
index 2034fbe..c7739cc 100644
--- a/modules/soundtrigger/sound_trigger_hw.c
+++ b/modules/soundtrigger/sound_trigger_hw.c
@@ -38,7 +38,9 @@
// The following commands work with the network port:
#define COMMAND_LS "ls"
-#define COMMAND_TRIGGER "trig" // Argument: model index.
+#define COMMAND_RECOGNITION_TRIGGER "trig" // Argument: model index.
+#define COMMAND_RECOGNITION_ABORT "abort" // Argument: model index.
+#define COMMAND_RECOGNITION_FAILURE "fail" // Argument: model index.
#define COMMAND_UPDATE "update" // Argument: model index.
#define COMMAND_CLOSE "close" // Close just closes the network port, keeps thread running.
#define COMMAND_END "end" // Closes connection and stops the thread.
@@ -76,7 +78,7 @@
RECOGNITION_MODE_VOICE_TRIGGER, // recognition_modes
false, // capture_transition
0, // max_buffer_ms
- false, // concurrent_capture
+ true, // concurrent_capture
false, // trigger_in_event
0 // power_consumption_mw
};
@@ -113,6 +115,25 @@
int next_sound_model_id;
};
+// Returns model at the given index, null otherwise (error, doesn't exist, etc).
+// Note that here index starts from zero.
+struct recognition_context* fetch_model_at_index(
+ struct stub_sound_trigger_device* stdev, int index) {
+ ALOGI("%s", __func__);
+ struct recognition_context *model_context = NULL;
+ struct recognition_context *last_model_context = stdev->root_model_context;
+ unsigned int model_index = 0;
+ while(last_model_context) {
+ if (model_index == index) {
+ model_context = last_model_context;
+ break;
+ }
+ last_model_context = last_model_context->next;
+ model_index++;
+ }
+ return model_context;
+}
+
/* Will reuse ids when overflow occurs */
static sound_model_handle_t generate_sound_model_handle(const struct sound_trigger_hw_device *dev) {
struct stub_sound_trigger_device *stdev = (struct stub_sound_trigger_device *)dev;
@@ -126,93 +147,142 @@
bool parse_socket_data(int conn_socket, struct stub_sound_trigger_device* stdev);
-static char *sound_trigger_event_alloc(sound_model_handle_t handle,
- sound_trigger_sound_model_type_t model_type,
- struct sound_trigger_recognition_config *config) {
+static char *sound_trigger_keyphrase_event_alloc(sound_model_handle_t handle,
+ struct sound_trigger_recognition_config *config,
+ int recognition_status) {
char *data;
- if (model_type == SOUND_MODEL_TYPE_KEYPHRASE) {
- struct sound_trigger_phrase_recognition_event *event;
- data = (char *)calloc(1, sizeof(struct sound_trigger_phrase_recognition_event));
- if (!data)
- return NULL;
- event = (struct sound_trigger_phrase_recognition_event *)data;
- event->common.status = RECOGNITION_STATUS_SUCCESS;
- event->common.type = SOUND_MODEL_TYPE_KEYPHRASE;
- event->common.model = handle;
-
- if (config) {
- unsigned int i;
-
- event->num_phrases = config->num_phrases;
- if (event->num_phrases > SOUND_TRIGGER_MAX_PHRASES)
- event->num_phrases = SOUND_TRIGGER_MAX_PHRASES;
- for (i=0; i < event->num_phrases; i++)
- memcpy(&event->phrase_extras[i],
- &config->phrases[i],
- sizeof(struct sound_trigger_phrase_recognition_extra));
- }
-
- event->num_phrases = 1;
- event->phrase_extras[0].confidence_level = 100;
- event->phrase_extras[0].num_levels = 1;
- event->phrase_extras[0].levels[0].level = 100;
- event->phrase_extras[0].levels[0].user_id = 0;
- // Signify that all the data is comming through streaming, not through the buffer.
- event->common.capture_available = true;
- event->common.audio_config = AUDIO_CONFIG_INITIALIZER;
- event->common.audio_config.sample_rate = 16000;
- event->common.audio_config.channel_mask = AUDIO_CHANNEL_IN_MONO;
- event->common.audio_config.format = AUDIO_FORMAT_PCM_16_BIT;
- } else if (model_type == SOUND_MODEL_TYPE_GENERIC) {
- struct sound_trigger_generic_recognition_event *event;
- data = (char *)calloc(1, sizeof(struct sound_trigger_generic_recognition_event));
- if (!data)
- return NULL;
- event = (struct sound_trigger_generic_recognition_event *)data;
- event->common.status = RECOGNITION_STATUS_SUCCESS;
- event->common.type = SOUND_MODEL_TYPE_GENERIC;
- event->common.model = handle;
-
- // Signify that all the data is comming through streaming, not through the buffer.
- event->common.capture_available = true;
- event->common.audio_config = AUDIO_CONFIG_INITIALIZER;
- event->common.audio_config.sample_rate = 16000;
- event->common.audio_config.channel_mask = AUDIO_CHANNEL_IN_MONO;
- event->common.audio_config.format = AUDIO_FORMAT_PCM_16_BIT;
- } else {
- ALOGW("No Valid Event Type Known");
+ struct sound_trigger_phrase_recognition_event *event;
+ data = (char *)calloc(1, sizeof(struct sound_trigger_phrase_recognition_event));
+ if (!data)
return NULL;
+ event = (struct sound_trigger_phrase_recognition_event *)data;
+ event->common.status = recognition_status;
+ event->common.type = SOUND_MODEL_TYPE_KEYPHRASE;
+ event->common.model = handle;
+
+ if (config) {
+ unsigned int i;
+
+ event->num_phrases = config->num_phrases;
+ if (event->num_phrases > SOUND_TRIGGER_MAX_PHRASES)
+ event->num_phrases = SOUND_TRIGGER_MAX_PHRASES;
+ for (i=0; i < event->num_phrases; i++)
+ memcpy(&event->phrase_extras[i],
+ &config->phrases[i],
+ sizeof(struct sound_trigger_phrase_recognition_extra));
}
+
+ event->num_phrases = 1;
+ event->phrase_extras[0].confidence_level = 100;
+ event->phrase_extras[0].num_levels = 1;
+ event->phrase_extras[0].levels[0].level = 100;
+ event->phrase_extras[0].levels[0].user_id = 0;
+ // Signify that all the data is comming through streaming, not through the buffer.
+ event->common.capture_available = true;
+ event->common.audio_config = AUDIO_CONFIG_INITIALIZER;
+ event->common.audio_config.sample_rate = 16000;
+ event->common.audio_config.channel_mask = AUDIO_CHANNEL_IN_MONO;
+ event->common.audio_config.format = AUDIO_FORMAT_PCM_16_BIT;
return data;
}
-static void send_recognition_event(sound_model_handle_t model_handle,
- sound_trigger_sound_model_type_t model_type,
- recognition_callback_t recognition_callback, void *recognition_cookie,
- struct sound_trigger_recognition_config *config) {
- if (recognition_callback == NULL) {
- ALOGI("%s No matching callback for handle %d", __func__, model_handle);
+static char *sound_trigger_generic_event_alloc(sound_model_handle_t handle,
+ struct sound_trigger_recognition_config *config,
+ int recognition_status) {
+ char *data;
+ struct sound_trigger_generic_recognition_event *event;
+ data = (char *)calloc(1, sizeof(struct sound_trigger_generic_recognition_event));
+ if (!data)
+ return NULL;
+ event = (struct sound_trigger_generic_recognition_event *)data;
+ event->common.status = recognition_status;
+ event->common.type = SOUND_MODEL_TYPE_GENERIC;
+ event->common.model = handle;
+
+ // Signify that all the data is comming through streaming, not through the buffer.
+ event->common.capture_available = true;
+ event->common.audio_config = AUDIO_CONFIG_INITIALIZER;
+ event->common.audio_config.sample_rate = 16000;
+ event->common.audio_config.channel_mask = AUDIO_CHANNEL_IN_MONO;
+ event->common.audio_config.format = AUDIO_FORMAT_PCM_16_BIT;
+ return data;
+}
+
+void write_bad_command_error(int conn_socket, char* command) {
+ int num = snprintf(tmp_write_buffer, PARSE_BUF_LEN, "Bad command received: %s", command);
+ tmp_write_buffer[PARSE_BUF_LEN - 1] = '\0'; // Just to be sure.
+ tmp_write_buffer[PARSE_BUF_LEN - 2] = '\n';
+ write(conn_socket, tmp_write_buffer, num);
+}
+
+void write_string(int conn_socket, char* str) {
+ int num = snprintf(tmp_write_buffer, PARSE_BUF_LEN, "%s", str);
+ tmp_write_buffer[PARSE_BUF_LEN - 1] = '\0';
+ tmp_write_buffer[PARSE_BUF_LEN - 2] = '\n';
+ write(conn_socket, tmp_write_buffer, num);
+}
+
+void write_vastr(int conn_socket, char* format, ...) {
+ va_list argptr;
+ va_start(argptr, format);
+ int num = vsnprintf(tmp_write_buffer, PARSE_BUF_LEN, format, argptr);
+ va_end(argptr);
+ tmp_write_buffer[PARSE_BUF_LEN - 1] = '\0';
+ tmp_write_buffer[PARSE_BUF_LEN - 2] = '\n';
+ write(conn_socket, tmp_write_buffer, num);
+}
+
+void send_recognition_event(int conn_socket, char* buffer, struct stub_sound_trigger_device* stdev,
+ int recognition_status) {
+ ALOGI("%s", __func__);
+ char* model_handle_str = strtok(NULL, " ");
+ if (model_handle_str == NULL) {
+ write_string(conn_socket, "Bad sound model id.\n");
+ return;
+ }
+ int index = -1;
+ if (sscanf(model_handle_str, "%d", &index) <= 0) {
+ write_vastr(conn_socket, "Unable to parse sound model index: %s\n", model_handle_str);
return;
}
- if (model_type == SOUND_MODEL_TYPE_KEYPHRASE) {
- struct sound_trigger_phrase_recognition_event *event;
- event = (struct sound_trigger_phrase_recognition_event *)
- sound_trigger_event_alloc(model_handle, model_type, config);
- if (event) {
- recognition_callback(event, recognition_cookie);
- free(event);
+ if (index < (int)hw_properties.max_sound_models) {
+ ALOGI("Going to send trigger for model index #%d", index );
+ struct recognition_context *model_context = fetch_model_at_index(stdev, index);
+ if (model_context) {
+ if (model_context->recognition_callback == NULL) {
+ ALOGI("%s No matching callback for handle %d", __func__,
+ model_context->model_handle);
+ return;
+ }
+
+ if (model_context->model_type == SOUND_MODEL_TYPE_KEYPHRASE) {
+ struct sound_trigger_phrase_recognition_event *event;
+ event = (struct sound_trigger_phrase_recognition_event *)
+ sound_trigger_keyphrase_event_alloc(model_context->model_handle,
+ model_context->config,
+ recognition_status);
+ if (event) {
+ model_context->recognition_callback(event, model_context->recognition_cookie);
+ free(event);
+ }
+ } else if (model_context->model_type == SOUND_MODEL_TYPE_GENERIC) {
+ struct sound_trigger_generic_recognition_event *event;
+ event = (struct sound_trigger_generic_recognition_event *)
+ sound_trigger_generic_event_alloc(model_context->model_handle,
+ model_context->config,
+ recognition_status);
+ if (event) {
+ model_context->recognition_callback(event, model_context->recognition_cookie);
+ free(event);
+ }
+ } else {
+ ALOGI("Unknown Sound Model Type, No Event to Send");
+ }
+ } else {
+ ALOGI("Sound Model Does Not Exist at this Index: %d", index);
+ write_string(conn_socket, "Sound Model Does Not Exist at given Index.\n");
}
- } else if (model_type == SOUND_MODEL_TYPE_GENERIC) {
- struct sound_trigger_generic_recognition_event *event;
- event = (struct sound_trigger_generic_recognition_event *)
- sound_trigger_event_alloc(model_handle, model_type, config);
- if (event) {
- recognition_callback(event, recognition_cookie);
- free(event);
- }
- } else {
- ALOGI("Unknown Sound Model Type, No Event to Send");
}
}
@@ -335,30 +405,6 @@
return NULL;
}
-void write_bad_command_error(int conn_socket, char* command) {
- int num = snprintf(tmp_write_buffer, PARSE_BUF_LEN, "Bad command received: %s", command);
- tmp_write_buffer[PARSE_BUF_LEN - 1] = '\0'; // Just to be sure.
- tmp_write_buffer[PARSE_BUF_LEN - 2] = '\n';
- write(conn_socket, tmp_write_buffer, num);
-}
-
-void write_string(int conn_socket, char* str) {
- int num = snprintf(tmp_write_buffer, PARSE_BUF_LEN, "%s", str);
- tmp_write_buffer[PARSE_BUF_LEN - 1] = '\0';
- tmp_write_buffer[PARSE_BUF_LEN - 2] = '\n';
- write(conn_socket, tmp_write_buffer, num);
-}
-
-void write_vastr(int conn_socket, char* format, ...) {
- va_list argptr;
- va_start(argptr, format);
- int num = vsnprintf(tmp_write_buffer, PARSE_BUF_LEN, format, argptr);
- va_end(argptr);
- tmp_write_buffer[PARSE_BUF_LEN - 1] = '\0';
- tmp_write_buffer[PARSE_BUF_LEN - 2] = '\n';
- write(conn_socket, tmp_write_buffer, num);
-}
-
void list_models(int conn_socket, char* buffer,
struct stub_sound_trigger_device* stdev) {
ALOGI("%s", __func__);
@@ -394,55 +440,6 @@
}
}
-// Returns model at the given index, null otherwise (error, doesn't exist, etc).
-// Note that here index starts from zero.
-struct recognition_context* fetch_model_at_index(
- struct stub_sound_trigger_device* stdev, int index) {
- ALOGI("%s", __func__);
- struct recognition_context *model_context = NULL;
- struct recognition_context *last_model_context = stdev->root_model_context;
- unsigned int model_index = 0;
- while(last_model_context) {
- if (model_index == index) {
- model_context = last_model_context;
- break;
- }
- last_model_context = last_model_context->next;
- model_index++;
- }
- return model_context;
-}
-
-void send_trigger(int conn_socket, char* buffer,
- struct stub_sound_trigger_device* stdev) {
- ALOGI("%s", __func__);
- char* model_handle_str = strtok(NULL, " ");
- if (model_handle_str == NULL) {
- write_string(conn_socket, "Bad sound model id.\n");
- return;
- }
- int index = -1;
- if (sscanf(model_handle_str, "%d", &index) <= 0) {
- write_vastr(conn_socket, "Unable to parse sound model index: %s\n", model_handle_str);
- return;
- }
-
- if (index < (int)hw_properties.max_sound_models) {
- ALOGI("Going to send trigger for model index #%d", index );
- struct recognition_context *model_context = fetch_model_at_index(stdev, index);
- if (model_context) {
- send_recognition_event(model_context->model_handle,
- model_context->model_type,
- model_context->recognition_callback,
- model_context->recognition_cookie,
- model_context->config);
- } else {
- ALOGI("Sound Model Does Not Exist at this Index: %d", index);
- write_string(conn_socket, "Sound Model Does Not Exist at given Index.\n");
- }
- }
-}
-
void process_send_model_event(int conn_socket, char* buffer,
struct stub_sound_trigger_device* stdev) {
ALOGI("%s", __func__);
@@ -502,8 +499,12 @@
write_bad_command_error(conn_socket, command);
} else if (strncmp(command, COMMAND_LS, 2) == 0) {
list_models(conn_socket, buffer, stdev);
- } else if (strcmp(command, COMMAND_TRIGGER) == 0) {
- send_trigger(conn_socket, buffer, stdev);
+ } else if (strcmp(command, COMMAND_RECOGNITION_TRIGGER) == 0) {
+ send_recognition_event(conn_socket, buffer, stdev, RECOGNITION_STATUS_SUCCESS);
+ } else if (strcmp(command, COMMAND_RECOGNITION_ABORT) == 0) {
+ send_recognition_event(conn_socket, buffer, stdev, RECOGNITION_STATUS_ABORT);
+ } else if (strcmp(command, COMMAND_RECOGNITION_FAILURE) == 0) {
+ send_recognition_event(conn_socket, buffer, stdev, RECOGNITION_STATUS_FAILURE);
} else if (strcmp(command, COMMAND_UPDATE) == 0) {
process_send_model_event(conn_socket, buffer, stdev);
} else if (strncmp(command, COMMAND_CLOSE, 5) == 0) {