From 2aba1c86e9804b59e0fbc9ae2d5a52f22959f6a7 Mon Sep 17 00:00:00 2001
From: Edward Hervey <edward@centricular.com>
Date: Fri, 19 Apr 2024 11:32:47 +0200
Subject: [PATCH] videodecoder: Use a frame duration for QoS
We prefer to use the frame stop position for checking for QoS since we don't
want to drop a frame which is only partially late.
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6689>
---
.../gst-libs/gst/video/gstvideodecoder.c | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/subprojects/gst-plugins-base/gst-libs/gst/video/gstvideodecoder.c b/subprojects/gst-plugins-base/gst-libs/gst/video/gstvideodecoder.c
index 74bcab1e72..47f2ec477a 100644
--- a/subprojects/gst-plugins-base/gst-libs/gst/video/gstvideodecoder.c
+++ b/subprojects/gst-plugins-base/gst-libs/gst/video/gstvideodecoder.c
@@ -3652,11 +3652,15 @@ gst_video_decoder_clip_and_push_buf (GstVideoDecoder * decoder, GstBuffer * buf)
goto done;
}
- /* Is buffer too late (QoS) ? */
- if (priv->do_qos && GST_CLOCK_TIME_IS_VALID (priv->earliest_time)
- && GST_CLOCK_TIME_IS_VALID (cstart)) {
- GstClockTime deadline =
- gst_segment_to_running_time (segment, GST_FORMAT_TIME, cstart);
+ /* Check if the buffer is too late (QoS). */
+ if (priv->do_qos && GST_CLOCK_TIME_IS_VALID (priv->earliest_time)) {
+ GstClockTime deadline = GST_CLOCK_TIME_NONE;
+ /* We prefer to use the frame stop position for checking for QoS since we
+ * don't want to drop a frame which is partially late */
+ if (GST_CLOCK_TIME_IS_VALID (cstop))
+ deadline = gst_segment_to_running_time (segment, GST_FORMAT_TIME, cstop);
+ else if (GST_CLOCK_TIME_IS_VALID (cstart))
+ deadline = gst_segment_to_running_time (segment, GST_FORMAT_TIME, cstart);
if (GST_CLOCK_TIME_IS_VALID (deadline) && deadline < priv->earliest_time) {
GST_WARNING_OBJECT (decoder,
"Dropping frame due to QoS. start:%" GST_TIME_FORMAT " deadline:%"