[Android] replace app data path

jaeyun-jung · jaeyun-jung · commit 7f8530c294f8 · 2025-05-16T14:10:57.000+09:00
Add internal function to replace app data path for android.

Signed-off-by: Jaeyun Jung &lt;jy1210.jung@samsung.com&gt;
diff --git a/c/src/ml-api-common.c b/c/src/ml-api-common.c
@@ -1169,6 +1169,28 @@ _ml_replace_string (gchar * source, const gchar * what, const gchar * to,
   return result;
 }
 
+/**
+ * @brief Converts predefined entity.
+ */
+gchar *
+_ml_convert_predefined_entity (const gchar * str)
+{
+  gchar *converted = g_strdup (str);
+
+#if defined(__ANDROID__)
+  {
+    extern const char *nnstreamer_native_get_data_path (void);
+
+    const char *data_path = nnstreamer_native_get_data_path ();
+
+    converted = _ml_replace_string (converted, "@APP_DATA_PATH@", data_path,
+        NULL, NULL);
+  }
+#endif
+
+  return converted;
+}
+
 /**
  * @brief error reporting infra
  */
diff --git a/c/src/ml-api-inference-pipeline.c b/c/src/ml-api-inference-pipeline.c
@@ -614,8 +614,8 @@ cleanup_resource (gpointer data)
  * @brief Converts predefined element in pipeline description.
  */
 static int
