diff --git a/docs/user-guide/elements/g3dinference.md b/docs/user-guide/elements/g3dinference.md index 849b7d3c1..d860841c5 100644 --- a/docs/user-guide/elements/g3dinference.md +++ b/docs/user-guide/elements/g3dinference.md @@ -93,7 +93,7 @@ The element operates in-place. It keeps the point cloud payload intact and appen - `lidar_point_count` - `frame_id` - `stream_id` -- `exit_lidarparse_timestamp` +- `exit_source_timestamp` ### Output metadata diff --git a/include/dlstreamer/gst/metadata/g3d_lidar_meta.h b/include/dlstreamer/gst/metadata/g3d_lidar_meta.h index 156ba98e1..0899787cb 100644 --- a/include/dlstreamer/gst/metadata/g3d_lidar_meta.h +++ b/include/dlstreamer/gst/metadata/g3d_lidar_meta.h @@ -17,7 +17,7 @@ typedef struct _LidarMeta { GstMeta meta; guint lidar_point_count; /* Number of points in this frame. Each point occupies 4 floats (x, y, z, intensity). */ size_t frame_id; /* Sequential frame identifier from the source stream. */ - GstClockTime exit_lidarparse_timestamp; /* Timestamp (GStreamer clock time) when this buffer exits g3dlidarparse. */ + GstClockTime exit_source_timestamp; /* Timestamp (GStreamer clock time) when this buffer exits g3dlidarparse. */ GstClockTime exit_g3dinference_timestamp; /* Timestamp (GStreamer clock time) when this buffer exits g3dinference. */ guint stream_id; /* Stream identifier (group-id from STREAM_START) for multi-stream pipelines. */ @@ -30,7 +30,7 @@ DLS_EXPORT const GstMetaInfo *lidar_meta_get_info(void); #define LIDAR_META_INFO (lidar_meta_get_info()) DLS_EXPORT LidarMeta *add_lidar_meta(GstBuffer *buffer, guint lidar_point_count, size_t frame_id, - GstClockTime exit_lidarparse_timestamp, guint stream_id); + GstClockTime exit_source_timestamp, guint stream_id); G_END_DECLS diff --git a/src/gst/metadata/g3d_lidar_meta.c b/src/gst/metadata/g3d_lidar_meta.c index e44f035ae..9340117a1 100644 --- a/src/gst/metadata/g3d_lidar_meta.c +++ b/src/gst/metadata/g3d_lidar_meta.c @@ -24,7 +24,7 @@ static gboolean lidar_meta_init(GstMeta *meta, gpointer params, GstBuffer *buffe LidarMeta *lidar_meta = (LidarMeta *)meta; lidar_meta->lidar_point_count = 0; lidar_meta->frame_id = 0; - lidar_meta->exit_lidarparse_timestamp = GST_CLOCK_TIME_NONE; + lidar_meta->exit_source_timestamp = GST_CLOCK_TIME_NONE; lidar_meta->exit_g3dinference_timestamp = GST_CLOCK_TIME_NONE; lidar_meta->stream_id = 0; return TRUE; @@ -48,7 +48,7 @@ DLS_EXPORT const GstMetaInfo *lidar_meta_get_info(void) { } DLS_EXPORT LidarMeta *add_lidar_meta(GstBuffer *buffer, guint lidar_point_count, size_t frame_id, - GstClockTime exit_lidarparse_timestamp, guint stream_id) { + GstClockTime exit_source_timestamp, guint stream_id) { if (!buffer) { GST_WARNING("Cannot add meta to NULL buffer"); return NULL; @@ -56,7 +56,7 @@ DLS_EXPORT LidarMeta *add_lidar_meta(GstBuffer *buffer, guint lidar_point_count, GST_DEBUG( "Adding LidarMeta to buffer with lidar_point_count=%u frame_id=%zu stream_id=%u exit_ts=%" GST_TIME_FORMAT, - lidar_point_count, frame_id, stream_id, GST_TIME_ARGS(exit_lidarparse_timestamp)); + lidar_point_count, frame_id, stream_id, GST_TIME_ARGS(exit_source_timestamp)); LidarMeta *meta = (LidarMeta *)gst_buffer_add_meta(buffer, LIDAR_META_INFO, NULL); if (!meta) { @@ -66,12 +66,12 @@ DLS_EXPORT LidarMeta *add_lidar_meta(GstBuffer *buffer, guint lidar_point_count, meta->lidar_point_count = lidar_point_count; meta->frame_id = frame_id; - meta->exit_lidarparse_timestamp = exit_lidarparse_timestamp; + meta->exit_source_timestamp = exit_source_timestamp; meta->stream_id = stream_id; GST_DEBUG( "LidarMeta added successfully: lidar_point_count=%u, frame_id=%zu, stream_id=%u, exit_ts=%" GST_TIME_FORMAT, - meta->lidar_point_count, meta->frame_id, meta->stream_id, GST_TIME_ARGS(meta->exit_lidarparse_timestamp)); + meta->lidar_point_count, meta->frame_id, meta->stream_id, GST_TIME_ARGS(meta->exit_source_timestamp)); return meta; } \ No newline at end of file diff --git a/src/monolithic/gst/3d_elements/g3dlidarparse/g3dlidarparse.cpp b/src/monolithic/gst/3d_elements/g3dlidarparse/g3dlidarparse.cpp index 670c6e08d..0f4d03913 100644 --- a/src/monolithic/gst/3d_elements/g3dlidarparse/g3dlidarparse.cpp +++ b/src/monolithic/gst/3d_elements/g3dlidarparse/g3dlidarparse.cpp @@ -412,21 +412,19 @@ static GstFlowReturn gst_g3d_lidar_parse_transform(GstBaseTransform *trans, GstB } gst_buffer_remove_all_memory(outbuf); - GstClockTime exit_lidarparse_timestamp = GST_CLOCK_TIME_NONE; + GstClockTime exit_source_timestamp = GST_CLOCK_TIME_NONE; if (GstClock *clock = gst_element_get_clock(GST_ELEMENT(filter))) { - exit_lidarparse_timestamp = gst_clock_get_time(clock); - GST_DEBUG_OBJECT(filter, "exit_ts from element clock: %" GST_TIME_FORMAT, - GST_TIME_ARGS(exit_lidarparse_timestamp)); + exit_source_timestamp = gst_clock_get_time(clock); + GST_DEBUG_OBJECT(filter, "exit_ts from element clock: %" GST_TIME_FORMAT, GST_TIME_ARGS(exit_source_timestamp)); gst_object_unref(clock); } else { - exit_lidarparse_timestamp = gst_util_get_timestamp(); + exit_source_timestamp = gst_util_get_timestamp(); GST_DEBUG_OBJECT(filter, "exit_ts from gst_util_get_timestamp: %" GST_TIME_FORMAT, - GST_TIME_ARGS(exit_lidarparse_timestamp)); + GST_TIME_ARGS(exit_source_timestamp)); } GST_DEBUG_OBJECT(filter, "Add meta frame_id=%zu stream_id=%u exit_ts=%" GST_TIME_FORMAT " n_points=%zu stride=%d", - frame_id, filter->stream_id, GST_TIME_ARGS(exit_lidarparse_timestamp), point_count, - filter->stride); + frame_id, filter->stream_id, GST_TIME_ARGS(exit_source_timestamp), point_count, filter->stride); if (!float_data.empty()) { const gsize payload_size = float_data.size() * sizeof(float); @@ -484,8 +482,7 @@ static GstFlowReturn gst_g3d_lidar_parse_transform(GstBaseTransform *trans, GstB const gsize preview_len = std::min(count, 5); std::ostringstream oss; oss << "lidar_point_count=" << point_count << " frame_id=" << frame_id << " stream_id=" << filter->stream_id - << " exit_ts=" << exit_lidarparse_timestamp << "ns" << " preview(" << preview_len << "/" << count - << "):"; + << " exit_ts=" << exit_source_timestamp << "ns" << " preview(" << preview_len << "/" << count << "):"; for (gsize i = 0; i < preview_len; ++i) { oss << " " << std::fixed << std::setprecision(6) << float_data[i]; @@ -495,7 +492,7 @@ static GstFlowReturn gst_g3d_lidar_parse_transform(GstBaseTransform *trans, GstB } } - LidarMeta *lidar_meta = add_lidar_meta(outbuf, point_count, frame_id, exit_lidarparse_timestamp, filter->stream_id); + LidarMeta *lidar_meta = add_lidar_meta(outbuf, point_count, frame_id, exit_source_timestamp, filter->stream_id); if (!lidar_meta) { GST_ERROR_OBJECT(filter, "Failed to add lidar meta to buffer"); g_mutex_unlock(&filter->mutex); diff --git a/src/monolithic/gst/elements/gvametaconvert/jsonconverter.cpp b/src/monolithic/gst/elements/gvametaconvert/jsonconverter.cpp index f874423c7..66ce51d5e 100644 --- a/src/monolithic/gst/elements/gvametaconvert/jsonconverter.cpp +++ b/src/monolithic/gst/elements/gvametaconvert/jsonconverter.cpp @@ -672,7 +672,7 @@ json get_lidar_frame_data(GstGvaMetaConvert *converter, GstBuffer *buffer, Lidar {"frame_id", lidar_meta->frame_id}, {"stream_id", lidar_meta->stream_id}, {"point_count", lidar_meta->lidar_point_count}, - {"exit_lidarparse_timestamp", lidar_meta->exit_lidarparse_timestamp}, + {"exit_source_timestamp", lidar_meta->exit_source_timestamp}, {"exit_g3dinference_timestamp", lidar_meta->exit_g3dinference_timestamp}, }); diff --git a/tests/unit_tests/check/elements/metaconvert/test_metaconvert/gvametaconvert.cpp b/tests/unit_tests/check/elements/metaconvert/test_metaconvert/gvametaconvert.cpp index 2600b7d7c..3486781ba 100644 --- a/tests/unit_tests/check/elements/metaconvert/test_metaconvert/gvametaconvert.cpp +++ b/tests/unit_tests/check/elements/metaconvert/test_metaconvert/gvametaconvert.cpp @@ -146,8 +146,8 @@ void check_pointpillars_outbuffer(GstBuffer *outbuffer, gpointer user_data) { meta->message); ck_assert_msg(lidar_frame["point_count"] == kPointPillarsPointCount, "Unexpected point_count. Message: %s", meta->message); - ck_assert_msg(lidar_frame["exit_lidarparse_timestamp"] == kPointPillarsLidarParseTs, - "Unexpected exit_lidarparse_timestamp. Message: %s", meta->message); + ck_assert_msg(lidar_frame["exit_source_timestamp"] == kPointPillarsLidarParseTs, + "Unexpected exit_source_timestamp. Message: %s", meta->message); ck_assert_msg(lidar_frame["exit_g3dinference_timestamp"] == kPointPillarsInferenceTs, "Unexpected exit_g3dinference_timestamp. Message: %s", meta->message);