mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-10-04 01:32:42 +00:00
Code Issues 1 Projects Releases Wiki Activity

rtsp-stream: fix connection delay due to wrong assumption on last-sample

Browse source 
Commit 852cc09f54 assumed that
multiudpsink's last-sample always comes from the payloader. Which
is wrong if auxiliary streams are multiplexed in the same stream.

So check the buffer's ssrc against the caps'ssrc before to use its
seqnum. If not the same ssrc just use the payloader as done prior
the commit above or when there is no last-sample yet.

https://bugzilla.gnome.org/show_bug.cgi?id=784094
This commit is contained in:
Julien Isorce 2017-06-22 07:25:07 -07:00 committed by Julien Isorce
parent fe3131ae88
commit d72284bdf8
1 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
gst/rtsp-server/rtsp-stream.c
View file

@ -3018,13 +3018,29 @@ gst_rtsp_stream_get_rtpinfo (GstRTSPStream * stream,
GstCaps *caps;
GstBuffer *buffer;
GstSegment *segment;
GstStructure *s;
GstRTPBuffer rtp_buffer = GST_RTP_BUFFER_INIT;
caps = gst_sample_get_caps (last_sample);
buffer = gst_sample_get_buffer (last_sample);
segment = gst_sample_get_segment (last_sample);
s = gst_caps_get_structure (caps, 0);
if (gst_rtp_buffer_map (buffer, GST_MAP_READ, &rtp_buffer)) {
guint ssrc_buf = gst_rtp_buffer_get_ssrc (&rtp_buffer);
guint ssrc_stream = 0;
if (gst_structure_has_field_typed (s, "ssrc", G_TYPE_UINT) &&
gst_structure_get_uint (s, "ssrc", &ssrc_stream) &&
ssrc_buf != ssrc_stream) {
/* Skip buffers from auxiliary streams. */
GST_DEBUG_OBJECT (stream,
"not a buffer from the payloader, SSRC: %08x", ssrc_buf);
gst_rtp_buffer_unmap (&rtp_buffer);
gst_sample_unref (last_sample);
goto stats;
}
if (seq) {
*seq = gst_rtp_buffer_get_seq (&rtp_buffer);
}
@ -3042,8 +3058,6 @@ gst_rtsp_stream_get_rtpinfo (GstRTSPStream * stream,
}
if (clock_rate) {
GstStructure *s = gst_caps_get_structure (caps, 0);
gst_structure_get_int (s, "clock-rate", (gint *) clock_rate);
if (*clock_rate == 0 && running_time)
@ -3058,6 +3072,7 @@ gst_rtsp_stream_get_rtpinfo (GstRTSPStream * stream,
}
}
stats:
if (g_object_class_find_property (payobjclass, "stats")) {
g_object_get (priv->payloader, "stats", &stats, NULL);
if (stats == NULL)