mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-25 19:21:06 +00:00
Code Issues 1 Projects Releases Wiki Activity

video: Don't overshoot QoS earliest time by a factor of 2

Browse source 
By setting the earliest time to timestamp + 2 * diff there would be a difference
of 1 * diff between the current clock time and the earliest time the element
would let through in the future. If e.g. a frame is arriving 30s late at the
sink, then not just all frames up to that point would be dropped but also 30s of
frames after the current clock time.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/7518>
This commit is contained in:
Sebastian Dröge 2024-09-05 22:07:24 +03:00 committed by Backport Bot
parent b8a316275c
commit ca23c3c762
10 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
subprojects/gst-plugins-bad/gst-libs/gst/adaptivedemux/gstadaptivedemux.c
View file

@ -1917,7 +1917,7 @@ gst_adaptive_demux_src_event (GstPad * pad, GstObject * parent,
gst_event_parse_qos (event, NULL, NULL, &diff, &timestamp);
/* Only take into account lateness if late */
if (diff > 0)
earliest_time = timestamp + 2 * diff;
earliest_time = timestamp + MIN (2 * diff, GST_SECOND);
else
earliest_time = timestamp;

2
subprojects/gst-plugins-base/gst-libs/gst/pbutils/gstaudiovisualizer.c
View file

@ -1264,7 +1264,7 @@ gst_audio_visualizer_src_event (GstPad * pad, GstObject * parent,
if (diff >= 0)
/* we're late, this is a good estimate for next displayable
* frame (see part-qos.txt) */
scope->priv->earliest_time = timestamp + 2 * diff +
scope->priv->earliest_time = timestamp + MIN (2 * diff, GST_SECOND) +
scope->priv->frame_duration;
else
scope->priv->earliest_time = timestamp + diff;

3
subprojects/gst-plugins-base/gst-libs/gst/video/gstvideoaggregator.c
View file

@ -1667,7 +1667,8 @@ gst_video_aggregator_update_qos (GstVideoAggregator * vagg, gdouble proportion,
if (G_LIKELY (timestamp != GST_CLOCK_TIME_NONE)) {
if (!live && G_UNLIKELY (diff > 0))
vagg->priv->earliest_time =
timestamp + 2 * diff + gst_util_uint64_scale_int_round (GST_SECOND,
timestamp + MIN (2 * diff,
GST_SECOND) + gst_util_uint64_scale_int_round (GST_SECOND,
GST_VIDEO_INFO_FPS_D (&vagg->info),
GST_VIDEO_INFO_FPS_N (&vagg->info));
else

3
subprojects/gst-plugins-base/gst-libs/gst/video/gstvideodecoder.c
View file

@ -1834,7 +1834,8 @@ gst_video_decoder_src_event_default (GstVideoDecoder * decoder,
priv->proportion = proportion;
if (G_LIKELY (GST_CLOCK_TIME_IS_VALID (timestamp))) {
if (G_UNLIKELY (diff > 0)) {
priv->earliest_time = timestamp + 2 * diff + priv->qos_frame_duration;
priv->earliest_time =
timestamp + MIN (2 * diff, GST_SECOND) + priv->qos_frame_duration;
} else {
priv->earliest_time = timestamp + diff;
}

3
subprojects/gst-plugins-base/gst-libs/gst/video/gstvideoencoder.c
View file

@ -1361,7 +1361,8 @@ gst_video_encoder_src_event_default (GstVideoEncoder * encoder,
priv->proportion = proportion;
if (G_LIKELY (GST_CLOCK_TIME_IS_VALID (timestamp))) {
if (G_UNLIKELY (diff > 0)) {
priv->earliest_time = timestamp + 2 * diff + priv->qos_frame_duration;
priv->earliest_time =
timestamp + MIN (2 * diff, GST_SECOND) + priv->qos_frame_duration;
} else {
priv->earliest_time = timestamp + diff;
}

2
subprojects/gst-plugins-good/ext/adaptivedemux2/gstadaptivedemux.c
View file

@ -2536,7 +2536,7 @@ gst_adaptive_demux_src_event (GstPad * pad, GstObject * parent,
gst_event_parse_qos (event, NULL, NULL, &diff, &timestamp);
/* Only take into account lateness if late */
if (diff > 0)
earliest_time = timestamp + 2 * diff;
earliest_time = timestamp + MIN (2 * diff, GST_SECOND);
else
earliest_time = timestamp;

2
subprojects/gst-plugins-good/gst/deinterlace/gstdeinterlace.c
View file

@ -1288,7 +1288,7 @@ gst_deinterlace_update_qos (GstDeinterlace * self, gdouble proportion,
if (G_LIKELY (timestamp != GST_CLOCK_TIME_NONE)) {
if (G_UNLIKELY (diff > 0))
self->earliest_time =
timestamp + 2 * diff + ((self->fields ==
timestamp + MIN (2 * diff, GST_SECOND) + ((self->fields ==
GST_DEINTERLACE_ALL) ? self->field_duration : 2 *
self->field_duration);
else

2
subprojects/gst-plugins-good/gst/monoscope/gstmonoscope.c
View file

@ -534,7 +534,7 @@ gst_monoscope_src_event (GstPad * pad, GstObject * parent, GstEvent * event)
/* we're late, this is a good estimate for next displayable
* frame (see part-qos.txt) */
monoscope->earliest_time =
timestamp + 2 * diff + monoscope->frame_duration;
timestamp + MIN (2 * diff, GST_SECOND) + monoscope->frame_duration;
else
monoscope->earliest_time = timestamp + diff;
GST_OBJECT_UNLOCK (monoscope);

3
subprojects/gst-plugins-good/gst/shapewipe/gstshapewipe.c
View file

@ -695,7 +695,8 @@ gst_shape_wipe_update_qos (GstShapeWipe * self, gdouble proportion,
self->proportion = proportion;
if (G_LIKELY (timestamp != GST_CLOCK_TIME_NONE)) {
if (G_UNLIKELY (diff > 0))
self->earliest_time = timestamp + 2 * diff + self->frame_duration;
self->earliest_time =
timestamp + MIN (2 * diff, GST_SECOND) + self->frame_duration;
else
self->earliest_time = timestamp + diff;
} else {

3
subprojects/gst-plugins-good/gst/videomixer/videomixer2.c
View file

@ -816,7 +816,8 @@ gst_videomixer2_update_qos (GstVideoMixer2 * mix, gdouble proportion,
if (G_LIKELY (timestamp != GST_CLOCK_TIME_NONE)) {
if (!mix->live && G_UNLIKELY (diff > 0))
mix->earliest_time =
timestamp + 2 * diff + gst_util_uint64_scale_int_round (GST_SECOND,
timestamp + MIN (2 * diff,
GST_SECOND) + gst_util_uint64_scale_int_round (GST_SECOND,
GST_VIDEO_INFO_FPS_D (&mix->info), GST_VIDEO_INFO_FPS_N (&mix->info));
else
mix->earliest_time = timestamp + diff;