diff options
| author | Olivier Crête <olivier.crete@collabora.com> | 2018-04-23 13:30:38 -0400 |
|---|---|---|
| committer | Olivier Crête <olivier.crete@collabora.com> | 2018-05-16 22:24:18 +0200 |
| commit | feb6002680664f127034cbb2c5514228f4c62fca (patch) | |
| tree | d674199eaf24cf20a067dba77c881852212f8465 /gst-libs | |
| parent | 0bdcf51baf77926b4f29c01a2fdf133c13aad62e (diff) | |
| download | gstreamer-plugins-bad-feb6002680664f127034cbb2c5514228f4c62fca.tar.gz | |
videoaggregator: Remove custom get_next_time implementation
GstAggregator now has the same thing in the simple implementation.
https://bugzilla.gnome.org/show_bug.cgi?id=795486
Diffstat (limited to 'gst-libs')
| -rw-r--r-- | gst-libs/gst/video/gstvideoaggregator.c | 24 |
1 files changed, 1 insertions, 23 deletions
diff --git a/gst-libs/gst/video/gstvideoaggregator.c b/gst-libs/gst/video/gstvideoaggregator.c index 8474f2de6..0848556f2 100644 --- a/gst-libs/gst/video/gstvideoaggregator.c +++ b/gst-libs/gst/video/gstvideoaggregator.c @@ -1717,28 +1717,6 @@ gst_video_aggregator_do_qos (GstVideoAggregator * vagg, GstClockTime timestamp) return jitter; } -static GstClockTime -gst_video_aggregator_get_next_time (GstAggregator * agg) -{ - GstClockTime next_time; - GstSegment *agg_segment = &GST_AGGREGATOR_PAD (agg->srcpad)->segment; - - GST_OBJECT_LOCK (agg); - if (agg_segment->position == -1 || agg_segment->position < agg_segment->start) - next_time = agg_segment->start; - else - next_time = agg_segment->position; - - if (agg_segment->stop != -1 && next_time > agg_segment->stop) - next_time = agg_segment->stop; - - next_time = - gst_segment_to_running_time (agg_segment, GST_FORMAT_TIME, next_time); - GST_OBJECT_UNLOCK (agg); - - return next_time; -} - static void gst_video_aggregator_advance_on_timeout (GstVideoAggregator * vagg) { @@ -2557,7 +2535,7 @@ gst_video_aggregator_class_init (GstVideoAggregatorClass * klass) agg_class->aggregate = gst_video_aggregator_aggregate; agg_class->src_event = gst_video_aggregator_src_event; agg_class->src_query = gst_video_aggregator_src_query; - agg_class->get_next_time = gst_video_aggregator_get_next_time; + agg_class->get_next_time = gst_aggregator_simple_get_next_time; agg_class->update_src_caps = gst_video_aggregator_default_update_src_caps; agg_class->fixate_src_caps = gst_video_aggregator_default_fixate_src_caps; agg_class->negotiated_src_caps = |