From patchwork Thu Jun 3 10:37:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Ilinykh X-Patchwork-Id: 28064 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp30560iof; Thu, 3 Jun 2021 04:02:33 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyhxyPr1ZJ3BM0uum5Wy38XLhwgslG0MaCeYq8EsaJby634v+7wQ8ZrdYEZ1FZj6MJxO/er X-Received: by 2002:a17:906:26db:: with SMTP id u27mr39121131ejc.532.1622718153079; Thu, 03 Jun 2021 04:02:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1622718153; cv=none; d=google.com; s=arc-20160816; b=SAZaS9FRPXuKE+s+RLht5vj0he+NmuJA9tTh3NbBW3WQDIhCz6x9uBTg091OirvDPN lGU+29KVef7ttDqidnfcSVbY3ak8Z6QLEWNd653bvKARMEul95QIJ0luKzQR8PVaTmhA yeebkSieh1REhBPaTU4hE36VKmF0LjPybAHLGGymSDFcJs+x5LhsmI/60unaP7JEXeeo emx/6uX/ktGGJkvUOYtktKvrxW/xM4WZfECr18Z3Oay/gA/R3LGxVlOo7fe0AONZjcCx 23bNZj675Dhi4etELaWt0qr6cH5Zvj8XuHcFHCLtlnwoKJwSLpBd1i6W3jwILS06EB/g JKig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject:to :message-id:date:from:mime-version:dkim-signature:delivered-to; bh=xfbtfKlBtbEXAfe3Euxi/XkmUKxOQot4WvXFFwQN/EA=; b=gIDhtQdrtpC1eqWiCu3o+f/RMwWpMBLAPtwD3dmhg98Qv1Xuwn+sCTo95j5GE+t8Pk UcoZbu23kDkXUo57ZtFjqpGNufYLiYkijn1ke0Z1TiUZZM0qpcmBwmw4drNjNy7m8MAs CablAHHp7KvSor7DnGwO6W5DCtjWRs9HFAQQ8tQr+H1/Hf1pL2Dttgalk4aS6rgSw05I y10XVE5FtTiPtlJpko1c9qqQ5w2yMWbU3/gQdDyiqAoXYAQrGNuY9IW9+vs9KYPYphgR IFAlTcWN/wSVaW7kvo3NwmUvdWfa9BseAvnutMNmvCPvpx4ehsjxiaetxyevI4Myqu6M cKhA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=lp+OZi2r; 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 g3si2223445edv.12.2021.06.03.04.02.31; Thu, 03 Jun 2021 04:02:33 -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=20161025 header.b=lp+OZi2r; 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 A37CF689EED; Thu, 3 Jun 2021 14:02:27 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f54.google.com (mail-ed1-f54.google.com [209.85.208.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 704E5689E61 for ; Thu, 3 Jun 2021 14:02:21 +0300 (EEST) Received: by mail-ed1-f54.google.com with SMTP id u24so6558596edy.11 for ; Thu, 03 Jun 2021 04:02:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=nuoV1N9CRQCXMz5laU4j0qf5Io2zdl8EeSE9Lxa/WpY=; b=lp+OZi2ryX03bwyEuKWM9yiMRVDYRf6U8VlGUkkEeMDwTvjWxlk3uNNje3gjMFl8fm Du04yfj69egYhlGZEvqhrWkAQl9GyRApCEVWv/ARQzB5bXnqJZ/HnzFvK2xjg6JkTDtM SgBz5adN/i8HhhPzg6i+7xVlm3Q4vnufFn/1QgiLecjZJWin8QrF1mccuE9G/KJGKgQx uwL21yz4Sf9r4VwHYLGkiS7dd74wTayYAy1CfXukXtH8IJPhIPzQHRj6hIyE29dSk8xt UsPDFIk48V/gEpIfzscPXB1xfwnUO5bV3j8BFgVKuGKTc1hrBZWVRHz0TJ56+DZKR+5s lvcw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=nuoV1N9CRQCXMz5laU4j0qf5Io2zdl8EeSE9Lxa/WpY=; b=IRcnVVSrxqWtuvtU8Qi46ixqPmF4RA5PNk34x0k3It7tRCwtynr1IinofaaUkMZnfq rB8EXIe6UCiB/5hHygNdZxScYj4WzMktiBCxELlt3Jov2io0p3cdpG7de52tfJ+jUfHK 4yiD1iaBRabVxpxGdWKV/FnM3mcNI1zo6H1nUtb6bz5pn4h5oOu+NYCOIBeTtBELxPJB yKd7dDIe7u7pz9dKis2n2V0Oq4w4m7LAD4u8Tf/kVkGLe/C2xbgKD/TgduFWMiHbIeS9 O2ttTzX+qUC9Xo35/uTKt8jLmB0vQULwightuaXgaceyB/2rAauMsc3QLSSTgqtMRDlV t7ew== X-Gm-Message-State: AOAM533iSsMGMKrlEz60kpSFA8FGOscwb8RAr6kM8b1kyvhyBdsJSgvt eelKSFvyUvts8gVmQlnQSsaSCJrBbZ1Xnlx3S++h5Sj2xKc= X-Received: by 2002:a2e:90cd:: with SMTP id o13mr6185689ljg.248.1622716637016; Thu, 03 Jun 2021 03:37:17 -0700 (PDT) MIME-Version: 1.0 From: Sergey Ilinykh Date: Thu, 3 Jun 2021 13:37:10 +0300 Message-ID: To: ffmpeg-devel@ffmpeg.org X-Content-Filtered-By: Mailman/MimeDel 2.1.29 Subject: [FFmpeg-devel] [PATCH] Rename SRT's streamid to srt_streamid to avoid a conflict with standard streamid 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: ZIAPdetE5Vi4 Default streamid is some numeric value and not used by SRT code. Instead SRT has its own string streamid. Current code has the same option name for both and this causes a conflict when ffmpeg is started from a terminal. The attached patch fixes it by renaming SRT's "streamid" to "srt_streamid" Best Regards, Sergey Subject: [PATCH] Rename SRT's streamid to srt_streamid to avoid a conflict with standard streamid option --- libavformat/libsrt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/libsrt.c b/libavformat/libsrt.c index c1e96f700e..10dfc9e9c9 100644 --- a/libavformat/libsrt.c +++ b/libavformat/libsrt.c @@ -133,7 +133,7 @@ static const AVOption libsrt_options[] = { { "rcvbuf", "Receive buffer size (in bytes)", OFFSET(rcvbuf), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, INT_MAX, .flags = D|E }, { "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" }, @@ -608,7 +608,7 @@ static int libsrt_open(URLContext *h, const char *uri, int flags) if (av_find_info_tag(buf, sizeof(buf), "minversion", p)) { s->minversion = strtol(buf, NULL, 0); } - if (av_find_info_tag(buf, sizeof(buf), "streamid", p)) { + if (av_find_info_tag(buf, sizeof(buf), "srt_streamid", p)) { av_freep(&s->streamid); s->streamid = av_strdup(buf); if (!s->streamid) {