-convert_element (ml_pipeline_h pipe, const gchar * description, gchar ** result,
-    gboolean is_internal)
+convert_description (ml_pipeline_h pipe, const gchar * description,
+    gchar ** result, gboolean is_internal)
 {
   gchar *converted;
   int status = ML_ERROR_NONE;
@@ -626,7 +626,7 @@ convert_element (ml_pipeline_h pipe, const gchar * description, gchar ** result,
   /* init null */
   *result = NULL;
 
-  converted = g_strdup (description);
+  converted = _ml_convert_predefined_entity (description);
 
   /* convert pre-defined element for Tizen */
   status = convert_tizen_element (pipe, &converted, is_internal);
@@ -1020,12 +1020,11 @@ construct_pipeline_internal (const char *pipeline_description,
   create_internal_hash (pipe_h);
 
   /* convert predefined element and launch the pipeline */
-  status =
-      convert_element ((ml_pipeline_h) pipe_h, pipeline_description,
+  status = convert_description ((ml_pipeline_h) pipe_h, pipeline_description,
       &description, is_internal);
   if (status != ML_ERROR_NONE) {
     _ml_error_report_continue
-        ("ml_pipeline_construct error: failed while converting pipeline description for GStreamer w/ convert_element() function, which has returned %d",
+        ("ml_pipeline_construct error: failed while converting pipeline description for GStreamer w/ convert_description() function, which has returned %d",
         status);
     goto failed;
   }
diff --git a/c/src/ml-api-inference-single.c b/c/src/ml-api-inference-single.c
@@ -944,6 +944,7 @@ ml_single_open_custom (ml_single_h * single, ml_single_preset * info)
   ml_nnfw_type_e nnfw;
   ml_nnfw_hw_e hw;
   const gchar *fw_name;
+  g_autofree gchar *converted_models = NULL;
   gchar **list_models;
   guint i, num_models;
   char *hw_name;
@@ -963,11 +964,12 @@ ml_single_open_custom (ml_single_h * single, ml_single_preset * info)
   nnfw = info->nnfw;
   hw = info->hw;
   fw_name = _ml_get_nnfw_subplugin_name (nnfw);
+  converted_models = _ml_convert_predefined_entity (info->models);
 
   /**
    * 1. Determine nnfw and validate model file
    */
-  list_models = g_strsplit (info->models, ",", -1);
+  list_models = g_strsplit (converted_models, ",", -1);
   num_models = g_strv_length (list_models);
   for (i = 0; i < num_models; i++)
     g_strstrip (list_models[i]);
@@ -1069,7 +1071,7 @@ ml_single_open_custom (ml_single_h * single, ml_single_preset * info)
   }
   hw_name = _ml_nnfw_to_str_prop (hw);
   g_object_set (filter_obj, "framework", fw_name, "accelerator", hw_name,
-      "model", info->models, NULL);
+      "model", converted_models, NULL);
   g_free (hw_name);
 
   if (info->custom_option) {
diff --git a/c/src/ml-api-internal.h b/c/src/ml-api-internal.h
@@ -275,6 +275,13 @@ int _ml_tensors_data_clone_no_alloc (const ml_tensors_data_s * data_src, ml_tens
  */
 gchar * _ml_replace_string (gchar * source, const gchar * what, const gchar * to, const gchar * delimiters, guint * count);
 
+/**
+ * @brief Converts predefined entity.
+ * @param[in] str The input string.
+ * @return Newly allocated string. The returned string should be freed with g_free().
+ */
+gchar * _ml_convert_predefined_entity (const gchar * str);
+
 /**
  * @brief Compares the given tensors information.
  * @details If the function returns an error, @a equal is not changed.
diff --git a/c/src/ml-api-service-agent-client.c b/c/src/ml-api-service-agent-client.c
@@ -429,6 +429,7 @@ ml_service_model_register (const char *name, const char *path,
 {
   int ret = ML_ERROR_NONE;
   g_autofree gchar *app_info = NULL;
+  g_autofree gchar *converted = NULL;
 
   check_feature_state (ML_FEATURE_SERVICE);
 
@@ -443,13 +444,14 @@ ml_service_model_register (const char *name, const char *path,
   }
   *version = 0U;
 
-  ret = _ml_service_check_path (path);
+  converted = _ml_convert_predefined_entity (path);
+  ret = _ml_service_check_path (converted);
   if (ret != ML_ERROR_NONE)
     return ret;
 
   app_info = _get_app_info ();
 
-  ret = ml_agent_model_register (name, path, activate,
+  ret = ml_agent_model_register (name, converted, activate,
       description ? description : "", app_info ? app_info : "", version);
   if (ret < 0) {
     _ml_error_report ("Failed to invoke the method model_register.");
@@ -675,6 +677,7 @@ ml_service_resource_add (const char *name, const char *path,
 {
   int ret = ML_ERROR_NONE;
   g_autofree gchar *app_info = NULL;
+  g_autofree gchar *converted = NULL;
 
   check_feature_state (ML_FEATURE_SERVICE);
 
@@ -683,13 +686,14 @@ ml_service_resource_add (const char *name, const char *path,
         "The parameter, 'name' is NULL. It should be a valid string.");
   }
 
-  ret = _ml_service_check_path (path);
+  converted = _ml_convert_predefined_entity (path);
+  ret = _ml_service_check_path (converted);
   if (ret != ML_ERROR_NONE)
     return ret;
 
   app_info = _get_app_info ();
 
-  ret = ml_agent_resource_add (name, path, description ? description : "",
+  ret = ml_agent_resource_add (name, converted, description ? description : "",
       app_info ? app_info : "");
   if (ret < 0) {
     _ml_error_report ("Failed to invoke the method resource_add.");
diff --git a/c/src/ml-api-service.c b/c/src/ml-api-service.c
@@ -306,6 +306,7 @@ ml_service_new (const char *config, ml_service_h * handle)
   ml_service_s *mls;
   ml_service_type_e service_type = ML_SERVICE_TYPE_UNKNOWN;
   g_autofree gchar *json_string = NULL;
+  g_autofree gchar *contents = NULL;
   g_autoptr (JsonParser) parser = NULL;
   g_autoptr (GError) err = NULL;
   JsonNode *root;
@@ -328,11 +329,13 @@ ml_service_new (const char *config, ml_service_h * handle)
         "The parameter, config, is invalid. It should be a valid path.");
   }
 
-  if (!g_file_get_contents (config, &json_string, NULL, NULL)) {
+  if (!g_file_get_contents (config, &contents, NULL, NULL)) {
     _ml_error_report_return (ML_ERROR_IO_ERROR,
         "Failed to read configuration file '%s'.", config);
   }
 
+  json_string = _ml_convert_predefined_entity (contents);
+
   parser = json_parser_new ();
   if (!parser) {
     _ml_error_report_return (ML_ERROR_OUT_OF_MEMORY,
