From patchwork Fri Jun 4 07:01:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 28081 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp820029iof; Fri, 4 Jun 2021 00:01:52 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxiDQfWVWzAs7RXslbhVa4yjPGDqjTuNPNHuxxnOZwDDOo+fsDa815AlX6Sfmkr3qEflrTt X-Received: by 2002:a17:906:3d9:: with SMTP id c25mr2891417eja.63.1622790111906; Fri, 04 Jun 2021 00:01:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1622790111; cv=none; d=google.com; s=arc-20160816; b=EzNilwGno5GOCH1sspOQl5RWLgBm7BsXNleFCN2bfSNAvbmO0fXCcB8R+OL2hr/MCm PTUBTAwx26AhMe7UIgEr9OBVr2ulC1vSn/DGuSqazM2aq20icvaniubOsMrAlzZd1DgY ji6BD6fokjx2/p1R9DCHaIUe9co5vR3yUOgr1j5pYOCqGB/9OmGb7qS1iCkQJsLcJBhD WAWnlR5Vk3UeYIMOaeOib4jnTZ7Xn68dQ9oVlRD0NPNF+XUl6cwoR4bxAD/B7yFuHKUA 6+6nLzJvG124kbrnend97aYrMvT+YAfUmFsbWLh7AM7+ZTY9mewXdlkCiR145E1t0Gc5 +BIA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:date:to:from:message-id :dkim-signature:delivered-to; bh=ZPuKe+TnbIJRcj/V0zC6xt8EIKaknhaXcNSkchStTpI=; b=qCL1ajMVqJCbTyvBZLVGkIf1jjz80XAVoa1QxzDgnW8z3bFsMGugdDDCtA1P3sCp4g ltld08rT8FHR0RHdPpRttrY91DYFx9vS5aZJGk3wM9p4OVr3hKn02pm/LNwXg/xn7e2O QF8Ct0xWHkF/3ZbmU1rn2+XBv51Uzkk7UAkWQ6HEg2UTJDQ/DW1PZaWadQKpyW5/wVba caj42K5r6s5I7RUV99+tx6m+mOb/IuHmP6oLwaDaX6jth+W+gb4wuACzWViWS4TAbyOq 1BqWawaa+ioCieIcA81D5Ffwr7T5vvNEaBumsUjH2oXnQALcBfV5Na+0pbgzdvqu5XYW pmrw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=es8oLZDi; 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=NONE dis=NONE) header.from=foxmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id d11si3693423ejo.629.2021.06.04.00.01.51; Fri, 04 Jun 2021 00:01:51 -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=@foxmail.com header.s=s201512 header.b=es8oLZDi; 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=NONE dis=NONE) header.from=foxmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B1FC868A307; Fri, 4 Jun 2021 10:01:47 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out162-62-57-137.mail.qq.com (out162-62-57-137.mail.qq.com [162.62.57.137]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 69FE5689246 for ; Fri, 4 Jun 2021 10:01:40 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1622790096; bh=MvCkVX94cRbIgVu7ak74tVLgl75OYrVAWeFIwO++ERw=; h=From:To:Cc:Subject:Date; b=es8oLZDiNwXC7fLuiSH74PpAbAwuR4hiFerIsZnoMY0uyKQLLP3evv+t27dd+d/SS lAtdvAE61IXn+10ymDvsR+JA+OWkH3nLkoSgZ/XRVhqXZKDrrkj/6DlvvxDEcojldN 8CJ1lQCKQsxww9WHi/WK7ZgFmAWyuAFG8CFUEdL0= Received: from ZHILIZHAO-MB2.tencent.com ([113.108.77.57]) by newxmesmtplogicsvrszc6.qq.com (NewEsmtp) with SMTP id 6307EE9; Fri, 04 Jun 2021 15:01:35 +0800 X-QQ-mid: xmsmtpt1622790095tjmlk44sq Message-ID: X-QQ-XMAILINFO: N2pVADwlTVCg/O3zNbj0t+Ghls38rbyicceyUv+QZHuQiJZnb7L/jYPFcDa7jL w30lHjjOeO+1yXQ6kxf7v0tNzvZL4XlmdN1U9cncZJ1x2El23Eg3+RA8XpXXwtVELg1MeL2ssYRv yjPVpbdfefDZbmInWLZCEYfQSJ+0Fw+C7X6XwtNhHoFEhtjiJb6qqRiZ4ULMcneAXce88iZL2u4L Q9XtsKMECTnVrybhV/OYBNJIaDHuex/SHd7zfo2n8BLoJVL/RaSphZ0muOMv6iEI/M5Qizclxc3F p53BWPnsdLC3xpGL+LgTRQl5Wq1EDKTD8mn5jknPzHcfIFHkrVEeosE6oXSfHqYqLHf+OGEGhZ0p Gw6bunoiUYx409X31iDPt1w4M0Qb5gSEG05Jldd5posuiZrB0vC0axIL0mAs1BiBEPbHe/eMGb+j 36j4NazIsgQCILfvvrw8uLa/V50FJBduRkwIhDn7CYmykyecaQiw1PUER13IvLwszZfb8UV4aGoS 3CMnmCE4Dw9xag6DyQa9alfnRJCf9YtntbODCSre1zlOtoUDRgX7I60jclmT4I16tqM+KLCFyFio WaHjA2+PlYFDYU/wPHKK9IbZaHSBsNrCHSutZ4T2JQiBtRIsPu16zTOdptI+ZQmAlroAtLixptFW 0DofRc6cwSQEznh/giKm5XmQJ9uC8C1/UlRtmGP5DrRpdaLnW9dZlpFg3OTq/P5AFyR63kDvd+5S UwWog29F7GI5x+KBg8Kkm3qhB2peM4w+XF/l0lADyuGZi4eQEHAGXwIzSlin1iehumPFeqnyoEqN l4gyUA7Z7UEmg1jit778W/VUKPFv1egRXKbizY8wyMVlydtlKCBw9f5+cUa3Uy4T0= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Fri, 4 Jun 2021 15:01:34 +0800 X-OQ-MSGID: <20210604070134.82952-1-quinkblack@foxmail.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat/libsrt: workaround conflict with ffmpeg cmdline option 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: Zhao Zhili Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: V6j41FtSQA8n Add 'srt_streamid' option as an alias for 'streamid'. --- doc/protocols.texi | 3 +++ libavformat/libsrt.c | 1 + 2 files changed, 4 insertions(+) diff --git a/doc/protocols.texi b/doc/protocols.texi index 8371f83059..8b21ce046e 100644 --- a/doc/protocols.texi +++ b/doc/protocols.texi @@ -1558,6 +1558,9 @@ This option doesn’t make sense in Rendezvous connection; the result might be that simply one side will override the value from the other side and it’s the matter of luck which one would win +@item srt_streamid=@var{string} +Alias for @samp{streamid} to avoid conflict with ffmpeg command line option. + @item smoother=@var{live|file} The type of Smoother used for the transmission for that socket, which is responsible for the transmission and congestion control. The Smoother diff --git a/libavformat/libsrt.c b/libavformat/libsrt.c index 6ea6c35c53..afbf01fc87 100644 --- a/libavformat/libsrt.c +++ b/libavformat/libsrt.c @@ -134,6 +134,7 @@ static const AVOption libsrt_options[] = { { "lossmaxttl", "Maximum possible packet reorder tolerance", OFFSET(lossmaxttl), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, INT_MAX, .flags = D|E }, { "minversion", "The minimum SRT version that is required from the peer", OFFSET(minversion), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, INT_MAX, .flags = D|E }, { "streamid", "A string of up to 512 characters that an Initiator can pass to a Responder", OFFSET(streamid), AV_OPT_TYPE_STRING, { .str = NULL }, .flags = D|E }, + { "srt_streamid", "A string of up to 512 characters that an Initiator can pass to a Responder", OFFSET(streamid), AV_OPT_TYPE_STRING, { .str = NULL }, .flags = D|E }, { "smoother", "The type of Smoother used for the transmission for that socket", OFFSET(smoother), AV_OPT_TYPE_STRING, { .str = NULL }, .flags = D|E }, { "messageapi", "Enable message API", OFFSET(messageapi), AV_OPT_TYPE_BOOL, { .i64 = -1 }, -1, 1, .flags = D|E }, { "transtype", "The transmission type for the socket", OFFSET(transtype), AV_OPT_TYPE_INT, { .i64 = SRTT_INVALID }, SRTT_LIVE, SRTT_INVALID, .flags = D|E, "transtype" },