Release v2024.3.0

Author: nszczygl9

CMakeLists.txt

@@ -19,9 +19,9 @@ if (NOT CMAKE_BUILD_TYPE)
 endif()
 
 # Define version
-set(VERSION_MAJOR 2)
-set(VERSION_MINOR 2)
-set(VERSION_PATCH 2)
+set(VERSION_MAJOR 3)
+set(VERSION_MINOR 0)
+set(VERSION_PATCH 0)
 
 if (NOT DEFINED GIT_INFO OR "${GIT_INFO}" STREQUAL "")
     set(GIT_INFO "0")

include/dlstreamer/gst/metadata/gstanalyticskeypointsmtd.h

@@ -8,37 +8,65 @@
 #define __GST_ANALYTICS_KEYPOINTS_MTD__
 
 #include <gst/analytics/analytics-meta-prelude.h>
+#include <gst/analytics/gstanalyticsclassificationmtd.h>
 #include <gst/analytics/gstanalyticsmeta.h>
 #include <gst/gst.h>
 
 G_BEGIN_DECLS
+
 /**
- * GstAnalyticsKeypointsMtd:
+ * GstAnalyticsKeypointMtd:
  * @id: Instance identifier.
  * @meta: Instance of #GstAnalyticsRelationMeta where the analysis-metadata
  * identified by @id is stored.
  *
- * Handle containing data required to use gst_analytics_keypoints_mtd APIs.
+ * Handle to #GstAnalyticsKeypoint data structure.
  * This type is generally expected to be allocated on the stack.
  *
  * Since: 1.26
  */
-typedef struct _GstAnalyticsMtd GstAnalyticsKeypointsMtd;
+typedef struct _GstAnalyticsMtd GstAnalyticsKeypointMtd;
 
 /**
- * GstAnalyticsKeypointDimensions:
- * @GST_ANALYTICS_KEYPOINT_DIMENSIONS_2D: keypoints in 2D space with (x,y) coordinates.
- * @GST_ANALYTICS_KEYPOINT_DIMENSIONS_3D: keypoints in 3D space with (x,y,z) coordinates.
- *
- * Enum value describing supported keypoint dimension.
+ * GstAnalyticsKeypoint:
+ * @x: zero-based absolute x pixel coordinate of a keypoint relative to image upper-left corner.
+ * @y: zero-based absolute y pixel coordinate of a keypoint relative to image upper-left corner.
+ * @z: normalized depth coordinate of a keypoint, relative to keypoint group center (use 0.0f for 2D keypoints).
+ * @v: visibility of a kepoint, normalized <0.0f - not visible, 1.0f - fully visible>.
  * */
