From 1ead948fe0164650f6869c3217d0000fd46908eb Mon Sep 17 00:00:00 2001 From: Jaeyun Date: Tue, 30 Oct 2018 18:43:51 +0900 Subject: [PATCH] [Merge] change code to compare timestamp to fix coverity issue, use GST_CLOCK_DIFF to get time-diff of buffer pts time. (pts is unsigned value, diff of two buffer timestamp always returns unsigned value) Signed-off-by: Jaeyun Jung --- gst/tensor_merge/gsttensormerge.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gst/tensor_merge/gsttensormerge.c b/gst/tensor_merge/gsttensormerge.c index 47e9924..6e7ce06 100644 --- a/gst/tensor_merge/gsttensormerge.c +++ b/gst/tensor_merge/gsttensormerge.c @@ -514,9 +514,11 @@ gst_tensor_merge_collect_buffer (GstTensorMerge * tensor_merge, return FALSE; } - if (pad->buffer != NULL - && ABS (tensor_merge->current_time - GST_BUFFER_PTS (pad->buffer)) < - ABS (tensor_merge->current_time - GST_BUFFER_PTS (buf))) { + if (pad->buffer != NULL && + ABS (GST_CLOCK_DIFF (tensor_merge->current_time, + GST_BUFFER_PTS (pad->buffer))) < + ABS (GST_CLOCK_DIFF (tensor_merge->current_time, + GST_BUFFER_PTS (buf)))) { gst_buffer_unref (buf); buf = pad->buffer; } else { -- 2.7.4