satip server: allow to configure TCP RTP payload size for limited clients, fixes...

diff --git a/src/satip/rtp.c b/src/satip/rtp.c
index d0d88fafd511399ca03ba3a8e90acb93817ac11c..a7add1d4eda0d69e2f72b7ac8d93702fc2b304ab 100644 (file)
--- a/src/satip/rtp.c
+++ b/src/satip/rtp.c
@@ -33,7 +33,8 @@
 
 #define RTP_PACKETS 128
 #define RTP_PAYLOAD (7*188+12)
-#define RTP_TCP_PAYLOAD (87*188+12+4) /* cca 16kB */
+#define RTP_TCP_MIN_PAYLOAD (7*188+12+4)   /* fit ethernet packet */
+#define RTP_TCP_MAX_PAYLOAD (348*188+12+4) /* cca 64kB */
 #define RTCP_PAYLOAD (1420)
 
 #define RTP_TCP_BUFFER_SIZE (64*1024*1024)
@@ -465,7 +466,7 @@ void *satip_rtp_queue(th_subscription_t *subs,
   satip_rtp_session_t *rtp = calloc(1, sizeof(*rtp));
   size_t len;
   socklen_t socklen;
-  int dscp;
+  int dscp, payload;
 
   if (rtp == NULL)
     return NULL;
@@ -480,7 +481,8 @@ void *satip_rtp_queue(th_subscription_t *subs,
   rtp->subs = subs;
   rtp->sq = sq;
   rtp->hc = hc;
-  rtp->tcp_payload = RTP_TCP_PAYLOAD;
+  payload = satip_server_conf.satip_rtptcpsize * 188 + 12 + 4;
+  rtp->tcp_payload = MINMAX(payload, RTP_TCP_MIN_PAYLOAD, RTP_TCP_MAX_PAYLOAD);
   rtp->tcp_buffer_size = 16*1024*1024;
   rtp->no_data_cb = no_data_cb;
   rtp->no_data_opaque = no_data_opaque;

diff --git a/src/satip/server.c b/src/satip/server.c
index 840b4b27dc4eed7732c8e42d3c316dd2b9f90224..4a5fb54bc9716404f85569a8a88d944f5be5dfeb 100644 (file)
--- a/src/satip/server.c
+++ b/src/satip/server.c
@@ -593,6 +593,20 @@ static htsmsg_t *satip_server_class_muxcfg_list ( void *o, const char *lang )
   return strtab2htsmsg(tab, 1, lang);
 }
 
+static htsmsg_t *satip_server_class_rtptcpsize_list ( void *o, const char *lang )
+{
+  static const struct strtab tab[] = {
+    { N_("1316 bytes"),         1316/188 },
+    { N_("2632 bytes"),         2632/188 },
+    { N_("5264 bytes"),         5264/188 },
+    { N_("7896 bytes"),         7896/188 },
+    { N_("16356 bytes"),        16356/188 },
+    { N_("32712 bytes"),        32712/188 },
+    { N_("65424 bytes"),        65424/188 },
+  };
+  return strtab2htsmsg(tab, 1, lang);
+}
+
 CLASS_DOC(satip_server)
 PROP_DOC(satip_muxhandling)
 
@@ -697,6 +711,19 @@ const idclass_t satip_server_class = {
       .opts   = PO_EXPERT | PO_DOC_NLIST,
       .group  = 1,
     },
+    {
+      .type   = PT_INT,
+      .id     = "satip_rtptcpsize",
+      .name   = N_("RTP over TCP payload"),
+      .desc   = N_("Select the payload size for RTP contents used "
+                   "in the TCP embedded data mode. Some implementations "
+                   "like ffmpeg and VideoLAN have maximum limit 7896 "
+                   "bytes. The recommended value for tvheadend is "
+                   "16356 or 32712 bytes."),
+      .off    = offsetof(struct satip_server_conf, satip_rtptcpsize),
+      .list   = satip_server_class_rtptcpsize_list,
+      .group  = 1,
+    },
     {
       .type   = PT_STR,
       .id     = "satip_nat_ip",
@@ -896,6 +923,7 @@ void satip_server_init(const char *bindaddr, int rtsp_port)
   http_server_ip = NULL;
   satip_server_bootid = time(NULL);
   satip_server_conf.satip_deviceid = 1;
+  satip_server_conf.satip_rtptcpsize = 7896/188;
 
   satip_server_bindaddr = bindaddr ? strdup(bindaddr) : NULL;
   satip_server_rtsp_port_locked = rtsp_port > 0;

diff --git a/src/satip/server.h b/src/satip/server.h
index d22fa05da79444a56cc27b893f0fdc898271e66d..ddb42e2a33a9c864609e573cbfa8f5a650723c18 100644 (file)
--- a/src/satip/server.h
+++ b/src/satip/server.h
@@ -46,6 +46,7 @@ struct satip_server_conf {
   int satip_descramble;
   int satip_rewrite_pmt;
   int satip_muxcnf;
+  int satip_rtptcpsize;
   int satip_nom3u;
   int satip_notcp_mode;
   int satip_anonymize;