From 87b2b35fac1622a8a587beeefca9d027530802c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Olivier=20Cr=C3=AAte?= Date: Mon, 23 Apr 2018 13:29:30 -0400 Subject: [PATCH] flvmux: Remove custom get_next_time implementation GstAggregator now does the same thing in the simple implementation. https://bugzilla.gnome.org/show_bug.cgi?id=795486 --- gst/flv/gstflvmux.c | 26 +------------------------- 1 file changed, 1 insertion(+), 25 deletions(-) diff --git a/gst/flv/gstflvmux.c b/gst/flv/gstflvmux.c index 516d45c1d8..2a1237aacf 100644 --- a/gst/flv/gstflvmux.c +++ b/gst/flv/gstflvmux.c @@ -1792,29 +1792,6 @@ gst_flv_mux_set_property (GObject * object, } } -static GstClockTime -gst_flv_mux_get_next_time_for_segment (GstAggregator * aggregator, - const GstSegment * segment) -{ - GstClockTime next_time; - - GST_OBJECT_LOCK (aggregator); - if (segment->position == -1 || segment->position < segment->start) - next_time = segment->start; - else - next_time = segment->position; - - if (segment->stop != -1 && next_time > segment->stop) - next_time = segment->stop; - - next_time = gst_segment_to_running_time (segment, GST_FORMAT_TIME, next_time); - GST_OBJECT_UNLOCK (aggregator); - - GST_DEBUG_OBJECT (aggregator, "next_time: %" GST_TIME_FORMAT, - GST_TIME_ARGS (next_time)); - return next_time; -} - static GstClockTime gst_flv_mux_get_next_time (GstAggregator * aggregator) { @@ -1833,8 +1810,7 @@ gst_flv_mux_get_next_time (GstAggregator * aggregator) goto wait_for_data; GST_OBJECT_UNLOCK (aggregator); - return gst_flv_mux_get_next_time_for_segment (aggregator, - &GST_AGGREGATOR_PAD (aggregator->srcpad)->segment); + return gst_aggregator_simple_get_next_time (aggregator); wait_for_data: GST_OBJECT_UNLOCK (aggregator);