From patchwork Sun Dec 1 13:18:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 16508 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 4F37F44ADC6 for ; Sun, 1 Dec 2019 15:18:29 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 283BB68AE8B; Sun, 1 Dec 2019 15:18:29 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f177.google.com (mail-pg1-f177.google.com [209.85.215.177]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C36D468ACA3 for ; Sun, 1 Dec 2019 15:18:22 +0200 (EET) Received: by mail-pg1-f177.google.com with SMTP id k25so1142062pgt.7 for ; Sun, 01 Dec 2019 05:18:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=7ZdcaCWRcELq7IISa5ymjWL4Ek1AFDZoKKh1N4y9/jo=; b=Czyumx0Qhsa5pfYHaH/kYhdfaN7+mDt+ymuPNLUu/IT95XPxfUUtrjSsddALoOOvaO 2RtbyljKlW3xfL4dRmKlEoMUiNbTufWLn4wZwC7z0rDvJpbwbHc4erCHSbqyFRLYapCN yiXj2wUqMXpZclRoyhEkvRdli8kYNlT+s58fg7AHCMf3zkgyagcWwFlfdbOiF3Ish1oM uNxY6iaScmHPm4PVJuqZF1JgclK8/ZL4s3+nnkSb8Sobmhn2ZjrsPKdiCdlkeOG668Qd BsCZrvVFeTx4dj7St+BmZ67dbs/USb5UrC1J6ywy+aSEJMYv80vnXxaf+VYGKgTpYxPr lyyA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=7ZdcaCWRcELq7IISa5ymjWL4Ek1AFDZoKKh1N4y9/jo=; b=sCXtODBy7apRkF9iHmxc9MFUerpZNyh+pyO1OdIG7/kW0vZuxJ4SB36WFDKc6ok59N ZPJ+6ESF7nZtdvgjSbbuJhmX/HiIvx7FIOikOIs2ZV7FtkYUADvo8kn+fi7lEwtzcxAz 9YRHXqMwWTvK1x7THMg4Ud6+Ijf2qTi++hMNWvfsh5mXnSPpB3vMyry/g/M+gGSeExf1 cxGOp5LKQ9+kWv1egQ6MBXZVkTGsYYlJicvgNeuVZwnxfje2aVwztLQ16LyD3a/URg6G 3/Fo+HaGm5bRfN1d5zLFI8eOJznIc/flbcWuPJeE6JTJ0D0DoFkceE1NtRm4ooh1MI5j SyfQ== X-Gm-Message-State: APjAAAUktQaLQ6cFMOgBLRIUwxdq+mzbMXSVAKolhzGWbxXQh2CP+z2F HMvJHXtm+Yz/uJ4NBFJ0AlxrGvRW X-Google-Smtp-Source: APXvYqxDPUiDYp4/qSYDmy9TVyvMamdKgAVAGneVpV7siJWtwO6TtiRBZpVjfQi0Tb3IYwPdIynVPA== X-Received: by 2002:a63:2783:: with SMTP id n125mr26563580pgn.431.1575206300645; Sun, 01 Dec 2019 05:18:20 -0800 (PST) Received: from localhost.localdomain ([47.90.47.25]) by smtp.gmail.com with ESMTPSA id a15sm12681461pfh.169.2019.12.01.05.18.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 01 Dec 2019 05:18:19 -0800 (PST) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Sun, 1 Dec 2019 21:18:15 +0800 Message-Id: <1575206296-9515-1-git-send-email-mypopydev@gmail.com> X-Mailer: git-send-email 1.7.1 Subject: [FFmpeg-devel] [PATCH 1/2] lavf/libsrt: add linger parameter to libsrt 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: Jun Zhao MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Jun Zhao add pkt_size parameter to libsrt, it's setting he number of seconds that the socket waits for unsent data when closing. Signed-off-by: Jun Zhao --- doc/protocols.texi | 4 ++++ libavformat/libsrt.c | 13 +++++++++++++ 2 files changed, 17 insertions(+), 0 deletions(-) diff --git a/doc/protocols.texi b/doc/protocols.texi index 0e18a49..f34f246 100644 --- a/doc/protocols.texi +++ b/doc/protocols.texi @@ -1426,6 +1426,10 @@ the overhead transmission (retransmitted and control packets). file: Set options as for non-live transmission. See @option{messageapi} for further explanations +@item linger=@var{seconds} +The number of seconds that the socket waits for unsent data when closing. +Default is -1. + @end table For more information see: @url{https://github.com/Haivision/srt}. diff --git a/libavformat/libsrt.c b/libavformat/libsrt.c index 1c34ec5..0a748a1 100644 --- a/libavformat/libsrt.c +++ b/libavformat/libsrt.c @@ -84,6 +84,7 @@ typedef struct SRTContext { char *smoother; int messageapi; SRT_TRANSTYPE transtype; + int linger; } SRTContext; #define D AV_OPT_FLAG_DECODING_PARAM @@ -128,6 +129,7 @@ static const AVOption libsrt_options[] = { { "transtype", "The transmission type for the socket", OFFSET(transtype), AV_OPT_TYPE_INT, { .i64 = SRTT_INVALID }, SRTT_LIVE, SRTT_INVALID, .flags = D|E, "transtype" }, { "live", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = SRTT_LIVE }, INT_MIN, INT_MAX, .flags = D|E, "transtype" }, { "file", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = SRTT_FILE }, INT_MIN, INT_MAX, .flags = D|E, "transtype" }, + { "linger", "Number of seconds that the socket waits for unsent data when closing", OFFSET(linger), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, INT_MAX, .flags = D|E }, { NULL } }; @@ -340,6 +342,14 @@ static int libsrt_set_options_pre(URLContext *h, int fd) ((h->flags & AVIO_FLAG_WRITE) && libsrt_setsockopt(h, fd, SRTO_SENDER, "SRTO_SENDER", &yes, sizeof(yes)) < 0)) { return AVERROR(EIO); } + + if (s->linger >= 0) { + struct linger lin; + lin.l_linger = s->linger; + lin.l_onoff = lin.l_linger > 0 ? 1 : 0; + if (libsrt_setsockopt(h, fd, SRTO_LINGER, "SRTO_LINGER", &lin, sizeof(lin)) < 0) + return AVERROR(EIO); + } return 0; } @@ -591,6 +601,9 @@ static int libsrt_open(URLContext *h, const char *uri, int flags) goto err; } } + if (av_find_info_tag(buf, sizeof(buf), "linger", p)) { + s->linger = strtol(buf, NULL, 10); + } } return libsrt_setup(h, uri, flags); err: