diff options
| author | Sebastian Dröge <sebastian@centricular.com> | 2021-06-08 17:27:55 +0300 |
|---|---|---|
| committer | Sebastian Dröge <sebastian@centricular.com> | 2021-06-08 17:31:02 +0300 |
| commit | 1565b9635b830c33591c664dc0baad78d3a7ce9c (patch) | |
| tree | 3105623c8044fc87b9b3880a881a4beeac33b8a5 | |
| parent | 0b9976ac467cf6b450dbeb20ed7e5e15d697b2eb (diff) | |
| download | gstreamer-plugins-base-1565b9635b830c33591c664dc0baad78d3a7ce9c.tar.gz | |
appsrc: When dropping buffers before handling the initial segment use the latest input segment
Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/merge_requests/1198>
| -rw-r--r-- | gst-libs/gst/app/gstappsrc.c | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/gst-libs/gst/app/gstappsrc.c b/gst-libs/gst/app/gstappsrc.c index c7a0a4d5a..457220d02 100644 --- a/gst-libs/gst/app/gstappsrc.c +++ b/gst-libs/gst/app/gstappsrc.c @@ -1391,18 +1391,22 @@ gst_app_src_update_queued_pop (GstAppSrc * appsrc, GstMiniObject * item, priv->queued_buffers -= n_buffers; /* Update time level if working on a TIME segment */ - if (priv->current_segment.format == GST_FORMAT_TIME + if ((priv->current_segment.format == GST_FORMAT_TIME + || (priv->current_segment.format == GST_FORMAT_UNDEFINED + && priv->last_segment.format == GST_FORMAT_TIME)) && end_buffer_ts != GST_CLOCK_TIME_NONE) { + const GstSegment *segment = + priv->current_segment.format == + GST_FORMAT_TIME ? &priv->current_segment : &priv->last_segment; + /* Clip to the current segment boundaries */ - if (priv->current_segment.stop != -1 - && end_buffer_ts > priv->current_segment.stop) - end_buffer_ts = priv->current_segment.stop; - else if (priv->current_segment.start > end_buffer_ts) - end_buffer_ts = priv->current_segment.start; + if (segment->stop != -1 && end_buffer_ts > segment->stop) + end_buffer_ts = segment->stop; + else if (segment->start > end_buffer_ts) + end_buffer_ts = segment->start; priv->last_out_running_time = - gst_segment_to_running_time (&priv->current_segment, - GST_FORMAT_TIME, end_buffer_ts); + gst_segment_to_running_time (segment, GST_FORMAT_TIME, end_buffer_ts); GST_TRACE_OBJECT (appsrc, "Last in running time %" GST_TIME_FORMAT ", last out running time %" |