From patchwork Mon Nov 13 20:22:34 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aman Karmani X-Patchwork-Id: 6031 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp2515426jah; Mon, 13 Nov 2017 12:22:50 -0800 (PST) X-Google-Smtp-Source: AGs4zMbPT9k/tpxcwQIDSi83BqW8c/laAWWiRMbNhPaWyOxFLOQf0n5brRAjFaMXvDm8+9QLzaIi X-Received: by 10.28.126.14 with SMTP id z14mr3679200wmc.121.1510604570404; Mon, 13 Nov 2017 12:22:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1510604570; cv=none; d=google.com; s=arc-20160816; b=oZDJc5Q2Wi5q6eMpinefjNii4ZLsqQsk9Pnh/eDwSsenXCodsH0fWFlopCImQcpWQK GnL1V/O2pDkwJOrzJd08Wsvam9wVD4x5dmIM1eCnTku7IVsV71X45Uuz5Ffg05GHYZPK 7SQSFQNXqwBHul17Nzy8stl3o19KOQ1CD6OB0KfprOJlBKBBCRoc1DM/OVF118IAbL4Q HiSwfaRySVMJPz/liObXWxrMeL+bMP8HGYHZiX+m9wW9ThkSHsXylVAlXQdOzAMrtDZ+ /8yPkbT1udOuYPHKZWG0fDaxsRjMncq66JilZwBMbmthWzKmIIlnfPklXb1GZoFKZ/x9 c+hw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=M/6D49yLc/Ncil1jf2PNV0343yUDp4VFL96uBdodwLw=; b=nBLJljLyClOq5soj38aOrHn0N1gDUWXLoIcqh1y9VlhFQGZZpnR6WCG9uHCul9cOBK 1CH2zqf2QEjUwyDQGnDXf0O/I2RKaFlXzRiX2lKjU3W6sCldrM5qujG3HMo6rTGUamqb 9agmle7CBGbxutZOj3RWFBokcGM7Hl3RgbPd+bhHbw27WaYCngUU7wgS3g1uYbQi7/mG 9UGLl4WCSXcyQsNpJEkQyDn3x3aiERXY7DIHbMBWZSMHoePHocZr/0wrLspZofrqdG1q ETr9+dgYL4Ywsnp+ixx4rbj04ud0x3Ic5szjvFUJN8mgKApdhw2ezQ98qlsxs9ZuX82Y P1wg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@tmm1-net.20150623.gappssmtp.com header.s=20150623 header.b=oPyjjPEH; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id q19si12974528wrg.195.2017.11.13.12.22.49; Mon, 13 Nov 2017 12:22:50 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@tmm1-net.20150623.gappssmtp.com header.s=20150623 header.b=oPyjjPEH; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B2F0E68A5F0; Mon, 13 Nov 2017 22:22:33 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg0-f46.google.com (mail-pg0-f46.google.com [74.125.83.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8BCD368A5E5 for ; Mon, 13 Nov 2017 22:22:26 +0200 (EET) Received: by mail-pg0-f46.google.com with SMTP id o7so13530418pgc.4 for ; Mon, 13 Nov 2017 12:22:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tmm1-net.20150623.gappssmtp.com; s=20150623; h=sender:from:to:cc:subject:date:message-id; bh=eDiSHDYTvGv7jLSPphvo1l2ECBv4dYsKOPMSM3P0dtQ=; b=oPyjjPEH/eNM7MzO5O6RpIc9NEYkoKNNYj3/Q8KT21VNkTJtVM+NsBTfvsBC9Ob5hk NF/UfA2FYL/Ic5+MITYjTYyXyIqInEY8AZ+/W72QmreU7FYWcE5l9CBmn/Ovhe06q6hS zhsd7U0yhk/CNAF42xfluPXvvql5a6fBm28MIxyJ/Yopknv5pOETkUGOT2WX2G0zElUZ FmRnYC1MzDlbVUtkUPCqHhCo0jJ6fL0Ngfdmd8eOpFLsu9y0lM2iH3PSyLqeTMv/PcEy 9qrAv1FFWDkkd3VSYodEFPFQnrEnTMAallmdZ9gfRTl76cX8O6HMXtc2yNYuejURc2d4 nQjw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id; bh=eDiSHDYTvGv7jLSPphvo1l2ECBv4dYsKOPMSM3P0dtQ=; b=JhMszV8ftY4df2+VA0zo5idpD4yoI3VNqH+hzxBXuahemIEH2Xu5TrtTxh59hPd5kl dwMoDwNsNrlW0XockNLupJKAmmrGduHS0kdQL3FN9MX4tMxL1R4h36NwC7SkaHQoz4st gB6iMUSMub4WnzKoukUijot/zni4AwIr6DcqztQzv265HMq1NiUjOdOXu3Av/IX2/GT/ 7B/rYfxCBPAujKght04JHZ0l3J+nXFSJMOpJTaZgo1uCR5V2fZ5zhphxSmVuoepUTN+r ro1JU46wVhGIk80Q9biPz1hwCDwyyAk5yqhWWzTxKL/z30xKY8JO1lvwQdm0rHJeL8p2 Gdfw== X-Gm-Message-State: AJaThX51F+Aif4LvqGWmhqIF+zqWOSCYWZTJUifgy2R+R52MgiKw1wYy PtoTTaPl5UY9sI5FUsJ/DARDfdYn X-Received: by 10.84.234.199 with SMTP id i7mr9826734plt.15.1510604559413; Mon, 13 Nov 2017 12:22:39 -0800 (PST) Received: from tmm1-imac.local.net (c-73-252-174-83.hsd1.ca.comcast.net. [73.252.174.83]) by smtp.gmail.com with ESMTPSA id n77sm3727229pfh.9.2017.11.13.12.22.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 13 Nov 2017 12:22:38 -0800 (PST) From: Aman Gupta To: ffmpeg-devel@ffmpeg.org Date: Mon, 13 Nov 2017 12:22:34 -0800 Message-Id: <20171113202234.94828-1-ffmpeg@tmm1.net> X-Mailer: git-send-email 2.14.2 Subject: [FFmpeg-devel] [PATCH] avformat/tcp: enable TCP_NODELAY by default X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Aman Gupta MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Aman Gupta --- libavformat/network.h | 1 + libavformat/tcp.c | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/libavformat/network.h b/libavformat/network.h index f83c796a95..b78e3ad6ed 100644 --- a/libavformat/network.h +++ b/libavformat/network.h @@ -59,6 +59,7 @@ int ff_neterrno(void); #include #include #include +#include #include #define ff_neterrno() AVERROR(errno) diff --git a/libavformat/tcp.c b/libavformat/tcp.c index 07b4ed9fa3..419eed1d02 100644 --- a/libavformat/tcp.c +++ b/libavformat/tcp.c @@ -41,6 +41,7 @@ typedef struct TCPContext { int listen_timeout; int recv_buffer_size; int send_buffer_size; + int tcp_nodelay; } TCPContext; #define OFFSET(x) offsetof(TCPContext, x) @@ -52,6 +53,7 @@ static const AVOption options[] = { { "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 }, + { "tcp_nodelay", "Use TCP_NODELAY to disable nagle's algorithm", OFFSET(tcp_nodelay), AV_OPT_TYPE_BOOL, { .i64 = 1 }, 0, 1, .flags = D|E }, { NULL } }; @@ -148,6 +150,9 @@ static int tcp_open(URLContext *h, const char *uri, int flags) if (s->send_buffer_size > 0) { setsockopt (fd, SOL_SOCKET, SO_SNDBUF, &s->send_buffer_size, sizeof (s->send_buffer_size)); } + if (s->tcp_nodelay > 0) { + setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &s->tcp_nodelay, sizeof (s->tcp_nodelay)); + } if (s->listen == 2) { // multi-client