[FFmpeg-devel] libavformat/tcp.c : add send_buffer_size and recv_buffer_size options

[Perette Barella]

On 2016年01月15日, at 18:42, Michael Niedermayer <michael at niedermayer.cc> wrote:
> no, theres no patch


Trying again, including it inline below:

--- tcp.c	2015-12-19 21:07:51.000000000 -0500
+++ /Users/perette/Desktop/tcp.c	2016-01-15 16:09:03.000000000 -0500
@@ -37,19 +37,23 @@
     int fd;
     int listen;
     int open_timeout;
     int rw_timeout;
     int listen_timeout;
+    int recv_buffer_size;
+    int send_buffer_size;
 } TCPContext;
 
 #define OFFSET(x) offsetof(TCPContext, x)
 #define D AV_OPT_FLAG_DECODING_PARAM
 #define E AV_OPT_FLAG_ENCODING_PARAM
 static const AVOption options[] = {
-    { "listen",          "Listen for incoming connections",  OFFSET(listen),         AV_OPT_TYPE_INT, { .i64 = 0 },     0,       2,       .flags = D|E },
-    { "timeout",     "set timeout (in microseconds) of socket I/O operations", OFFSET(rw_timeout),     AV_OPT_TYPE_INT, { .i64 = -1 },         -1, INT_MAX, .flags = D|E },
-    { "listen_timeout",  "Connection awaiting timeout (in milliseconds)",      OFFSET(listen_timeout), AV_OPT_TYPE_INT, { .i64 = -1 },         -1, INT_MAX, .flags = D|E },
+    { "listen",           "Listen for incoming connections",                   OFFSET(listen),           AV_OPT_TYPE_INT, { .i64 = 0 },           0,       2, .flags = D|E },
+    { "timeout",     "set timeout (in microseconds) of socket I/O operations", OFFSET(rw_timeout),       AV_OPT_TYPE_INT, { .i64 = -1 },         -1, INT_MAX, .flags = D|E },
+    { "listen_timeout",   "Connection awaiting timeout (in milliseconds)",     OFFSET(listen_timeout),   AV_OPT_TYPE_INT, { .i64 = -1 },         -1, INT_MAX, .flags = D|E },
+    { "send_buffer_size", "Socket send buffer size (in bytes)",                OFFSET(send_buffer_size), AV_OPT_TYPE_INT, { .i64 = -1 },         -1, INT_MAX, .flags = D|E },
+    { "recv_buffer_size", "Socket receive buffer size (in bytes)",             OFFSET(recv_buffer_size), AV_OPT_TYPE_INT, { .i64 = -1 },         -1, INT_MAX, .flags = D|E },
     { NULL }
 };
 
 static const AVClass tcp_class = {
     .class_name = "tcp",
@@ -148,10 +152,19 @@
         }
     }
 
     h->is_streamed = 1;
     s->fd = fd;
+    /* Set the socket's send or receive buffer sizes, if specified.
+       If unspecified or setting fails, system default is used. */
+    if (s->recv_buffer_size > 0) {
+	setsockopt (fd, SOL_SOCKET, SO_RCVBUF, &s->recv_buffer_size, sizeof (s->recv_buffer_size));
+    }
+    if (s->send_buffer_size > 0) {
+	setsockopt (fd, SOL_SOCKET, SO_RCVBUF, &s->send_buffer_size, sizeof (s->send_buffer_size));
+    }
+
     freeaddrinfo(ai);
     return 0;
 
  fail:
     if (cur_ai->ai_next) {