From patchwork Thu Sep 30 01:14:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 30666 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp149958iob; Wed, 29 Sep 2021 18:15:03 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx1KpN67ezIBT7Buq6j5yy25QUfyNc9ZQ2TLhoo1kMgYKz5TdepAthKZiOkfsGTPCj5VviK X-Received: by 2002:a50:d88d:: with SMTP id p13mr3787176edj.142.1632964503140; Wed, 29 Sep 2021 18:15:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632964503; cv=none; d=google.com; s=arc-20160816; b=R+rh2lGZ8WsgRSBWhHdK1WQz3Dt920SdZdxP41VoYG3v9MPIuJE8YViRK24Pea0q6+ TXLA2gx6KUW2BzcNhfw1WQI6pYLWcaER5wAgZL6iqkVZ565673doUNvVufOp104zfYuu p3F9JAwmVaYdJ0doghPQi59Y5qVTrsE18b81Q+LJuKMROHLP+LtXDbY2sNF6pQ06JU6J qFgYbBXBe5jU2nxJbGURt9PzwjbEJHdCE1JrJVWyRfD9NgDb7INsgnVBGt+e/BZAOohS 9FzrpTM2rlimnqQt73QRBWB92EYi6m/CjjPvieehgwpC43mQvktavP3sKk36W9YUQWlc s0Dg== 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:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=Z6LwYVp8RdeTU+qPlG8g2c12Fv7/g2DMSiZO74qAClE=; b=uJFuuNthXPp6Ffl2qtgSFcf1D2bgeGkImUESYfkKU1Ht/6cgqpX1v8QoLzGb/mBgqM 0mIllE+W0vyRge8g1gpZp17U3gXDwVBriIEIrx/gWMZuMGNAJXd+HKSyAnEar2Y9htj/ leMN3351QMvigj0iwZfuGCHvEGZ/MGZfSgZjmWTJuIQGJRgL57owf7Sg+rw9RF73tII0 Lm+U0sSAYxTFqlnQkAGUVsQ/gdFy7u2SG2gxWo/fO/QodGKzuMZUyv9/fFyF+WQL402v pZJTzuVdpZzRRNsYQ9OWUWH8lnB+uakr3XYS9HCj/mgf9u25kFQQBeYoi1QxS6kaynvx Bhbg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=c9ELpy7r; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id n2si2191041edi.258.2021.09.29.18.15.02; Wed, 29 Sep 2021 18:15:03 -0700 (PDT) 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=@gmail.com header.s=20210112 header.b=c9ELpy7r; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5EBB368A6EA; Thu, 30 Sep 2021 04:14:19 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f169.google.com (mail-pg1-f169.google.com [209.85.215.169]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8190E68A67E for ; Thu, 30 Sep 2021 04:14:10 +0300 (EEST) Received: by mail-pg1-f169.google.com with SMTP id 75so4574919pga.3 for ; Wed, 29 Sep 2021 18:14:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=kwud13N3gb3AQ5OcnAxUG/4yHZH6SWMivzNnfjG22pU=; b=c9ELpy7rn79jrk+INOXDOmbekCoksg8tMdQmW1ByPiyJK6ciSEfSe9nr45CVcjXCRv NfcvzcOtuE15nNaHmyZ7AXpGu8QjIaU5utgVlNxTeqpY/9zglk0JaKj8RfB6YcyqP8CQ ji79f0L7WUgkcSBqXLSt8H7OWu1rlICRgUoeJhCLWNYoJCXTLAblihrWQWR4qT+BFAJx Dr/favsLqJuReOfsgAoZQNKRsy0XwaRUXyGnWU8aR3sXsHd3AUhsrCPoP+EA1HTRPC9B ROqjrXPcQZZZ/9mPFD81B3LUUzSgAJVFGw/L2ITU46J4HVSRBEG5SVVLEokk9wl744lj kWGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=kwud13N3gb3AQ5OcnAxUG/4yHZH6SWMivzNnfjG22pU=; b=2nBTE746Xm0dDcA5Nr0MXeqGoKmT3hoUBHMH2gyyIV/js8g3tPxRyLNgaHM7ucc/F4 f6vv3lIMzsh1NMaQ0xpYJdFpGeUj6py+mDOMSrEuN0NGtklgtwWSGGDCmuKzwB5NyKEf 81+nRf29VDkV90cWnn1xbf9ic7yLf3Z/WwVoWbHV7+6VOWsX07w9PRJskeAuoO5MbSDJ CnBu333rodbfkmypUQnoA0EFu1Jf9PwhZceDybzLAuEyVsSDGkl+PiTAx6ROSrkLVoUt vkfhDcjsfyNaZGMD/2gEFJtXIrpTT8hcIYJDufk5gXQ7gUwfZkBQQm3z35rXEYovuDAe 2Jzg== X-Gm-Message-State: AOAM530dFtrDmim5v0f2jIs9EGpIhtnZ43i+YTg446Qu9XMczuPRJtI9 9UKjkZQlOSHhqPuui0pO4l1B2iN+lYI= X-Received: by 2002:a65:44c5:: with SMTP id g5mr2566181pgs.39.1632964448721; Wed, 29 Sep 2021 18:14:08 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id o12sm778666pgn.33.2021.09.29.18.14.07 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 29 Sep 2021 18:14:08 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 09:14:00 +0800 Message-Id: <1632964440-24060-5-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1632964440-24060-1-git-send-email-lance.lmwang@gmail.com> References: <1632964440-24060-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH 5/5] avformat/libsrt: add snddropdelay parameter for srt X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: Ne9+6TEBbE8T From: Limin Wang Signed-off-by: Limin Wang --- doc/protocols.texi | 10 ++++++++++ libavformat/libsrt.c | 7 +++++++ 2 files changed, 17 insertions(+) diff --git a/doc/protocols.texi b/doc/protocols.texi index 726e5f1..9c246f8 100644 --- a/doc/protocols.texi +++ b/doc/protocols.texi @@ -1496,6 +1496,16 @@ when the old encryption key is decommissioned. Default is -1. -1 means auto (0x1000 in srt library). The range for this option is integers in the 0 - @code{INT_MAX}. +@item snddropdelay=@var{microseconds} +The sender's delay before dropping packets. This delay is +added to the default drop delay time interval value. +Keep in mind that the longer the delay, the more probable it +becomes that packets would be retransmitted uselessly because +they will be dropped by the receiver anyway. + +Default is -1 means auto which typically means do not drop +packets on the sender at all. + @item payload_size=@var{bytes} Sets the maximum declared size of a packet transferred during the single call to the sending function in Live diff --git a/libavformat/libsrt.c b/libavformat/libsrt.c index c6308d1..13697d2 100644 --- a/libavformat/libsrt.c +++ b/libavformat/libsrt.c @@ -65,6 +65,7 @@ typedef struct SRTContext { int enforced_encryption; int kmrefreshrate; int kmpreannounce; + int64_t snddropdelay; #endif int mss; int ffs; @@ -111,6 +112,7 @@ static const AVOption libsrt_options[] = { { "enforced_encryption", "Enforces that both connection parties have the same passphrase set", OFFSET(enforced_encryption), AV_OPT_TYPE_BOOL, { .i64 = -1 }, -1, 1, .flags = D|E }, { "kmrefreshrate", "The number of packets to be transmitted after which the encryption key is switched to a new key", OFFSET(kmrefreshrate), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, INT_MAX, .flags = D|E }, { "kmpreannounce", "The interval between when a new encryption key is sent and when switchover occurs", OFFSET(kmpreannounce), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, INT_MAX, .flags = D|E }, + { "snddropdelay", "The sender's delay(in microseconds) before dropping packets", OFFSET(snddropdelay), AV_OPT_TYPE_INT64, { .i64 = -1 }, -1, INT64_MAX, .flags = D|E }, #endif { "mss", "The Maximum Segment Size", OFFSET(mss), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 1500, .flags = D|E }, { "ffs", "Flight flag size (window size) (in bytes)", OFFSET(ffs), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, INT_MAX, .flags = D|E }, @@ -318,6 +320,7 @@ static int libsrt_set_options_pre(URLContext *h, int fd) int latency = s->latency / 1000; int rcvlatency = s->rcvlatency / 1000; int peerlatency = s->peerlatency / 1000; + int snddropdelay = s->snddropdelay / 1000; int connect_timeout = s->connect_timeout; if ((s->mode == SRT_MODE_RENDEZVOUS && libsrt_setsockopt(h, fd, SRTO_RENDEZVOUS, "SRTO_RENDEZVOUS", &yes, sizeof(yes)) < 0) || @@ -334,6 +337,7 @@ static int libsrt_set_options_pre(URLContext *h, int fd) #endif (s->kmrefreshrate >= 0 && libsrt_setsockopt(h, fd, SRTO_KMREFRESHRATE, "SRTO_KMREFRESHRATE", &s->kmrefreshrate, sizeof(s->kmrefreshrate)) < 0) || (s->kmpreannounce >= 0 && libsrt_setsockopt(h, fd, SRTO_KMPREANNOUNCE, "SRTO_KMPREANNOUNCE", &s->kmpreannounce, sizeof(s->kmpreannounce)) < 0) || + (s->snddropdelay >= 0 && libsrt_setsockopt(h, fd, SRTO_SNDDROPDELAY, "SRTO_SNDDROPDELAY", &snddropdelay, sizeof(snddropdelay)) < 0) || #endif (s->mss >= 0 && libsrt_setsockopt(h, fd, SRTO_MSS, "SRTO_MSS", &s->mss, sizeof(s->mss)) < 0) || (s->ffs >= 0 && libsrt_setsockopt(h, fd, SRTO_FC, "SRTO_FC", &s->ffs, sizeof(s->ffs)) < 0) || @@ -549,6 +553,9 @@ static int libsrt_open(URLContext *h, const char *uri, int flags) if (av_find_info_tag(buf, sizeof(buf), "kmpreannounce", p)) { s->kmpreannounce = strtol(buf, NULL, 10); } + if (av_find_info_tag(buf, sizeof(buf), "snddropdelay", p)) { + s->snddropdelay = strtoll(buf, NULL, 10); + } #endif if (av_find_info_tag(buf, sizeof(buf), "mss", p)) { s->mss = strtol(buf, NULL, 10);