-typedef enum {
-    GST_ANALYTICS_KEYPOINT_DIMENSIONS_2D = 2,
-    GST_ANALYTICS_KEYPOINT_DIMENSIONS_3D = 3,
-} GstAnalyticsKeypointDimensions;
+typedef struct {
+    guint x;
+    guint y;
+    gfloat z;
+    gfloat v;
+} GstAnalyticsKeypoint;
+
+GST_ANALYTICS_META_API
+GstAnalyticsMtdType gst_analytics_keypoint_mtd_get_mtd_type(void);
+
+GST_ANALYTICS_META_API
+gboolean gst_analytics_keypoint_mtd_get(const GstAnalyticsKeypointMtd *handle, GstAnalyticsKeypoint *keypoint);
+
+GST_ANALYTICS_META_API
+gboolean gst_analytics_relation_meta_add_keypoint_mtd(GstAnalyticsRelationMeta *instance,
+                                                      const GstAnalyticsKeypoint *keypoint,
+                                                      GstAnalyticsKeypointMtd *keypoint_mtd);
 
 /**
- * GstKeypointPair:
+ * GstAnalyticsKeypointSkeletonMtd:
+ * @id: Instance identifier.
+ * @meta: Instance of #GstAnalyticsRelationMeta where the analysis-metadata
+ * identified by @id is stored.
+ *
+ * Handle containing data required to use gst_analytics_keypoint_skeleton_mtd APIs.
+ * This type is generally expected to be allocated on the stack.
+ *
+ * Since: 1.26
+ */
+typedef struct _GstAnalyticsMtd GstAnalyticsKeypointSkeletonMtd;
+
+/**
+ * GstAnalyticsKeypointPair:
  * @kp1: index of the first keypoint in a skeleton link.
  * @kp2: index of the second keypoint in a skeleton link.
  *
@@ -47,41 +75,58 @@ typedef enum {
 typedef struct {
     guint kp1;
     guint kp2;
-} GstKeypointPair;
+} GstAnalyticsKeypointPair;
 
 GST_ANALYTICS_META_API
-GstAnalyticsMtdType gst_analytics_keypoints_mtd_get_mtd_type(void);
+GstAnalyticsMtdType gst_analytics_keypoint_skeleton_mtd_get_mtd_type(void);
 
 GST_ANALYTICS_META_API
-gsize gst_analytics_keypoints_mtd_get_count(const GstAnalyticsKeypointsMtd *handle);
+gsize gst_analytics_keypoint_skeleton_mtd_get_count(const GstAnalyticsKeypointSkeletonMtd *handle);
 
 GST_ANALYTICS_META_API
-GstAnalyticsKeypointDimensions gst_analytics_keypoints_mtd_get_dimension(const GstAnalyticsKeypointsMtd *handle);
+gboolean gst_analytics_keypoint_skeleton_mtd_get(const GstAnalyticsKeypointSkeletonMtd *handle,
+                                                 GstAnalyticsKeypointPair *segment, gsize index);
 
 GST_ANALYTICS_META_API
-gsize gst_analytics_keypoints_mtd_get_confidence_count(const GstAnalyticsKeypointsMtd *handle);
+gboolean gst_analytics_relation_meta_add_keypoint_skeleton_mtd(GstAnalyticsRelationMeta *instance,
+                                                               const gsize skeleton_count,
+                                                               const GstAnalyticsKeypointPair *skeletons,
+                                                               GstAnalyticsKeypointSkeletonMtd *keypoint_skeleton_mtd);
+
+/**
+ * GstAnalyticsKeypointGroupMtd:
+ * @id: Instance identifier.
+ * @meta: Instance of #GstAnalyticsRelationMeta where the analysis-metadata
+ * identified by @id is stored.
+ *
+ * Handle containing data required to use gst_analytics_keypointgroup_mtd APIs.
+ * This type is generally expected to be allocated on the stack.
+ *
+ * Since: 1.26
+ */
+typedef struct _GstAnalyticsMtd GstAnalyticsKeypointGroupMtd;
 
 GST_ANALYTICS_META_API
-gsize gst_analytics_keypoints_mtd_get_skeleton_count(const GstAnalyticsKeypointsMtd *handle);
+GstAnalyticsMtdType gst_analytics_keypointgroup_mtd_get_mtd_type(void);
 
 GST_ANALYTICS_META_API
-gboolean gst_analytics_keypoints_mtd_get_position(const GstAnalyticsKeypointsMtd *handle, gfloat *position,
-                                                  gsize index);
+gsize gst_analytics_keypointgroup_mtd_get_count(const GstAnalyticsKeypointGroupMtd *handle);
 
 GST_ANALYTICS_META_API
-gboolean gst_analytics_keypoints_mtd_get_confidence(const GstAnalyticsKeypointsMtd *handle, gfloat *confidence,
-                                                    gsize index);
+gboolean gst_analytics_keypointgroup_mtd_get_keypoint_mtd(const GstAnalyticsKeypointGroupMtd *handle,
+                                                          GstAnalyticsKeypointMtd *keypoint_mtd, gsize index);
 
 GST_ANALYTICS_META_API
-gboolean gst_analytics_keypoints_mtd_get_skeleton(const GstAnalyticsKeypointsMtd *handle, GstKeypointPair *skeleton,
-                                                  gsize index);
+gboolean gst_analytics_relation_meta_add_keypointgroup_mtd(GstAnalyticsRelationMeta *instance,
+                                                           const gsize keypoint_count,
+                                                           const GstAnalyticsKeypointMtd *keypoints,
+                                                           GstAnalyticsKeypointGroupMtd *keypoints_mtd);
 
 GST_ANALYTICS_META_API
-gboolean gst_analytics_relation_meta_add_keypoints_mtd(GstAnalyticsRelationMeta *instance, const gsize keypoint_count,
-                                                       const GstAnalyticsKeypointDimensions keypoint_dimensions,
-                                                       const gfloat *positions, const gfloat *confidences,
-                                                       const gsize skeleton_count, const GstKeypointPair *skeletons,
-                                                       GstAnalyticsKeypointsMtd *keypoint_mtd);
+gboolean gst_analytics_relation_meta_set_keypointgroup_relations(GstAnalyticsRelationMeta *instance,
+                                                                 GstAnalyticsKeypointGroupMtd *keypoint_group,
+                                                                 GstAnalyticsClsMtd *keypoint_names,
+                                                                 GstAnalyticsKeypointSkeletonMtd *keypoint_skeleton);
 
 G_END_DECLS
-#endif // __GST_ANALYTICS_KEYPOINTS_MTD__
+#endif // __gst_analytics_keypointgroup_MTD__