From 3b9eaa092e74da2c63fe6a98f5942bf100511dde Mon Sep 17 00:00:00 2001
From: Mathieu Duponchelle <mathieu@centricular.com>
Date: Sat, 5 Sep 2020 00:30:42 +0200
Subject: [PATCH] rtsp-media: set a 0 storage size for TCP receivers

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>
---
 gst/rtsp-server/rtsp-media.c           | 41 +++++++++++++++-----------
 gst/rtsp-server/rtsp-server-internal.h |  2 ++
 gst/rtsp-server/rtsp-stream.c          | 14 +++++++++
 3 files changed, 40 insertions(+), 17 deletions(-)

diff --git a/gst/rtsp-server/rtsp-media.c b/gst/rtsp-server/rtsp-media.c
index b8bc97b006..8159697c8e 100644
--- a/gst/rtsp-server/rtsp-media.c
+++ b/gst/rtsp-server/rtsp-media.c
@@ -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;
diff --git a/gst/rtsp-server/rtsp-server-internal.h b/gst/rtsp-server/rtsp-server-internal.h
index 056814fbb9..008b7552dc 100644
--- a/gst/rtsp-server/rtsp-server-internal.h
+++ b/gst/rtsp-server/rtsp-server-internal.h
@@ -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__ */
diff --git a/gst/rtsp-server/rtsp-stream.c b/gst/rtsp-server/rtsp-stream.c
index fecb1839f7..323076585e 100644
--- a/gst/rtsp-server/rtsp-stream.c
+++ b/gst/rtsp-server/rtsp-stream.c
@@ -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)
 {