Merge branch 'release-0.2.0' into main

Author: jafet-chaves

README.md

@@ -26,7 +26,38 @@ DESTDIR=$PSDKR_PATH/targetfs ninja install
 meson build --prefix=/usr -Dpkg_config_path=pkgconfig
 ninja -C build
 ninja -C build test
-sudo ninja -C build install
+ninja -C build install
+ldconfig
+```
+You can delete the GStreamer registry cache if the new elements are not found
+using gst-inspect and build a new one
+
+```bash
+rm -rf ~/.cache/gstreamer-1.0/registry.aarch64.bin
+gst-inspect-1.0
+```
+
+## Compiling the Project Natively inside the PSDK RTOS Docker container
+```bash
+#Build Docker container
+cd /opt/edge_ai_apps/docker
+./docker_build.sh
+./docker_run.sh
+cd /opt/edge_ai_apps
+./docker_run.sh
+
+#Build the GStreamer plugin
+PKG_CONFIG_SYSROOT_DIR=/host PKG_CONFIG_LIBDIR=/host/usr/lib/pkgconfig/ meson build --prefix=/host/usr -Dpkg_config_path=pkgconfig
+ninja -C build
+ninja -C build install
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/host/usr/lib/edgeai-tiovx-modules/:/host/usr/lib/aarch64-linux-gnu # This will also be needed before running the element in another terminal for example
+ldconfig
+
+# Since ninja will install these to the host you'll also need to call the following command before running a pipeline. "/host/usr/lib/aarch64-linux-gnu/gstreamer-1.0/" is not a standard GStreamer installation path
+export GST_PLUGIN_PATH=$GST_PLUGIN_PATH:/host/usr/lib/aarch64-linux-gnu/gstreamer-1.0/
+
+#Test plugin is loaded correctly
+gst-inspect-1.0 tiovx
 ```
 
 # GStreamer elements

ext/tiovx/gsttiovx.c

@@ -66,6 +66,9 @@
 #include <gst/gst.h>
 
 #include "gsttiovxcolorconvert.h"
+#include "gsttiovxdlcolorblend.h"
+#include "gsttiovxdlpreproc.h"
+#include "gsttiovxmosaic.h"
 #include "gsttiovxmultiscaler.h"
 
 /* entry point to initialize the plug-in
@@ -75,17 +78,46 @@
 static gboolean
 ti_ovx_init (GstPlugin * plugin)
 {
-  gboolean ret = TRUE;
+  gboolean ret = FALSE;
 
   ret = gst_element_register (plugin, "tiovxcolorconvert", GST_RANK_NONE,
       GST_TYPE_GST_TIOVX_COLOR_CONVERT);
   if (!ret) {
-    GST_ERROR ("Failed to register the tiovx-colorconvert element");
+    GST_ERROR ("Failed to register the tiovxcolorconvert element");
+    goto out;
+  }
+
+  ret = gst_element_register (plugin, "tiovxdlcolorblend", GST_RANK_NONE,
+      GST_TYPE_GST_TIOVX_DL_COLOR_BLEND);
+  if (!ret) {
+    GST_ERROR ("Failed to register the tiovxdlcolorblend element");
+    goto out;
+  }
+
+  ret = gst_element_register (plugin, "tiovxdlpreproc", GST_RANK_NONE,
+      GST_TYPE_GST_TIOVX_DL_PRE_PROC);
+  if (!ret) {
+    GST_ERROR ("Failed to register the tiovxdlpreproc element");
+    goto out;
   }
 
   ret = gst_element_register (plugin, "tiovxmultiscaler", GST_RANK_NONE,
       GST_TYPE_GST_TIOVX_MULTI_SCALER);
+  if (!ret) {
+    GST_ERROR ("Failed to register the tiovxmultiscaler element");
+    goto out;
+  }
+
+  ret = gst_element_register (plugin, "tiovxmosaic", GST_RANK_NONE,
+      GST_TYPE_GST_TIOVX_MOSAIC);
+  if (!ret) {
+    GST_ERROR ("Failed to register the tiovxmosaic element");
+    goto out;
+  }
+
+  ret = TRUE;
 
+out:
   return ret;
 }
 

ext/tiovx/gsttiovxcolorconvert.c

@@ -69,7 +69,10 @@
 #include "gst-libs/gst/tiovx/gsttiovxsiso.h"
 #include "gst-libs/gst/tiovx/gsttiovxutils.h"
 
-#include "app_color_convert_module.h"
+#include "tiovx_color_convert_module.h"
+
+#define COLORCONVERT_INPUT_PARAM_INDEX 0
+#define COLORCONVERT_OUTPUT_PARAM_INDEX 1
 
 /* Target definition */
 #define GST_TYPE_TIOVX_COLOR_CONVERT_TARGET (gst_tiovx_color_convert_target_get_type())
@@ -81,7 +84,7 @@ gst_tiovx_color_convert_target_get_type (void)
   static const GEnumValue targets[] = {
     {TIVX_CPU_ID_DSP1, "DSP instance 1, assigned to C66_0 core",
         TIVX_TARGET_DSP1},
-    {TIVX_CPU_ID_DSP2, "DSP instance 1, assigned to C66_1 core",
+    {TIVX_CPU_ID_DSP2, "DSP instance 2, assigned to C66_1 core",
         TIVX_TARGET_DSP2},
     {0, NULL, NULL},
   };
@@ -141,7 +144,7 @@ struct _GstTIOVXColorconvert
 {
   GstTIOVXSiso element;
   gint target_id;
-  ColorConvertObj obj;
+  TIOVXColorConvertModuleObj obj;
 };
 
 GST_DEBUG_CATEGORY_STATIC (gst_tiovx_color_convert_debug);
@@ -161,14 +164,18 @@ static GstCaps *gst_tiovx_color_convert_transform_caps (GstBaseTransform *
     base, GstPadDirection direction, GstCaps * caps, GstCaps * filter);
 
 static gboolean gst_tiovx_color_convert_init_module (GstTIOVXSiso * trans,
-    vx_context context, GstVideoInfo * in_info, GstVideoInfo * out_info,
+    vx_context context, GstCaps * in_caps, GstCaps * out_caps,
     guint num_channels);
 static gboolean gst_tiovx_color_convert_create_graph (GstTIOVXSiso * trans,
     vx_context context, vx_graph graph);
 static gboolean gst_tiovx_color_convert_get_node_info (GstTIOVXSiso * trans,
-    vx_reference ** input, vx_reference ** output, vx_node * node);
+    vx_reference ** input, vx_reference ** output, vx_node * node,
+    guint * input_param_index, guint * output_param_index);
 static gboolean gst_tiovx_color_convert_release_buffer (GstTIOVXSiso * trans);
-static gboolean gst_tiovx_color_convert_deinit_module (GstTIOVXSiso * trans);
+static gboolean gst_tiovx_color_convert_deinit_module (GstTIOVXSiso * trans,
+    vx_context context);
+static gboolean gst_tiovx_color_convert_compare_caps (GstTIOVXSiso * trans,
+    GstCaps * caps1, GstCaps * caps2, GstPadDirection direction);
 
 static const gchar *target_id_to_target_name (gint target_id);
 
@@ -223,6 +230,8 @@ gst_tiovx_color_convert_class_init (GstTIOVXColorconvertClass * klass)
       GST_DEBUG_FUNCPTR (gst_tiovx_color_convert_release_buffer);
   gsttiovxsiso_class->deinit_module =
       GST_DEBUG_FUNCPTR (gst_tiovx_color_convert_deinit_module);
+  gsttiovxsiso_class->compare_caps =
+      GST_DEBUG_FUNCPTR (gst_tiovx_color_convert_compare_caps);
 
   GST_DEBUG_CATEGORY_INIT (gst_tiovx_color_convert_debug,
       "tiovxcolorconvert", 0, "TIOVX ColorConvert element");
@@ -479,42 +488,55 @@ gst_tiovx_color_convert_transform_caps (GstBaseTransform * base,
 
 static gboolean
 gst_tiovx_color_convert_init_module (GstTIOVXSiso * trans, vx_context context,
-    GstVideoInfo * in_info, GstVideoInfo * out_info, guint num_channels)
+    GstCaps * in_caps, GstCaps * out_caps, guint num_channels)
 {
   GstTIOVXColorconvert *self = NULL;
   vx_status status = VX_SUCCESS;
-  ColorConvertObj *colorconvert = NULL;
+  TIOVXColorConvertModuleObj *colorconvert = NULL;
+  GstVideoInfo in_info;
+  GstVideoInfo out_info;
 
   g_return_val_if_fail (trans, FALSE);
   g_return_val_if_fail (VX_SUCCESS == vxGetStatus ((vx_reference) context),
       FALSE);
-  g_return_val_if_fail (in_info, FALSE);
-  g_return_val_if_fail (out_info, FALSE);
+  g_return_val_if_fail (in_caps, FALSE);
+  g_return_val_if_fail (out_caps, FALSE);
   g_return_val_if_fail (num_channels >= MIN_NUM_CHANNELS, FALSE);
   g_return_val_if_fail (num_channels <= MAX_NUM_CHANNELS, FALSE);
 
   self = GST_TIOVX_COLOR_CONVERT (trans);
 
   GST_INFO_OBJECT (self, "Init module");
 
-  /* Configure ColorConvertObj */
+  if (!gst_video_info_from_caps (&in_info, in_caps)) {
+    GST_ERROR_OBJECT (self, "Failed to get video info from input caps");
+    return FALSE;
+  }
+  if (!gst_video_info_from_caps (&out_info, out_caps)) {
+    GST_ERROR_OBJECT (self, "Failed to get video info from output caps");
+    return FALSE;
+  }
+
+  /* Configure TIOVXColorConvertModuleObj */
   colorconvert = &self->obj;
-  colorconvert->num_ch = DEFAULT_NUM_CHANNELS;
+  colorconvert->num_channels = DEFAULT_NUM_CHANNELS;
   colorconvert->input.bufq_depth = num_channels;
   colorconvert->output.bufq_depth = num_channels;
 
   colorconvert->input.graph_parameter_index = INPUT_PARAMETER_INDEX;
   colorconvert->output.graph_parameter_index = OUTPUT_PARAMETER_INDEX;
 
   colorconvert->input.color_format =
-      gst_format_to_vx_format (in_info->finfo->format);
+      gst_format_to_vx_format (in_info.finfo->format);
   colorconvert->output.color_format =
-      gst_format_to_vx_format (out_info->finfo->format);
+      gst_format_to_vx_format (out_info.finfo->format);
+
+  colorconvert->width = GST_VIDEO_INFO_WIDTH (&in_info);
+  colorconvert->height = GST_VIDEO_INFO_HEIGHT (&in_info);
 
-  colorconvert->width = GST_VIDEO_INFO_WIDTH (in_info);
-  colorconvert->height = GST_VIDEO_INFO_HEIGHT (in_info);
+  colorconvert->en_out_image_write = 0;
 
-  status = app_init_color_convert (context, colorconvert);
+  status = tiovx_color_convert_module_init (context, colorconvert);
   if (VX_SUCCESS != status) {
     GST_ERROR_OBJECT (self, "Module init failed with error: %d", status);
     return FALSE;
@@ -546,13 +568,13 @@ gst_tiovx_color_convert_create_graph (GstTIOVXSiso * trans, vx_context context,
   GST_OBJECT_UNLOCK (GST_OBJECT (self));
 
   if (!target) {
+    GST_ERROR_OBJECT (self, "TIOVX target selection failed");
     g_return_val_if_reached (FALSE);
   }
 
   GST_INFO_OBJECT (self, "TIOVX Target to use: %s", target);
 
-  status =
-      app_create_graph_color_convert (context, graph, &self->obj, NULL, target);
+  status = tiovx_color_convert_module_create (graph, &self->obj, NULL, target);
   if (VX_SUCCESS != status) {
     GST_ERROR_OBJECT (self, "Create graph failed with error: %d", status);
     return FALSE;
@@ -573,7 +595,7 @@ gst_tiovx_color_convert_release_buffer (GstTIOVXSiso * trans)
 
   GST_INFO_OBJECT (self, "Release buffer");
 
-  status = app_release_buffer_color_convert (&self->obj);
+  status = tiovx_color_convert_module_release_buffers (&self->obj);
   if (VX_SUCCESS != status) {
     GST_ERROR_OBJECT (self, "Release buffer failed with error: %d", status);
     return FALSE;
@@ -583,7 +605,7 @@ gst_tiovx_color_convert_release_buffer (GstTIOVXSiso * trans)
 }
 
 static gboolean
-gst_tiovx_color_convert_deinit_module (GstTIOVXSiso * trans)
+gst_tiovx_color_convert_deinit_module (GstTIOVXSiso * trans, vx_context context)
 {
   GstTIOVXColorconvert *self = NULL;
   vx_status status = VX_SUCCESS;
@@ -594,13 +616,13 @@ gst_tiovx_color_convert_deinit_module (GstTIOVXSiso * trans)
 
   GST_INFO_OBJECT (self, "Deinit module");
 
-  status = app_delete_color_convert (&self->obj);
+  status = tiovx_color_convert_module_delete (&self->obj);
   if (VX_SUCCESS != status) {
     GST_ERROR_OBJECT (self, "Module delete failed with error: %d", status);
     return FALSE;
   }
 
-  status = app_deinit_color_convert (&self->obj);
+  status = tiovx_color_convert_module_deinit (&self->obj);
   if (VX_SUCCESS != status) {
     GST_ERROR_OBJECT (self, "Module deinit failed with error: %d", status);
     return FALSE;
@@ -611,7 +633,8 @@ gst_tiovx_color_convert_deinit_module (GstTIOVXSiso * trans)
 
 static gboolean
 gst_tiovx_color_convert_get_node_info (GstTIOVXSiso * trans,
-    vx_reference ** input, vx_reference ** output, vx_node * node)
+    vx_reference ** input, vx_reference ** output, vx_node * node,
+    guint * input_param_index, guint * output_param_index)
 {
   GstTIOVXColorconvert *self = NULL;
 
@@ -631,6 +654,9 @@ gst_tiovx_color_convert_get_node_info (GstTIOVXSiso * trans,
   *input = (vx_reference *) & self->obj.input.image_handle[0];
   *output = (vx_reference *) & self->obj.output.image_handle[0];
 
+  *input_param_index = COLORCONVERT_INPUT_PARAM_INDEX;
+  *output_param_index = COLORCONVERT_OUTPUT_PARAM_INDEX;
+
   return TRUE;
 }
 
@@ -650,3 +676,38 @@ target_id_to_target_name (gint target_id)
 
   return value_nick;
 }
+
+static gboolean
+gst_tiovx_color_convert_compare_caps (GstTIOVXSiso * trans, GstCaps * caps1,
+    GstCaps * caps2, GstPadDirection direction)
+{
+  GstVideoInfo video_info1;
+  GstVideoInfo video_info2;
+  gboolean ret = FALSE;
+
+  g_return_val_if_fail (caps1, FALSE);
+  g_return_val_if_fail (caps2, FALSE);
+  g_return_val_if_fail (GST_PAD_UNKNOWN != direction, FALSE);
+
+  if (!gst_video_info_from_caps (&video_info1, caps1)) {
+    GST_ERROR_OBJECT (trans, "Failed to get info from caps: %"
+        GST_PTR_FORMAT, caps1);
+    goto out;
+  }
+
+  if (!gst_video_info_from_caps (&video_info2, caps2)) {
+    GST_ERROR_OBJECT (trans, "Failed to get info from caps: %"
+        GST_PTR_FORMAT, caps2);
+    goto out;
+  }
+
+  if ((video_info1.width == video_info2.width) &&
+      (video_info1.height == video_info2.height) &&
+      (video_info1.finfo->format == video_info2.finfo->format)
+      ) {
+    ret = TRUE;
+  }
+
+out:
+  return ret;
+}

ext/tiovx/gsttiovxcolorconvert.h

@@ -72,7 +72,7 @@ G_BEGIN_DECLS
 
 /**
  * GST_IS_TIOVX_COLOR_CONVERT:
- * @ptr: pointer to check if its a TIOVX color convert
+ * @ptr: pointer to check if it's a TIOVX color convert
  * 
  * Checks if a pointer is a TIOVX color convert
  *