Revert "Revert "Adding getModelState API to sound trigger""
This reverts commit 81f71f1c27b7e877babe1f3293ac00256a66980c.
Reason for revert: rolling forward with fix
Change-Id: Ifc0c53581ac567cb968d91993f453220f8253aec
diff --git a/core/jni/android_hardware_SoundTrigger.cpp b/core/jni/android_hardware_SoundTrigger.cpp
index 9dbb8d7..bbc63fc 100644
--- a/core/jni/android_hardware_SoundTrigger.cpp
+++ b/core/jni/android_hardware_SoundTrigger.cpp
@@ -788,6 +788,63 @@
return status;
}
+static jobject
+android_hardware_SoundTrigger_getModelState(JNIEnv *env, jobject thiz,
+ jint jHandle)
+{
+ ALOGV("getModelState");
+ sp<SoundTrigger> module = getSoundTrigger(env, thiz);
+ if (module == NULL) {
+ return NULL;
+ }
+ sp<IMemory> memory;
+ jint status = module->getModelState(jHandle, memory);
+ if (status != 0 || memory == NULL) {
+ ALOGW("getModelState, failed to get model state, status: %d", status);
+ return NULL;
+ }
+ struct sound_trigger_recognition_event* event =
+ (struct sound_trigger_recognition_event *)memory->pointer();
+ if (event == NULL) {
+ return NULL;
+ }
+ if (event->type != SOUND_MODEL_TYPE_GENERIC) {
+ ALOGW("getModelState, unsupported model type: %d", event->type);
+ return NULL;
+ }
+
+ jbyteArray jData = NULL;
+ if (event->data_size) {
+ jData = env->NewByteArray(event->data_size);
+ jbyte *nData = env->GetByteArrayElements(jData, NULL);
+ memcpy(nData, (char *)event + event->data_offset, event->data_size);
+ env->ReleaseByteArrayElements(jData, nData, 0);
+ }
+
+ jobject jAudioFormat = NULL;
+ if (event->trigger_in_data || event->capture_available) {
+ jAudioFormat = env->NewObject(gAudioFormatClass,
+ gAudioFormatCstor,
+ audioFormatFromNative(event->audio_config.format),
+ event->audio_config.sample_rate,
+ inChannelMaskFromNative(event->audio_config.channel_mask));
+
+ }
+ jobject jEvent = NULL;
+ jEvent = env->NewObject(gGenericRecognitionEventClass, gGenericRecognitionEventCstor,
+ event->status, event->model, event->capture_available,
+ event->capture_session, event->capture_delay_ms,
+ event->capture_preamble_ms, event->trigger_in_data,
+ jAudioFormat, jData);
+ if (jAudioFormat != NULL) {
+ env->DeleteLocalRef(jAudioFormat);
+ }
+ if (jData != NULL) {
+ env->DeleteLocalRef(jData);
+ }
+ return jEvent;
+}
+
static const JNINativeMethod gMethods[] = {
{"listModules",
"(Ljava/util/ArrayList;)I",
@@ -817,6 +874,9 @@
{"stopRecognition",
"(I)I",
(void *)android_hardware_SoundTrigger_stopRecognition},
+ {"getModelState",
+ "(I)Landroid/hardware/soundtrigger/SoundTrigger$RecognitionEvent;",
+ (void *)android_hardware_SoundTrigger_getModelState},
};
int register_android_hardware_SoundTrigger(JNIEnv *env)