mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-30 13:41:48 +00:00
Code Issues 1 Projects Releases Wiki Activity

rtspsrc: Update caps for TCP whenever they change

Browse source 
We only changed them for UDP so far, which caused the wrong seqnum-base and
other information to be passed to rtpjitterbuffer/etc when seeking. This
usually wasn't that much of a problem as the code there is robust enough, but
every now and then it causes us to drop up to 32756 packets before we
continue doing anything meaningful.

https://bugzilla.gnome.org/show_bug.cgi?id=765689
This commit is contained in:
Sebastian Dröge 2016-04-27 20:46:34 +03:00
parent 608b4ee53c
commit 7c728db1f3
2 changed files with 31 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
gst/rtsp/gstrtspsrc.c
View file

@ -3948,8 +3948,10 @@ gst_rtspsrc_configure_caps (GstRTSPSrc * src, GstSegment * segment,
GST_DEBUG_OBJECT (src, "stream %p, pt %d, caps %" GST_PTR_FORMAT, stream, GST_DEBUG_OBJECT (src, "stream %p, pt %d, caps %" GST_PTR_FORMAT, stream,
item->pt, caps); item->pt, caps);
if (item->pt == stream->default_pt && stream->udpsrc[0]) { if (item->pt == stream->default_pt) {
if (stream->udpsrc[0])
g_object_set (stream->udpsrc[0], "caps", caps, NULL); g_object_set (stream->udpsrc[0], "caps", caps, NULL);
stream->need_caps = TRUE;
} }
} }
} }
@ -4441,6 +4443,7 @@ gst_rtspsrc_handle_data (GstRTSPSrc * src, GstRTSPMessage * message)
gst_pad_send_event (ostream->channelpad[0], gst_pad_send_event (ostream->channelpad[0],
gst_event_new_caps (caps)); gst_event_new_caps (caps));
} }
ostream->need_caps = FALSE;
if (ostream->profile == GST_RTSP_PROFILE_SAVP || if (ostream->profile == GST_RTSP_PROFILE_SAVP ||
ostream->profile == GST_RTSP_PROFILE_SAVPF) ostream->profile == GST_RTSP_PROFILE_SAVPF)
@ -4504,6 +4507,28 @@ gst_rtspsrc_handle_data (GstRTSPSrc * src, GstRTSPMessage * message)
gst_rtspsrc_push_event (src, gst_event_new_segment (&segment)); gst_rtspsrc_push_event (src, gst_event_new_segment (&segment));
} }
if (stream->need_caps) {
GstCaps *caps;
if ((caps = stream_get_caps_for_pt (stream, stream->default_pt))) {
/* only streams that have a connection to the outside world */
if (stream->setup) {
/* Only need to update the TCP caps here, UDP is already handled */
if (stream->channelpad[0]) {
if (GST_PAD_IS_SRC (stream->channelpad[0]))
gst_pad_push_event (stream->channelpad[0],
gst_event_new_caps (caps));
else
gst_pad_send_event (stream->channelpad[0],
gst_event_new_caps (caps));
}
stream->need_caps = FALSE;
}
}
stream->need_caps = FALSE;
}
if (stream->discont && !is_rtcp) { if (stream->discont && !is_rtcp) {
/* mark first RTP buffer as discont */ /* mark first RTP buffer as discont */
GST_BUFFER_FLAG_SET (buf, GST_BUFFER_FLAG_DISCONT); GST_BUFFER_FLAG_SET (buf, GST_BUFFER_FLAG_DISCONT);
@ -7157,7 +7182,10 @@ clear_rtp_base (GstRTSPSrc * src, GstRTSPStream * stream)
item->caps = gst_caps_make_writable (item->caps); item->caps = gst_caps_make_writable (item->caps);
s = gst_caps_get_structure (item->caps, 0); s = gst_caps_get_structure (item->caps, 0);
gst_structure_remove_fields (s, "clock-base", "seqnum-base", NULL); gst_structure_remove_fields (s, "clock-base", "seqnum-base", NULL);
if (item->pt == stream->default_pt && stream->udpsrc[0])
g_object_set (stream->udpsrc[0], "caps", item->caps, NULL);
} }
stream->need_caps = TRUE;
} }
static GstRTSPResult static GstRTSPResult

1
gst/rtsp/gstrtspsrc.h
View file

@ -103,6 +103,7 @@ struct _GstRTSPStream {
gboolean skipped; gboolean skipped;
gboolean eos; gboolean eos;
gboolean discont; gboolean discont;
gboolean need_caps;
/* for interleaved mode */ /* for interleaved mode */
guint8 channel[2]; guint8 channel[2];