summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWim Taymans <wim.taymans@collabora.co.uk>2013-02-06 13:52:26 +0100
committerWim Taymans <wim.taymans@collabora.co.uk>2013-02-06 14:01:16 +0100
commit640de61740e86521581671ed6e2993dd0a44dbe7 (patch)
tree34f952d9db4bc50b6ab1ab651129f7d0774257c9
parent0540492ab27b345e434432205950469f9551595a (diff)
rtspsrc: only EOS when our source sends BYE
Only EOS when we receive a BYE event from the SSRC of our stream. Fixes https://bugzilla.gnome.org/show_bug.cgi?id=675453
-rw-r--r--gst/rtsp/gstrtspsrc.c18
1 files changed, 14 insertions, 4 deletions
diff --git a/gst/rtsp/gstrtspsrc.c b/gst/rtsp/gstrtspsrc.c
index 16b13586b..22f10d19f 100644
--- a/gst/rtsp/gstrtspsrc.c
+++ b/gst/rtsp/gstrtspsrc.c
@@ -2403,20 +2403,30 @@ static void
on_bye_ssrc (GObject * session, GObject * source, GstRTSPStream * stream)
{
GstRTSPSrc *src = stream->parent;
+ guint ssrc;
- GST_DEBUG_OBJECT (src, "source in session %u received BYE", stream->id);
+ g_object_get (source, "ssrc", &ssrc, NULL);
- gst_rtspsrc_do_stream_eos (src, stream);
+ GST_DEBUG_OBJECT (src, "source %08x, stream %08x, session %u received BYE",
+ ssrc, stream->ssrc, stream->id);
+
+ if (ssrc == stream->ssrc)
+ gst_rtspsrc_do_stream_eos (src, stream);
}
static void
on_timeout (GObject * session, GObject * source, GstRTSPStream * stream)
{
GstRTSPSrc *src = stream->parent;
+ guint ssrc;
- GST_DEBUG_OBJECT (src, "source in session %u timed out", stream->id);
+ g_object_get (source, "ssrc", &ssrc, NULL);
- gst_rtspsrc_do_stream_eos (src, stream);
+ GST_WARNING_OBJECT (src, "source %08x, stream %08x in session %u timed out",
+ ssrc, stream->ssrc, stream->id);
+
+ if (ssrc == stream->ssrc)
+ gst_rtspsrc_do_stream_eos (src, stream);
}
static void