summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Laurent <elaurent@google.com>2014-08-05 19:53:48 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-08-05 00:34:22 +0000
commitba3c1a972e113f3bdf1c76a26e89505c39c981d3 (patch)
tree9880c249de5dffa6c09811b8affb4cbb5a7dad5b
parent6ca86fbe169726ef38d9fad23f190009520a7d9c (diff)
parent83cd830918b17fc50a8ca1cfba2d4d59bfbcf59b (diff)
downloadlibhardware-ba3c1a972e113f3bdf1c76a26e89505c39c981d3.tar.gz
Merge "sound_trigger HAL update" into lmp-dev
-rw-r--r--modules/soundtrigger/sound_trigger_hw.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/soundtrigger/sound_trigger_hw.c b/modules/soundtrigger/sound_trigger_hw.c
index b78a0d18..e7f9baf7 100644
--- a/modules/soundtrigger/sound_trigger_hw.c
+++ b/modules/soundtrigger/sound_trigger_hw.c
@@ -38,6 +38,7 @@ static const struct sound_trigger_properties hw_properties = {
false, // capture_transition
0, // max_buffer_ms
false, // concurrent_capture
+ false, // trigger_in_event
0 // power_consumption_mw
};
@@ -51,7 +52,6 @@ struct stub_sound_trigger_device {
pthread_t callback_thread;
pthread_mutex_t lock;
pthread_cond_t cond;
-
};
@@ -78,9 +78,9 @@ static void *callback_thread_loop(void *context)
event->common.status = RECOGNITION_STATUS_SUCCESS;
event->common.type = SOUND_MODEL_TYPE_KEYPHRASE;
event->common.model = stdev->model_handle;
- event->key_phrase_in_capture = false;
event->num_phrases = 1;
event->phrase_extras[0].recognition_modes = RECOGNITION_MODE_VOICE_TRIGGER;
+ 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;