summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Dröge <sebastian@centricular.com>2017-04-21 19:09:14 +0100
committerSebastian Dröge <sebastian@centricular.com>2017-05-08 18:11:10 +0200
commita9dc4cb1170ffe48fd9409a1b92f913cff8ede97 (patch)
treed09b66752b2d5ef53dae0ea8ec71c9d57bf3bbda
parentf2f0a2fa7941c994930ee11d7f04a99f07a00976 (diff)
downloadgstreamer-plugins-good-a9dc4cb1170ffe48fd9409a1b92f913cff8ede97.tar.gz
rtspsrc: Chain up to the parent class' provide_clock() implementation
If no clock was provided directly by rtspsrc. This behaviour was removed by f8013487c91a6ffc552a4b25aa1a70f0bd5377f8 and results in rtspsrc not providing the system clock via the rtpjitterbuffer. As a result, if another element like an audio sink, provides a clock, the pipeline would select that (when going to PAUSED/PLAYING again later). Audio clocks usually don't progress in PAUSED, and thus our live source won't be able to use the clock to produce data, making the sink never preroll and everything is stuck.
-rw-r--r--gst/rtsp/gstrtspsrc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/gst/rtsp/gstrtspsrc.c b/gst/rtsp/gstrtspsrc.c
index 1393feda3..86fb28732 100644
--- a/gst/rtsp/gstrtspsrc.c
+++ b/gst/rtsp/gstrtspsrc.c
@@ -956,9 +956,9 @@ gst_rtspsrc_provide_clock (GstElement * element)
GstClock *clock;
if ((clock = src->provided_clock) != NULL)
- gst_object_ref (clock);
+ return gst_object_ref (clock);
- return clock;
+ return GST_ELEMENT_CLASS (parent_class)->provide_clock (element);
}
/* a proxy string of the format [user:passwd@]host[:port] */