[Common/Android] add version info

1. add new function to get the NNStreamer version string.
2. get nnstreamer version string in Android method.
3. print log about version info when initializing the nnstreamer.

Signed-off-by: Jaeyun Jung <jy1210.jung@samsung.com>

diff --git a/api/android/api/src/main/java/org/nnsuite/nnstreamer/NNStreamer.java b/api/android/api/src/main/java/org/nnsuite/nnstreamer/NNStreamer.java
index 007db43..a9c81f3 100644 (file)
--- a/api/android/api/src/main/java/org/nnsuite/nnstreamer/NNStreamer.java
+++ b/api/android/api/src/main/java/org/nnsuite/nnstreamer/NNStreamer.java
@@ -126,7 +126,7 @@ public final class NNStreamer {
     }
 
     /**
-     * Gets the version string of GStreamer and NNStreamer.
+     * Gets the version string of NNStreamer.
      *
      * @return The version string
      */

diff --git a/api/android/api/src/main/jni/nnstreamer-native-api.c b/api/android/api/src/main/jni/nnstreamer-native-api.c
index 5688d78..8b1ea6e 100644 (file)
--- a/api/android/api/src/main/jni/nnstreamer-native-api.c
+++ b/api/android/api/src/main/jni/nnstreamer-native-api.c
@@ -611,6 +611,15 @@ nnstreamer_native_initialize (void)
 
   result = JNI_TRUE;
 
+  /* print version info */
+  gchar *gst_ver = gst_version_string ();
+  gchar *nns_ver = nnstreamer_version_string ();
+
+  nns_logi ("%s %s GLib %d.%d.%d", nns_ver, gst_ver, GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION);
+
+  g_free (gst_ver);
+  g_free (nns_ver);
+
 done:
   G_UNLOCK (nns_native_lock);
   return result;
@@ -643,19 +652,14 @@ Java_org_nnsuite_nnstreamer_NNStreamer_nativeCheckAvailability (JNIEnv * env, jc
 }
 
 /**
- * @brief Native method to get the version string of NNStreamer and GStreamer.
+ * @brief Native method to get the version string of NNStreamer.
  */
 jstring
 Java_org_nnsuite_nnstreamer_NNStreamer_nativeGetVersion (JNIEnv * env, jclass clazz)
 {
-  gchar *gst_ver = gst_version_string ();
-  gchar *version_str = g_strdup_printf ("NNStreamer %s, %s", VERSION, gst_ver);
-
-  jstring version = (*env)->NewStringUTF (env, version_str);
+  gchar *nns_ver = nnstreamer_version_string ();
+  jstring version = (*env)->NewStringUTF (env, nns_ver);
 
-  nns_logi ("%s, GLib %d.%d.%d", version_str, GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION);
-
-  g_free (gst_ver);
-  g_free (version_str);
+  g_free (nns_ver);
   return version;
 }

diff --git a/api/android/api/src/main/jni/nnstreamer-native.h b/api/android/api/src/main/jni/nnstreamer-native.h
index 0813060..3758455 100644 (file)
--- a/api/android/api/src/main/jni/nnstreamer-native.h
+++ b/api/android/api/src/main/jni/nnstreamer-native.h
@@ -32,6 +32,7 @@
 #include "nnstreamer.h"
 #include "nnstreamer-single.h"
 #include "nnstreamer-capi-private.h"
+#include "nnstreamer_plugin_api.h"
 #include "nnstreamer_plugin_api_filter.h"
 
 #define TAG "NNStreamer-native"

diff --git a/gst/nnstreamer/nnstreamer_plugin_api.h b/gst/nnstreamer/nnstreamer_plugin_api.h
index c92b30c..1095dc1 100644 (file)
--- a/gst/nnstreamer/nnstreamer_plugin_api.h
+++ b/gst/nnstreamer/nnstreamer_plugin_api.h
@@ -352,5 +352,12 @@ find_key_strv (const gchar ** strv, const gchar * key);
 extern gchar *
 replace_string (gchar * source, const gchar * what, const gchar * to, const gchar * delimiters, guint * count);
 
+/**
+ * @brief Get the version of NNStreamer.
+ * @return Newly allocated string. The returned string should be freed with g_free().
+ */
+extern gchar *
+nnstreamer_version_string (void);
+
 G_END_DECLS
 #endif /* __NNS_PLUGIN_API_H__ */

diff --git a/gst/nnstreamer/tensor_common.c b/gst/nnstreamer/tensor_common.c
index d81c3c8..b61952e 100644 (file)
--- a/gst/nnstreamer/tensor_common.c
+++ b/gst/nnstreamer/tensor_common.c
@@ -1457,3 +1457,16 @@ gst_tensor_time_sync_buffer_from_collectpad (GstCollectPads * collect,
   /* not eos */
   return FALSE;
 }
+
+/**
+ * @brief Get the version of NNStreamer.
+ * @return Newly allocated string. The returned string should be freed with g_free().
+ */
+gchar *
+nnstreamer_version_string (void)
+{
+  gchar *version;
+
+  version = g_strdup_printf ("NNStreamer %s", VERSION);
+  return version;
+}