From f791fbc52afb371ccf586af3cb9bc879578f69b5 Mon Sep 17 00:00:00 2001 From: Jaeyun Date: Tue, 30 Oct 2018 13:40:15 +0900 Subject: [PATCH] [Merge] fix coverity issue fix invalid condition to check timestamp Signed-off-by: Jaeyun Jung --- gst/tensor_merge/gsttensormerge.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/gst/tensor_merge/gsttensormerge.c b/gst/tensor_merge/gsttensormerge.c index 3fffe1d..47e9924 100644 --- a/gst/tensor_merge/gsttensormerge.c +++ b/gst/tensor_merge/gsttensormerge.c @@ -506,20 +506,18 @@ gst_tensor_merge_collect_buffer (GstTensorMerge * tensor_merge, if (buf != NULL) { if (GST_BUFFER_PTS (buf) < tensor_merge->current_time) { gst_buffer_unref (buf); - buf = gst_collect_pads_pop (tensor_merge->collect, data); if (pad->buffer != NULL) gst_buffer_unref (pad->buffer); - pad->buffer = buf; - silent_debug ("Fame Dropped : %lu", GST_BUFFER_PTS (buf)); + pad->buffer = gst_collect_pads_pop (tensor_merge->collect, data); + silent_debug ("Fame Dropped : %lu", GST_BUFFER_PTS (pad->buffer)); tensor_merge->need_buffer = TRUE; 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 (buf != NULL) - gst_buffer_unref (buf); + && ABS (tensor_merge->current_time - GST_BUFFER_PTS (pad->buffer)) < + ABS (tensor_merge->current_time - GST_BUFFER_PTS (buf))) { + gst_buffer_unref (buf); buf = pad->buffer; } else { gst_buffer_unref (buf); -- 2.7.4