From a773d3f4712de60f31bcd02077dbcf45dbb991f7 Mon Sep 17 00:00:00 2001 From: Jaeyun Jung Date: Wed, 3 Jan 2024 14:21:55 +0900 Subject: [PATCH] [Java] create extended tensor-info Create extended handle for max rank limit 16 in java native code. Signed-off-by: Jaeyun Jung --- java/android/nnstreamer/src/main/jni/nnstreamer-native-api.c | 2 +- java/android/nnstreamer/src/main/jni/nnstreamer-native-customfilter.c | 4 ++-- java/android/nnstreamer/src/main/jni/nnstreamer-native-pipeline.c | 2 +- java/android/nnstreamer/src/main/jni/nnstreamer-native-singleshot.c | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/java/android/nnstreamer/src/main/jni/nnstreamer-native-api.c b/java/android/nnstreamer/src/main/jni/nnstreamer-native-api.c index 64e7770..7ea7455 100644 --- a/java/android/nnstreamer/src/main/jni/nnstreamer-native-api.c +++ b/java/android/nnstreamer/src/main/jni/nnstreamer-native-api.c @@ -645,7 +645,7 @@ nns_parse_tensors_info (pipeline_info_s * pipe_info, JNIEnv * env, g_return_val_if_fail (obj_info, FALSE); g_return_val_if_fail (info_h, FALSE); - if (ml_tensors_info_create (info_h) != ML_ERROR_NONE) { + if (ml_tensors_info_create_extended (info_h) != ML_ERROR_NONE) { _ml_loge ("Failed to create handle for tensors info."); return FALSE; } diff --git a/java/android/nnstreamer/src/main/jni/nnstreamer-native-customfilter.c b/java/android/nnstreamer/src/main/jni/nnstreamer-native-customfilter.c index 8c0717c..031d5cd 100644 --- a/java/android/nnstreamer/src/main/jni/nnstreamer-native-customfilter.c +++ b/java/android/nnstreamer/src/main/jni/nnstreamer-native-customfilter.c @@ -166,8 +166,8 @@ nns_native_custom_initialize (JNIEnv * env, jobject thiz, jstring name, priv = g_new0 (customfilter_priv_data_s, 1); priv->mid_invoke = (*env)->GetMethodID (env, pipe_info->cls, "invoke", "(L" NNS_CLS_TDATA ";)L" NNS_CLS_TDATA ";"); - ml_tensors_info_create (&priv->in_info); - ml_tensors_info_create (&priv->out_info); + ml_tensors_info_create_extended (&priv->in_info); + ml_tensors_info_create_extended (&priv->out_info); nns_set_priv_data (pipe_info, priv, nns_customfilter_priv_free); diff --git a/java/android/nnstreamer/src/main/jni/nnstreamer-native-pipeline.c b/java/android/nnstreamer/src/main/jni/nnstreamer-native-pipeline.c index 7ef7b43..67b894f 100644 --- a/java/android/nnstreamer/src/main/jni/nnstreamer-native-pipeline.c +++ b/java/android/nnstreamer/src/main/jni/nnstreamer-native-pipeline.c @@ -112,7 +112,7 @@ nns_pipeline_sink_priv_set_out_info (element_data_s * item, JNIEnv * env, if ((priv = item->priv_data) == NULL) { priv = g_new0 (pipeline_sink_priv_data_s, 1); - ml_tensors_info_create (&priv->out_info); + ml_tensors_info_create_extended (&priv->out_info); item->priv_data = priv; item->priv_destroy_func = nns_pipeline_sink_priv_free; diff --git a/java/android/nnstreamer/src/main/jni/nnstreamer-native-singleshot.c b/java/android/nnstreamer/src/main/jni/nnstreamer-native-singleshot.c index f2c3b64..7dccb07 100644 --- a/java/android/nnstreamer/src/main/jni/nnstreamer-native-singleshot.c +++ b/java/android/nnstreamer/src/main/jni/nnstreamer-native-singleshot.c @@ -178,8 +178,8 @@ nns_native_single_open (JNIEnv * env, jobject thiz, /* set private date */ priv = g_new0 (singleshot_priv_data_s, 1); - ml_tensors_info_create (&priv->in_info); - ml_tensors_info_create (&priv->out_info); + ml_tensors_info_create_extended (&priv->in_info); + ml_tensors_info_create_extended (&priv->out_info); nns_set_priv_data (pipe_info, priv, nns_singleshot_priv_free); if (!nns_singleshot_priv_set_info (pipe_info, env)) { -- 2.7.4