From patchwork Sun Oct 10 03:17:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 31017 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2084:0:0:0:0 with SMTP id a4csp2416844ioa; Sat, 9 Oct 2021 20:17:45 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz6sMtAVY92B64hyDh7mivH/tfE4jzUCo+g5KyMaS/LDDO3RJ2R8iP9mkW2+3L/2lEjhYIV X-Received: by 2002:a05:6402:350c:: with SMTP id b12mr29339455edd.244.1633835865042; Sat, 09 Oct 2021 20:17:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1633835865; cv=none; d=google.com; s=arc-20160816; b=VD1k9s5X2UOdBv0ILyVJI1WghJypbTQdw+tzCb9WHb8JFXN4KOp6h2Gf43CmFXletv m6svF3hvP3e8PB2Mu88Hm97S67p9k8+6VWxcThICrJ+9q4Z/AzLZOO1fnnvgZ4A4p5kr TgLWISc3wOaYBUUSp+DADZpGni+YTR1qzxTil6N/qxkq6mPdbm/LX0//yGA0IpLSj9nB j29NvUVwAx6H9q64re/eqCrCvbz0sL0w1aPFw0k8qHiy3QBRh1HuxzD75lADv7za6fLm c72m5jEdDsvxiBu5Vz//Iu+1r7G5+gjTlKU6RpF/PiVPz10gUlmM3FR77KcaLLjqljZC ADIg== 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=6wNtURiPoHyxtVWSHgOej6NqPtZBM2dNFTd2fKDSYsQ=; b=fBJcE13HKhxulj8wJl6NSJfysBfyiYb6UiaeD/n9b31gJZD6vqFEV7dC2GvCiN/chD IeNhDqBmyahr/ICX8+89GGfdzanB+OP6OnXtaTgR1+bxGvyDTMteiDCz9Zo7aFUnkB1k YB9oo/1ugF7Uw/ezthBJtCLgSSy49ywDxyJ/JdDfUD6APT7KA34cVHKvRmafiw7pnOCl i05l4Iv5cglFSBrOugl7vz0WeeKKSuq8Tzy0Nl5JphObWywyynoRGpJsD7myG3wMwSwZ 0cZoteztrI330j95Ugft583vfWY9Dov8Sm/+9fU8/SCNWwhJHrFwS82CQ7NXpCAiot2P MRtA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=OglqNM8I; 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 q19si6194328edv.394.2021.10.09.20.17.44; Sat, 09 Oct 2021 20:17:45 -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=OglqNM8I; 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 11478689F4F; Sun, 10 Oct 2021 06:17:41 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A733D689F4F for ; Sun, 10 Oct 2021 06:17:34 +0300 (EEST) Received: by mail-pl1-f171.google.com with SMTP id c4so8823464pls.6 for ; Sat, 09 Oct 2021 20:17:34 -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=ZL8yqru/vaNBHohA78Ryz58J3wWe4BZMAKyYJa1uC8I=; b=OglqNM8IvXF4t7/A5bqzpXaPl4NExKXvkkeQQdpbTtTNcSAzbkvzw0BggoG/loNB0s RLO13Xg17GeZ0Ga/y61+BtdgldSD0rA1WKpUZx+S8TVqGeDW2bJehJf7sG1dSOy9vHJu MHrWm+vgata8QoTqaK/sli1JqKukuC4wO8i7CgadL74yceeVjA//DA3HRx4kiuhTQzaN asOdb98xg05DFsYcH1iHw49ScBd0/ZI66sKW1vb9OrzzyUoOmDscQ9j7h2o5BMlyhcr8 vytlEnPpEn3bFQD3nE3jd9FClBJIIwRO+xhM1/b9EcZpew5a39Fg/Fq+ld0wDz4G3z7Z v/Og== 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=ZL8yqru/vaNBHohA78Ryz58J3wWe4BZMAKyYJa1uC8I=; b=kWNxYxipY/HC+BtQIYptRBArJp1ggJaUYRIvsyzoNLMnjsa/Fg/I/PSds2d/YzveaY Xh9+KH8aGDL7GKJhKo1nIxm7iWJZ/3rjJnwvHPUIr+W8NlESXR96dHfARBKuTTIsoR54 1/vpml1i60/f9DPaAaDRLSXqaLS3cERL/n7toUzocOj49iJPnkMee8hTsMkP8SboYrnx veRk+cAEVnCQnRKiMR+y5xiL//6mV5EDa/Fu2ZdpAksDEjHisPjwYiuMERHLOBSX0ECR cQBdVEt9Acr6Dx/u+V4MCwsZADoR54947AWwfUD6xiJ708cINnZqZ/IF4jY/4ei4FhbP KN4w== X-Gm-Message-State: AOAM531dByN+wLaYW3g0BtXAgjQGAtVd3beK7IcqqDxFwVqKraBetYJu iIl60vOI0RA4CGL1YW+7ApGesX66lhQ= X-Received: by 2002:a17:902:6e02:b0:13a:41f5:1666 with SMTP id u2-20020a1709026e0200b0013a41f51666mr17493879plk.39.1633835852741; Sat, 09 Oct 2021 20:17:32 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id v6sm3384221pfv.83.2021.10.09.20.17.31 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 09 Oct 2021 20:17:32 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Sun, 10 Oct 2021 11:17:27 +0800 Message-Id: <1633835847-16243-1-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1632964440-24060-5-git-send-email-lance.lmwang@gmail.com> References: <1632964440-24060-5-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v2] 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: UaWI+Ho/kHW+ From: Limin Wang Signed-off-by: Limin Wang --- doc/protocols.texi | 9 +++++++++ libavformat/libsrt.c | 7 +++++++ 2 files changed, 16 insertions(+) diff --git a/doc/protocols.texi b/doc/protocols.texi index 726e5f1..7951abb 100644 --- a/doc/protocols.texi +++ b/doc/protocols.texi @@ -1496,6 +1496,15 @@ 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. + +Default is -2 which typically means it's unset and use the +the default by libsrt(Default: 0 in Live mode, -1 in File mode). + +Special value -1: 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..c2e633b 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 = -2 }, -2, 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 > 0 ? s->snddropdelay / 1000 : s->snddropdelay; 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 >=-1 && 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);