mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-31 03:29:50 +00:00
Code Issues 1 Projects Releases Wiki Activity

rtsp-media: set a 0 storage size for TCP receivers

Browse source 
ulpfec correction is obviously useless when receiving a stream
over TCP, and in TCP modes the rtp storage receives non
timestamped buffers, causing it to queue buffers indefinitely,
until the queue grows so large that sanity checks kick in and
warnings start to get emitted.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-rtsp-server/-/merge_requests/149>
This commit is contained in:
Mathieu Duponchelle 2020-09-05 00:30:42 +02:00 committed by GStreamer Merge Bot
parent 5699ada939
commit 3b9eaa092e
3 changed files with 40 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
gst/rtsp-server/rtsp-media.c
View file

@ -84,6 +84,7 @@
#define HMAC_80_KEY_LEN 10
#include "rtsp-media.h"
#include "rtsp-server-internal.h"
struct _GstRTSPMediaPrivate
{
@ -1645,6 +1646,25 @@ gst_rtsp_media_get_do_retransmission (GstRTSPMedia * media)
return res;
}
static void
update_stream_storage_size (GstRTSPMedia * media, GstRTSPStream * stream,
guint sessid)
{
GObject *storage = NULL;
g_signal_emit_by_name (G_OBJECT (media->priv->rtpbin), "get-storage",
sessid, &storage);
if (storage) {
guint size_time = 0;
if (!gst_rtsp_stream_is_tcp_receiver (stream))
size_time = (media->priv->latency + 50) * GST_MSECOND;
g_object_set (storage, "size-time", size_time, NULL);
}
}
/**
* gst_rtsp_media_set_latency:
* @media: a #GstRTSPMedia
@ -1670,13 +1690,8 @@ gst_rtsp_media_set_latency (GstRTSPMedia * media, guint latency)
g_object_set (priv->rtpbin, "latency", latency, NULL);
for (i = 0; i < media->priv->streams->len; i++) {
GObject *storage = NULL;
g_signal_emit_by_name (G_OBJECT (media->priv->rtpbin), "get-storage",
i, &storage);
if (storage)
g_object_set (storage, "size-time",
(media->priv->latency + 50) * GST_MSECOND, NULL);
GstRTSPStream *stream = g_ptr_array_index (media->priv->streams, i);
update_stream_storage_size (media, stream, i);
}
}
@ -3617,14 +3632,6 @@ request_fec_decoder (GstElement * rtpbin, guint sessid, GstRTSPMedia * media)
return res;
}
static void
new_storage_cb (GstElement * rtpbin, GObject * storage, guint sessid,
GstRTSPMedia * media)
{
g_object_set (storage, "size-time", (media->priv->latency + 50) * GST_MSECOND,
NULL);
}
static gboolean
start_prepare (GstRTSPMedia * media)
{
@ -3636,8 +3643,6 @@ start_prepare (GstRTSPMedia * media)
if (priv->status != GST_RTSP_MEDIA_STATUS_PREPARING)
goto no_longer_preparing;
g_signal_connect (priv->rtpbin, "new-storage", G_CALLBACK (new_storage_cb),
media);
g_signal_connect (priv->rtpbin, "request-fec-decoder",
G_CALLBACK (request_fec_decoder), media);
@ -5010,6 +5015,8 @@ gst_rtsp_media_complete_pipeline (GstRTSPMedia * media, GPtrArray * transports)
g_mutex_unlock (&priv->lock);
return FALSE;
}
update_stream_storage_size (media, stream, i);
}
priv->complete = TRUE;

2
gst/rtsp-server/rtsp-server-internal.h
View file

@ -56,6 +56,8 @@ void gst_rtsp_stream_transport_set_back_pressure_callback (G
gboolean gst_rtsp_stream_transport_check_back_pressure (GstRTSPStreamTransport *trans,
gboolean is_rtp);
gboolean gst_rtsp_stream_is_tcp_receiver (GstRTSPStream * stream);
G_END_DECLS
#endif /* __GST_RTSP_SERVER_INTERNAL_H__ */

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

@ -3790,6 +3790,20 @@ done:
return ret;
}
gboolean
gst_rtsp_stream_is_tcp_receiver (GstRTSPStream * stream)
{
GstRTSPStreamPrivate *priv;
gboolean ret = FALSE;
priv = stream->priv;
g_mutex_lock (&priv->lock);
ret = (priv->sinkpad != NULL && priv->appsrc[0] != NULL);
g_mutex_unlock (&priv->lock);
return ret;
}
static gboolean
check_mcast_client_addr (GstRTSPStream * stream, const GstRTSPTransport * tr)
{