diff --git a/girs/GstAnalytics-1.0.gir b/girs/GstAnalytics-1.0.gir index 571d6441d5..0e7e1e8a1c 100644 --- a/girs/GstAnalytics-1.0.gir +++ b/girs/GstAnalytics-1.0.gir @@ -34,7 +34,7 @@ identified by @id is stored. Instance handle - + Quark of the class @@ -53,7 +53,7 @@ Get index of class represented by @quark Instance handle Get number of classes - + @@ -67,7 +67,7 @@ Get number of classes instance handle - + Object class index @@ -84,7 +84,7 @@ Get number of classes Instance handle - + index of the class @@ -143,7 +143,7 @@ identified by @id is stored. Instance of #GstAnalyticsMtd - + @@ -157,7 +157,7 @@ identified by @id is stored. Instance of #GstAnalyticsMtd Get analysis result type. - + @@ -171,7 +171,7 @@ Get analysis result type. Instance of #GstAnalyticsMtd - + @@ -252,7 +252,7 @@ identified by @id is stored. instance - + Confidence on object location @@ -270,7 +270,7 @@ identified by @id is stored. instance - + x component of upper-left corner of the object location @@ -304,7 +304,7 @@ identified by @id is stored. Instance handle - + @@ -517,7 +517,7 @@ between @an_meta_first_id and @an_meta_second_id. a #GstAnalyticsRelationMeta describing analysis-meta relation - + First analysis-meta @@ -649,7 +649,7 @@ otherwise this method return FALSE and @rlt is invalid. Instance of GstAnalyticsRelationMeta - + Id of GstAnalyticsMtd instance to retrieve @@ -693,7 +693,7 @@ Ids (@an_meta_first_id and @an_meta_second_id) must be from a call to a #GstAnalyticsRelationMeta - + Id of first analysis-meta @@ -828,7 +828,7 @@ identified by @id is stored. Instance of tracking metadata - + Updated tracking id @@ -1005,7 +1005,7 @@ information about the tracking, for example, it can be used alongside a Instance of #GstAnalyticsRelationMeta - + diff --git a/subprojects/gst-plugins-bad/gst-libs/gst/analytics/gstanalyticsclassificationmtd.c b/subprojects/gst-plugins-bad/gst-libs/gst/analytics/gstanalyticsclassificationmtd.c index 17f2356c46..2a98dd516f 100644 --- a/subprojects/gst-plugins-bad/gst-libs/gst/analytics/gstanalyticsclassificationmtd.c +++ b/subprojects/gst-plugins-bad/gst-libs/gst/analytics/gstanalyticsclassificationmtd.c @@ -95,7 +95,7 @@ gst_analytics_cls_mtd_get_mtd_type (void) * Since: 1.24 */ gfloat -gst_analytics_cls_mtd_get_level (GstAnalyticsClsMtd * handle, gsize index) +gst_analytics_cls_mtd_get_level (const GstAnalyticsClsMtd * handle, gsize index) { g_return_val_if_fail (handle, -1.0); g_return_val_if_fail (handle->meta != NULL, -1.0); @@ -118,7 +118,7 @@ gst_analytics_cls_mtd_get_level (GstAnalyticsClsMtd * handle, gsize index) * Since: 1.24 */ gint -gst_analytics_cls_mtd_get_index_by_quark (GstAnalyticsClsMtd * handle, +gst_analytics_cls_mtd_get_index_by_quark (const GstAnalyticsClsMtd * handle, GQuark quark) { g_return_val_if_fail (handle, -1); @@ -145,7 +145,7 @@ gst_analytics_cls_mtd_get_index_by_quark (GstAnalyticsClsMtd * handle, * Since: 1.24 */ gsize -gst_analytics_cls_mtd_get_length (GstAnalyticsClsMtd * handle) +gst_analytics_cls_mtd_get_length (const GstAnalyticsClsMtd * handle) { GstAnalyticsClsMtdData *cls_mtd_data; cls_mtd_data = gst_analytics_relation_meta_get_mtd_data (handle->meta, @@ -164,7 +164,7 @@ gst_analytics_cls_mtd_get_length (GstAnalyticsClsMtd * handle) * Since: 1.24 */ GQuark -gst_analytics_cls_mtd_get_quark (GstAnalyticsClsMtd * handle, gsize index) +gst_analytics_cls_mtd_get_quark (const GstAnalyticsClsMtd * handle, gsize index) { GstAnalyticsClsMtdData *cls_mtd_data; g_return_val_if_fail (handle, 0); diff --git a/subprojects/gst-plugins-bad/gst-libs/gst/analytics/gstanalyticsclassificationmtd.h b/subprojects/gst-plugins-bad/gst-libs/gst/analytics/gstanalyticsclassificationmtd.h index 1665df9e4a..fbad6a0029 100644 --- a/subprojects/gst-plugins-bad/gst-libs/gst/analytics/gstanalyticsclassificationmtd.h +++ b/subprojects/gst-plugins-bad/gst-libs/gst/analytics/gstanalyticsclassificationmtd.h @@ -27,7 +27,6 @@ #include G_BEGIN_DECLS - /** * GstAnalyticsClsMtd: * @id: Instance identifier. @@ -45,18 +44,18 @@ GST_ANALYTICS_META_API GstAnalyticsMtdType gst_analytics_cls_mtd_get_mtd_type (void); GST_ANALYTICS_META_API -gfloat gst_analytics_cls_mtd_get_level (GstAnalyticsClsMtd * handle, +gfloat gst_analytics_cls_mtd_get_level (const GstAnalyticsClsMtd * handle, gsize index); GST_ANALYTICS_META_API -gint gst_analytics_cls_mtd_get_index_by_quark (GstAnalyticsClsMtd * handle, - GQuark quark); +gint gst_analytics_cls_mtd_get_index_by_quark (const GstAnalyticsClsMtd * + handle, GQuark quark); GST_ANALYTICS_META_API -gsize gst_analytics_cls_mtd_get_length (GstAnalyticsClsMtd * handle); +gsize gst_analytics_cls_mtd_get_length (const GstAnalyticsClsMtd * handle); GST_ANALYTICS_META_API -GQuark gst_analytics_cls_mtd_get_quark (GstAnalyticsClsMtd * handle, +GQuark gst_analytics_cls_mtd_get_quark (const GstAnalyticsClsMtd * handle, gsize index); GST_ANALYTICS_META_API diff --git a/subprojects/gst-plugins-bad/gst-libs/gst/analytics/gstanalyticsmeta.c b/subprojects/gst-plugins-bad/gst-libs/gst/analytics/gstanalyticsmeta.c index 64fc0176f2..328acdbcc8 100644 --- a/subprojects/gst-plugins-bad/gst-libs/gst/analytics/gstanalyticsmeta.c +++ b/subprojects/gst-plugins-bad/gst-libs/gst/analytics/gstanalyticsmeta.c @@ -113,8 +113,8 @@ gst_analytics_relation_meta_get_next_id (GstAnalyticsRelationMeta * meta); static GstAnalyticsRelatableMtdData * -gst_analytics_relation_meta_get_mtd_data_internal (GstAnalyticsRelationMeta * - meta, guint an_meta_id) +gst_analytics_relation_meta_get_mtd_data_internal (const + GstAnalyticsRelationMeta * meta, guint an_meta_id) { GstAnalyticsRelatableMtdData *rv; g_return_val_if_fail (meta, NULL); @@ -137,7 +137,7 @@ gst_analytics_relation_meta_get_mtd_data_internal (GstAnalyticsRelationMeta * * Since: 1.24 */ GstAnalyticsMtdType -gst_analytics_mtd_get_mtd_type (GstAnalyticsMtd * instance) +gst_analytics_mtd_get_mtd_type (const GstAnalyticsMtd * instance) { GstAnalyticsRelatableMtdData *rlt; @@ -159,7 +159,7 @@ gst_analytics_mtd_get_mtd_type (GstAnalyticsMtd * instance) * Since: 1.24 */ guint -gst_analytics_mtd_get_id (GstAnalyticsMtd * instance) +gst_analytics_mtd_get_id (const GstAnalyticsMtd * instance) { return instance->id; } @@ -174,7 +174,7 @@ gst_analytics_mtd_get_id (GstAnalyticsMtd * instance) * Since: 1.24 */ gsize -gst_analytics_mtd_get_size (GstAnalyticsMtd * instance) +gst_analytics_mtd_get_size (const GstAnalyticsMtd * instance) { GstAnalyticsRelatableMtdData *rlt; @@ -222,7 +222,7 @@ gst_analytics_mtd_type_get_name (GstAnalyticsMtdType type) * Since: 1.24 */ gsize -gst_analytics_relation_get_length (GstAnalyticsRelationMeta * instance) +gst_analytics_relation_get_length (const GstAnalyticsRelationMeta * instance) { gsize rv; g_return_val_if_fail (instance, 0); @@ -583,7 +583,7 @@ gst_analytics_relation_meta_get_next_id (GstAnalyticsRelationMeta * meta) * Since: 1.24 */ GstAnalyticsRelTypes -gst_analytics_relation_meta_get_relation (GstAnalyticsRelationMeta * meta, +gst_analytics_relation_meta_get_relation (const GstAnalyticsRelationMeta * meta, guint an_meta_first_id, guint an_meta_second_id) { GstAnalyticsRelTypes types = GST_ANALYTICS_REL_TYPE_NONE; @@ -675,7 +675,7 @@ gst_analytics_relation_meta_set_relation (GstAnalyticsRelationMeta * meta, * Since: 1.24 */ gboolean -gst_analytics_relation_meta_exist (GstAnalyticsRelationMeta * rmeta, +gst_analytics_relation_meta_exist (const GstAnalyticsRelationMeta * rmeta, guint an_meta_first_id, guint an_meta_second_id, gint max_relation_span, @@ -999,7 +999,7 @@ gst_analytics_relation_meta_get_mtd (GstAnalyticsRelationMeta * meta, * Since: 1.24 */ gpointer -gst_analytics_relation_meta_get_mtd_data (GstAnalyticsRelationMeta * +gst_analytics_relation_meta_get_mtd_data (const GstAnalyticsRelationMeta * meta, guint an_meta_id) { GstAnalyticsRelatableMtdData *rv = diff --git a/subprojects/gst-plugins-bad/gst-libs/gst/analytics/gstanalyticsmeta.h b/subprojects/gst-plugins-bad/gst-libs/gst/analytics/gstanalyticsmeta.h index 3d9957fe9f..86bc74cfce 100644 --- a/subprojects/gst-plugins-bad/gst-libs/gst/analytics/gstanalyticsmeta.h +++ b/subprojects/gst-plugins-bad/gst-libs/gst/analytics/gstanalyticsmeta.h @@ -30,7 +30,6 @@ #include G_BEGIN_DECLS - /** * GST_INF_RELATION_SPAN: * @@ -112,31 +111,33 @@ struct _GstAnalyticsMtd * Since: 1.24 */ -typedef struct { +typedef struct +{ const char *name; - gboolean (*mtd_meta_transform) (GstBuffer *transbuf, GstAnalyticsMtd *transmtd, - GstBuffer *buffer, GQuark type, - gpointer data); +gboolean (*mtd_meta_transform) (GstBuffer * transbuf, + GstAnalyticsMtd * transmtd, GstBuffer * buffer, GQuark type, + gpointer data); - /*< private >*/ + /*< private > */ gpointer _reserved[GST_PADDING_LARGE]; } GstAnalyticsMtdImpl; GST_ANALYTICS_META_API -GstAnalyticsMtdType gst_analytics_mtd_get_mtd_type (GstAnalyticsMtd * instance); +GstAnalyticsMtdType gst_analytics_mtd_get_mtd_type (const GstAnalyticsMtd * + instance); GST_ANALYTICS_META_API -guint gst_analytics_mtd_get_id (GstAnalyticsMtd * instance); +guint gst_analytics_mtd_get_id (const GstAnalyticsMtd * instance); GST_ANALYTICS_META_API -gsize gst_analytics_mtd_get_size (GstAnalyticsMtd * instance); +gsize gst_analytics_mtd_get_size (const GstAnalyticsMtd * instance); GST_ANALYTICS_META_API const gchar *gst_analytics_mtd_type_get_name (GstAnalyticsMtdType type); typedef struct _GstAnalyticsRelationMetaInitParams - GstAnalyticsRelationMetaInitParams; +GstAnalyticsRelationMetaInitParams; /** * GST_ANALYTICS_RELATION_META_API_TYPE: @@ -202,13 +203,12 @@ const GstMetaInfo *gst_analytics_relation_meta_get_info (void); GST_ANALYTICS_META_API gsize -gst_analytics_relation_get_length (GstAnalyticsRelationMeta * - instance); +gst_analytics_relation_get_length (const GstAnalyticsRelationMeta * instance); GST_ANALYTICS_META_API GstAnalyticsRelTypes -gst_analytics_relation_meta_get_relation (GstAnalyticsRelationMeta * meta, - guint an_meta_first_id, guint an_meta_second_id); +gst_analytics_relation_meta_get_relation (const GstAnalyticsRelationMeta * meta, +guint an_meta_first_id, guint an_meta_second_id); GST_ANALYTICS_META_API gboolean @@ -218,7 +218,7 @@ gst_analytics_relation_meta_set_relation (GstAnalyticsRelationMeta GST_ANALYTICS_META_API gboolean -gst_analytics_relation_meta_exist (GstAnalyticsRelationMeta * +gst_analytics_relation_meta_exist (const GstAnalyticsRelationMeta * rmeta, guint an_meta_first_id, guint an_meta_second_id, gint max_relation_span, GstAnalyticsRelTypes cond_types, GArray ** relations_path); @@ -248,19 +248,19 @@ gst_analytics_relation_meta_get_mtd (GstAnalyticsRelationMeta * GST_ANALYTICS_META_API gpointer -gst_analytics_relation_meta_get_mtd_data (GstAnalyticsRelationMeta * meta, +gst_analytics_relation_meta_get_mtd_data (const GstAnalyticsRelationMeta * meta, guint an_meta_id); GST_ANALYTICS_META_API gboolean gst_analytics_relation_meta_iterate (GstAnalyticsRelationMeta * meta, gpointer * state, GstAnalyticsMtdType type, - GstAnalyticsMtd * rlt_mtd); +GstAnalyticsMtd * rlt_mtd); GST_ANALYTICS_META_API gboolean -gst_analytics_relation_meta_get_direct_related (GstAnalyticsRelationMeta * meta, - guint an_meta_id, GstAnalyticsRelTypes relation_type, +gst_analytics_relation_meta_get_direct_related (GstAnalyticsRelationMeta * + meta, guint an_meta_id, GstAnalyticsRelTypes relation_type, GstAnalyticsMtdType type, gpointer * state, GstAnalyticsMtd * rlt_mtd); G_END_DECLS diff --git a/subprojects/gst-plugins-bad/gst-libs/gst/analytics/gstanalyticsobjectdetectionmtd.c b/subprojects/gst-plugins-bad/gst-libs/gst/analytics/gstanalyticsobjectdetectionmtd.c index 29f607d881..fff207c144 100644 --- a/subprojects/gst-plugins-bad/gst-libs/gst/analytics/gstanalyticsobjectdetectionmtd.c +++ b/subprojects/gst-plugins-bad/gst-libs/gst/analytics/gstanalyticsobjectdetectionmtd.c @@ -135,7 +135,7 @@ gst_analytics_od_mtd_get_mtd_type (void) * Since: 1.24 */ gboolean -gst_analytics_od_mtd_get_location (GstAnalyticsODMtd * instance, +gst_analytics_od_mtd_get_location (const GstAnalyticsODMtd * instance, gint * x, gint * y, gint * w, gint * h, gfloat * loc_conf_lvl) { GstAnalyticsODMtdData *data; @@ -168,7 +168,7 @@ gst_analytics_od_mtd_get_location (GstAnalyticsODMtd * instance, * Since: 1.24 */ gboolean -gst_analytics_od_mtd_get_confidence_lvl (GstAnalyticsODMtd * instance, +gst_analytics_od_mtd_get_confidence_lvl (const GstAnalyticsODMtd * instance, gfloat * loc_conf_lvl) { GstAnalyticsODMtdData *data; @@ -194,7 +194,7 @@ gst_analytics_od_mtd_get_confidence_lvl (GstAnalyticsODMtd * instance, * Since: 1.24 */ GQuark -gst_analytics_od_mtd_get_obj_type (GstAnalyticsODMtd * handle) +gst_analytics_od_mtd_get_obj_type (const GstAnalyticsODMtd * handle) { GstAnalyticsODMtdData *data; g_return_val_if_fail (handle != NULL, 0); diff --git a/subprojects/gst-plugins-bad/gst-libs/gst/analytics/gstanalyticsobjectdetectionmtd.h b/subprojects/gst-plugins-bad/gst-libs/gst/analytics/gstanalyticsobjectdetectionmtd.h index 54df6a018b..f5b146f590 100644 --- a/subprojects/gst-plugins-bad/gst-libs/gst/analytics/gstanalyticsobjectdetectionmtd.h +++ b/subprojects/gst-plugins-bad/gst-libs/gst/analytics/gstanalyticsobjectdetectionmtd.h @@ -31,7 +31,6 @@ #include G_BEGIN_DECLS - /** * GstAnalyticsODMtd: * @id: Instance identifier. @@ -49,20 +48,20 @@ GST_ANALYTICS_META_API GstAnalyticsMtdType gst_analytics_od_mtd_get_mtd_type (void); GST_ANALYTICS_META_API -gboolean gst_analytics_od_mtd_get_location (GstAnalyticsODMtd * instance, - gint * x, gint * y, gint * w, gint * h, gfloat * loc_conf_lvl); +gboolean gst_analytics_od_mtd_get_location (const GstAnalyticsODMtd * + instance, gint * x, gint * y, gint * w, gint * h, gfloat * loc_conf_lvl); GST_ANALYTICS_META_API -gboolean gst_analytics_od_mtd_get_confidence_lvl (GstAnalyticsODMtd * instance, - gfloat * loc_conf_lvl); +gboolean gst_analytics_od_mtd_get_confidence_lvl (const GstAnalyticsODMtd * + instance, gfloat * loc_conf_lvl); GST_ANALYTICS_META_API -GQuark gst_analytics_od_mtd_get_obj_type (GstAnalyticsODMtd * handle); +GQuark gst_analytics_od_mtd_get_obj_type (const GstAnalyticsODMtd * handle); GST_ANALYTICS_META_API -gboolean gst_analytics_relation_meta_add_od_mtd ( - GstAnalyticsRelationMeta * instance, GQuark type, gint x, gint y, - gint w, gint h, gfloat loc_conf_lvl, GstAnalyticsODMtd * od_mtd); +gboolean gst_analytics_relation_meta_add_od_mtd (GstAnalyticsRelationMeta * + instance, GQuark type, gint x, gint y, gint w, gint h, gfloat loc_conf_lvl, + GstAnalyticsODMtd * od_mtd); GST_ANALYTICS_META_API gboolean diff --git a/subprojects/gst-plugins-bad/gst-libs/gst/analytics/gstanalyticsobjecttrackingmtd.c b/subprojects/gst-plugins-bad/gst-libs/gst/analytics/gstanalyticsobjecttrackingmtd.c index 68c69d2304..bff572be58 100644 --- a/subprojects/gst-plugins-bad/gst-libs/gst/analytics/gstanalyticsobjecttrackingmtd.c +++ b/subprojects/gst-plugins-bad/gst-libs/gst/analytics/gstanalyticsobjecttrackingmtd.c @@ -138,7 +138,7 @@ gst_analytics_tracking_mtd_set_lost (GstAnalyticsTrackingMtd * instance) * Since: 1.24 */ gboolean -gst_analytics_tracking_mtd_get_info (GstAnalyticsTrackingMtd * instance, +gst_analytics_tracking_mtd_get_info (const GstAnalyticsTrackingMtd * instance, guint64 * tracking_id, GstClockTime * tracking_first_seen, GstClockTime * tracking_last_seen, gboolean * tracking_lost) { diff --git a/subprojects/gst-plugins-bad/gst-libs/gst/analytics/gstanalyticsobjecttrackingmtd.h b/subprojects/gst-plugins-bad/gst-libs/gst/analytics/gstanalyticsobjecttrackingmtd.h index f081fe038f..8f52cb6897 100644 --- a/subprojects/gst-plugins-bad/gst-libs/gst/analytics/gstanalyticsobjecttrackingmtd.h +++ b/subprojects/gst-plugins-bad/gst-libs/gst/analytics/gstanalyticsobjecttrackingmtd.h @@ -31,7 +31,6 @@ #include G_BEGIN_DECLS - /** * GstAnalyticsTrackMtd: * @id: Instance identifier. @@ -49,21 +48,24 @@ GST_ANALYTICS_META_API GstAnalyticsMtdType gst_analytics_tracking_mtd_get_mtd_type (void); GST_ANALYTICS_META_API -gboolean gst_analytics_tracking_mtd_update_last_seen (GstAnalyticsTrackingMtd * instance, +gboolean +gst_analytics_tracking_mtd_update_last_seen (GstAnalyticsTrackingMtd * instance, GstClockTime last_seen); GST_ANALYTICS_META_API -gboolean gst_analytics_tracking_mtd_set_lost (GstAnalyticsTrackingMtd * instance); +gboolean gst_analytics_tracking_mtd_set_lost (GstAnalyticsTrackingMtd * + instance); GST_ANALYTICS_META_API -gboolean gst_analytics_tracking_mtd_get_info (GstAnalyticsTrackingMtd * instance, - guint64 * tracking_id, GstClockTime * tracking_first_seen, GstClockTime * - tracking_last_seen, gboolean * tracking_lost); +gboolean gst_analytics_tracking_mtd_get_info (const GstAnalyticsTrackingMtd + * instance, guint64 * tracking_id, GstClockTime * tracking_first_seen, + GstClockTime * tracking_last_seen, gboolean * tracking_lost); GST_ANALYTICS_META_API -gboolean gst_analytics_relation_meta_add_tracking_mtd ( - GstAnalyticsRelationMeta * instance, guint64 tracking_id, - GstClockTime tracking_first_seen, GstAnalyticsTrackingMtd * trk_mtd); +gboolean +gst_analytics_relation_meta_add_tracking_mtd (GstAnalyticsRelationMeta * + instance, guint64 tracking_id, GstClockTime tracking_first_seen, + GstAnalyticsTrackingMtd * trk_mtd); GST_ANALYTICS_META_API gboolean