From patchwork Thu Sep 30 01:13:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 30668 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp149710iob; Wed, 29 Sep 2021 18:14:38 -0700 (PDT) X-Google-Smtp-Source: ABdhPJziJTa6M6vyH4VOjO1mFghQR/k2rN/Na9ZTcf19sjiv0FOt9y+82QKPVEp9La26jraQinSt X-Received: by 2002:a17:907:e91:: with SMTP id ho17mr3521594ejc.287.1632964478382; Wed, 29 Sep 2021 18:14:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632964478; cv=none; d=google.com; s=arc-20160816; b=EtkBdqnMfRWMA3V4voFRAgEEsJub2AAtRwkl5dKfUIFxZuIgPT650MugJGAbXl7LV4 BKCRfsSK/TI7qDHZnGjdfiQVhUSBYtz1NJksXnLWt6wiNz8zrhhCeFtbZ3kXM2Ms8jBG SiXE0W5vLnds8gsM65FQrv5HJaIM9vl5opP0ctAXGoDJzWAnsNli7Qgm3LUDQhrnKIQP jJasUngbSWjOZFsrY8THAK109aCLwk4lmoiIKXnqQNWSqcELluIIsnpqvKYoecMn8NO+ 3Klw0oINezpdMY+jtuLSSkA+WY8L5TSnhc1eymErFGBQZBW8eTl6NUPV0Kg2Ml4b/uuz M8Iw== 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:message-id:date:to:from:dkim-signature :delivered-to; bh=GVleCtugzFBfgXKaB+XD+1SvV4bE7oqhiS6hfWZfWKo=; b=zs66wQUNTUPkotRpFoncVtTOtCGSIhCAF113q4BG+4IH0mD73OHcrvRNYj9c0YHUeV VnkBg0gXk+GsTNyDWJZZHVUWkkdAdDyR8oyTJ8VO+hT7AWvzEfVk2GnDbcrdUSspaMai ra5CXDrJP7jkAHy6ytGrNhnY2VgBM/9jn2sLQGzS/it7hopcr12kC1LmXF1y4a5rfLRX M6ukmzjANoWAusAoS//GeucD6WQZEiy4acWl6HhuRNp0dQtqrhbWyxa8wqzScPa1J66r Az75s/RDBdw4imBtBVxKrpnOUks+IYUDvrzz1k50T0lUZ1Vj5UsUq/+V4xiT1iECdKhW Vu8Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=B98p+KWr; 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 b13si2951692ede.572.2021.09.29.18.14.17; Wed, 29 Sep 2021 18:14:38 -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=B98p+KWr; 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 C540C68A581; Thu, 30 Sep 2021 04:14:12 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f178.google.com (mail-pg1-f178.google.com [209.85.215.178]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E38B86881C2 for ; Thu, 30 Sep 2021 04:14:05 +0300 (EEST) Received: by mail-pg1-f178.google.com with SMTP id s75so4569292pgs.5 for ; Wed, 29 Sep 2021 18:14:05 -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; bh=R7yXExRn1AzlRgIZuBfc0a3PkEqEqt1tNvfKaeSRCEs=; b=B98p+KWrzZAbzPmlmLiwQIDuXcvJsDwFh3Ib3836MqsQ1unp3JcSMf0yTTtl0W1s9m Y+NzOk0MiE0JPMYm0QOK2xU/XJm8dsGkfLQcvvZDsKY7tWo+pT5RfI+RKFHuoaGeP+tB CXK/QuA+cV6o5hWnxOJnLNQfKLP6WSGhhYBVmEW7r3kiB0XfJp+ViQ66419FT7IQ0XuB v3A1h7u/6RsY8wf/5xY5H7brKa4uKLKimL4Ww87w2ZL2Mzmlv2AadJlftIWjC5j0Cm3s hKdod1+b4d6sz+olt1A5WOiEWtPzgcGFepM6RRJrieHhgdU4l1I236I+kooaEWGL1mPu IPIQ== 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; bh=R7yXExRn1AzlRgIZuBfc0a3PkEqEqt1tNvfKaeSRCEs=; b=OLOiO028AkpBZGS2lIJOhd1k8mxxK7cTB+0UYEHrraAfRws0fzoBUpK1o/bL/9SXXz HMpKg+rZimNQf4GO4hxgbBaSXqcX3yv9qScvjuyHnUqQNLth7owkX5S/WEoYRnEP68GX Ut/AmsvK2tRBulY8nFw+ZDpXxS+dPbMDTEmha3jbQq8QwMYDV97VoQHY72GuLKW1o2DU BvGDL58FdL/66GacXS3EyNx1hLJcyyRN0Q4bc24RqcXNrcoF2aeSua0B3fzFmIOh3vl+ Zp8GBPWnU4c7MUtZV+ncBJ+QVIZ1YsiaPbpJjC0OsLQuv/Hxusq80XhZOXYQIi1Wd9Ym +oBQ== X-Gm-Message-State: AOAM533MsCubzdLEHYcgOhkEdtKMR/dShf2A1XzrhqVjRNn2Cnvy/I73 VZQW4nLm5OXGDDRSjQfT076sJGi+r4k= X-Received: by 2002:a63:5c1b:: with SMTP id q27mr2487292pgb.284.1632964443807; Wed, 29 Sep 2021 18:14:03 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id o12sm778666pgn.33.2021.09.29.18.14.02 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 29 Sep 2021 18:14:03 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 09:13:56 +0800 Message-Id: <1632964440-24060-1-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 Subject: [FFmpeg-devel] [PATCH 1/5] avfilter/vf_showinfo: minor adjustment for the dump format of ROI 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: 0E3j/90wItno From: Limin Wang Signed-off-by: Limin Wang --- libavfilter/vf_showinfo.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavfilter/vf_showinfo.c b/libavfilter/vf_showinfo.c index 87c2bed..5d97ef6 100644 --- a/libavfilter/vf_showinfo.c +++ b/libavfilter/vf_showinfo.c @@ -147,10 +147,10 @@ static void dump_roi(AVFilterContext *ctx, const AVFrameSideData *sd) } nb_rois = sd->size / roi_size; - av_log(ctx, AV_LOG_INFO, "Regions Of Interest(RoI) information: "); + av_log(ctx, AV_LOG_INFO, "Regions Of Interest(ROI) information: \n"); for (int i = 0; i < nb_rois; i++) { roi = (const AVRegionOfInterest *)(sd->data + roi_size * i); - av_log(ctx, AV_LOG_INFO, "index: %d, region: (%d, %d)/(%d, %d), qp offset: %d/%d.\n", + av_log(ctx, AV_LOG_INFO, "index: %d, region: (%d, %d) -> (%d, %d), qp offset: %d/%d.\n", i, roi->left, roi->top, roi->right, roi->bottom, roi->qoffset.num, roi->qoffset.den); } } From patchwork Thu Sep 30 01:13:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 30667 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp149582iob; Wed, 29 Sep 2021 18:14:30 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwFzlv9tD6SMq049q1duZvb/Ub4FEytXKAVC9R1lHYCkN03JG5jHGznpJ3/nSFBIjZC0uTT X-Received: by 2002:a17:906:1c94:: with SMTP id g20mr3480750ejh.311.1632964470296; Wed, 29 Sep 2021 18:14:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632964470; cv=none; d=google.com; s=arc-20160816; b=Dd9Ces03i7rQqxbKUJd1oDQz8H9gZEayTxsPPXOoh31LUE2bUcRlH5ApiR7W4gbL52 TQCXdYCTY3R7n1tM8Ela1UEPvr2nE+MLadC/ZkDWNfSo6fyB8dxUbXygHUdbLPoA6WVu 8DA/reCT8W79IMMq+ok0H1IYBaYMP5Y/CtiN3R6T+6Bj688z1VWH/DBMdiJqjZ2A0U/R AddrQxS3gOyZgedjdXfoxYiH2d28Dh8ncv//UGMDNmW2GEZjAdnE/eShlN8pNd010Aby 5iF+Amf3NNwRJlZpUgKfWjRpJC9VADkz+IjyAwgbRhBNcIHV4Ijsmlq0nCF2sxMVfOnc KrHQ== 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=qrjNYGfIG+EGIu7ea7v+FoJcZqe7A/cf2Ift+MKpGQs=; b=UJ5ZbboQ/pdfVX5wLnkR/+KJHkTSwDlLKIx6meSpw35Q0KesPK1m2lgOWUOrdcTlEh HNnjQ6DbXSXvrwtedjjIrap64VwCuQUvYLmc+zmyht83bOsQw7DIJjdc8/ftkLTAeRKl 1+myhHUVbib+MHTP3wxaJk6f8d4/6RUrOQblpdzGA56wuuiMsMhmw88XPT/TiXieBIUa myyeCzs34YMJJlAZgIoEjBBckgQtwNsZQX/Ot7sl6mSSH29s7RvR1T5DGZemTU/kbKvn B21mCnXc+mmpeD1HWwoZMIhC+HtNkA2i2JmwqfdFzB/CagAdHDngWKky66/zp9iE4isw UOZQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=iA8CCkiK; 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 s17si1944664ejm.417.2021.09.29.18.14.29; Wed, 29 Sep 2021 18:14:30 -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=iA8CCkiK; 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 143CD68A63F; Thu, 30 Sep 2021 04:14:15 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f177.google.com (mail-pf1-f177.google.com [209.85.210.177]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1AE88689C54 for ; Thu, 30 Sep 2021 04:14:07 +0300 (EEST) Received: by mail-pf1-f177.google.com with SMTP id g14so3509843pfm.1 for ; Wed, 29 Sep 2021 18:14:07 -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=e8WdViImvWNKovjBQgO13fwS6vprZ5Ay30unx3SFxxM=; b=iA8CCkiK33CPE246WhdbzxOKJX6guA2DLLrDnD5JNiWnOVLIsX9sOwYXvK36GgGFLX vR7rzl/y/BaxTw9iC4pL8aGBUBOOhy+bnix0K6qvfQCro9T1l2J9n59w8UEiHH24FvHS Rv69W+3orB3HLpacnLLPHQfO90sA7Sir7/tYfahMsmANESj3qvuq8XoUolIDVjf2/q50 aF91VIvd5wl01EtIjjty2fHm3jF/s2XXT3JaNm3iG9Sl6yA1cuWIN7BFlU4Nhj25MDJY HIGWZ/czLmQj7235Jw1dEIRgggg85hqx0V5SR0+gC5p5Yg3hGCOtrRHtShe/UM/WnniO 4u+Q== 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=e8WdViImvWNKovjBQgO13fwS6vprZ5Ay30unx3SFxxM=; b=FS2b/puBjLvgwXbMTLN6Uwh2mceaoWLZYVyERQpKvSNRRdXHqV1BWwXvX3UAyE/Wwo uGqN5uilWk/GvJcXM7FrxknR5Sg5S0kEA0HhylGZefnngyul6xcTtMEotyTwddHoZkFB AtSCzzr72Jk82jTC+dHcgEdF9+FYSunMWs0Wwja/4JbKIZkWDVsp6mTctxx/Rl7XIq9f +TbQECKlf+YwqplUL5VCJxbQJZJVi8L6NGZtiKFTEd7P756wOzeMlX0CoqwgVKesP+K1 sPyx6lwNW+WlkLgNcP0kJUZ8AsPzFoQwcdP6Dk0d7DbiaVbhRsznh/hpCso66hEOvnYF oLcA== X-Gm-Message-State: AOAM530NAjjkqeIjN/b/M/ewvKDv9v2OtbO1EaJTB5iCdf+ijHudC0TI yfUedCUXflXeoc94NE/Mf3yEQleYo1M= X-Received: by 2002:a63:f356:: with SMTP id t22mr2544835pgj.18.1632964445037; Wed, 29 Sep 2021 18:14:05 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id o12sm778666pgn.33.2021.09.29.18.14.04 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 29 Sep 2021 18:14:04 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 09:13:57 +0800 Message-Id: <1632964440-24060-2-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 2/5] avfilter/vf_addroi: realloc the buf and append new ROI 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: 8/L71b/63ivK From: Limin Wang It is simpler and more efficient compared to the current code. Signed-off-by: Limin Wang --- libavfilter/vf_addroi.c | 98 +++++++++++++++++++------------------------------ 1 file changed, 37 insertions(+), 61 deletions(-) diff --git a/libavfilter/vf_addroi.c b/libavfilter/vf_addroi.c index 5f9ec21..f521a96 100644 --- a/libavfilter/vf_addroi.c +++ b/libavfilter/vf_addroi.c @@ -91,14 +91,40 @@ static int addroi_config_input(AVFilterLink *inlink) return 0; } +static int addroi_append_roi(AVBufferRef **pbuf, AVRegionOfInterest *region) +{ + AVBufferRef *buf = *pbuf; + uint32_t old_size = buf ? buf->size : 0; + int ret; + AVRegionOfInterest *roi; + + ret = av_buffer_realloc(pbuf, old_size + sizeof(*region)); + if (ret < 0) + return ret; + buf = *pbuf; + + roi = (AVRegionOfInterest *)(buf->data + old_size); + memcpy(roi, region, sizeof(*region)); + + return 0; +} + static int addroi_filter_frame(AVFilterLink *inlink, AVFrame *frame) { AVFilterContext *avctx = inlink->dst; AVFilterLink *outlink = avctx->outputs[0]; AddROIContext *ctx = avctx->priv; - AVRegionOfInterest *roi; + AVRegionOfInterest region = (AVRegionOfInterest) { + .self_size = sizeof(AVRegionOfInterest), + .top = ctx->region[Y], + .bottom = ctx->region[Y] + ctx->region[H], + .left = ctx->region[X], + .right = ctx->region[X] + ctx->region[W], + .qoffset = ctx->qoffset, + }; AVFrameSideData *sd; int err; + AVBufferRef *buf = NULL; if (ctx->clear) { av_frame_remove_side_data(frame, AV_FRAME_DATA_REGIONS_OF_INTEREST); @@ -107,73 +133,23 @@ static int addroi_filter_frame(AVFilterLink *inlink, AVFrame *frame) sd = av_frame_get_side_data(frame, AV_FRAME_DATA_REGIONS_OF_INTEREST); } if (sd) { - const AVRegionOfInterest *old_roi; - uint32_t old_roi_size; - AVBufferRef *roi_ref; - int nb_roi, i; - - old_roi = (const AVRegionOfInterest*)sd->data; - old_roi_size = old_roi->self_size; - av_assert0(old_roi_size && sd->size % old_roi_size == 0); - nb_roi = sd->size / old_roi_size + 1; - - roi_ref = av_buffer_alloc(sizeof(*roi) * nb_roi); - if (!roi_ref) { - err = AVERROR(ENOMEM); + buf = sd->buf; + err = addroi_append_roi(&buf, ®ion); + if (err < 0) goto fail; - } - roi = (AVRegionOfInterest*)roi_ref->data; - - for (i = 0; i < nb_roi - 1; i++) { - old_roi = (const AVRegionOfInterest*) - (sd->data + old_roi_size * i); - - roi[i] = (AVRegionOfInterest) { - .self_size = sizeof(*roi), - .top = old_roi->top, - .bottom = old_roi->bottom, - .left = old_roi->left, - .right = old_roi->right, - .qoffset = old_roi->qoffset, - }; - } - - roi[nb_roi - 1] = (AVRegionOfInterest) { - .self_size = sizeof(*roi), - .top = ctx->region[Y], - .bottom = ctx->region[Y] + ctx->region[H], - .left = ctx->region[X], - .right = ctx->region[X] + ctx->region[W], - .qoffset = ctx->qoffset, - }; - - av_frame_remove_side_data(frame, AV_FRAME_DATA_REGIONS_OF_INTEREST); - - sd = av_frame_new_side_data_from_buf(frame, - AV_FRAME_DATA_REGIONS_OF_INTEREST, - roi_ref); - if (!sd) { - av_buffer_unref(&roi_ref); - err = AVERROR(ENOMEM); - goto fail; - } + sd->data = buf->data; + sd->size = buf->size; } else { - sd = av_frame_new_side_data(frame, AV_FRAME_DATA_REGIONS_OF_INTEREST, - sizeof(AVRegionOfInterest)); + err = addroi_append_roi(&buf, ®ion); + if (err < 0) + goto fail; + sd = av_frame_new_side_data_from_buf(frame, AV_FRAME_DATA_REGIONS_OF_INTEREST, buf); if (!sd) { + av_buffer_unref(&buf); err = AVERROR(ENOMEM); goto fail; } - roi = (AVRegionOfInterest*)sd->data; - *roi = (AVRegionOfInterest) { - .self_size = sizeof(*roi), - .top = ctx->region[Y], - .bottom = ctx->region[Y] + ctx->region[H], - .left = ctx->region[X], - .right = ctx->region[X] + ctx->region[W], - .qoffset = ctx->qoffset, - }; } return ff_filter_frame(outlink, frame); From patchwork Thu Sep 30 01:13:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 30670 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp149770iob; Wed, 29 Sep 2021 18:14:43 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzEMzZlW1gPVfuzrN86myKQatR4Ne+Sz88yggcqj5sQaXrMzK9uUAdBjm1+EyTp5IAA6Ygo X-Received: by 2002:a17:906:840f:: with SMTP id n15mr3550928ejx.336.1632964482894; Wed, 29 Sep 2021 18:14:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632964482; cv=none; d=google.com; s=arc-20160816; b=EGia+lgPGXK4uvIhbv9Ikqg/jtdAwFa/aVRY7d3JYe2VW4kc3efPvEN/445ezft0QO cNURNHbxa+0bvFXNp+1CEumQBeXgAgpI/h1RrPKw5OYNX1vDc+bdKbLuG99F4JedD8NR KXkOaUsOCmKOYl9GMcD4gPEM5o8Dn9Ffegg54VTY5HSVzyR0WQxhvyK0lOfzHAi2yI9Z CobNFVHxx7PKZHzPLbiE5zAatBnkPWSoJiCfYgYmsALD8QDp8KJ35C5h1RZrZXKmRAvm lG11BlwxBZ5R+rvsMZyewbJ7rsFsUxVfNuRpWmpEIKRWIxjEOFtEfzVqDiOxtMEpjTb+ T9WQ== 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=rtLzIeUaXoYBmiEfLXzkeWqAD4yCS30ALP++iTpY3RY=; b=liAZNp6qdfdRi7toG27wIm5Eee3GMCjbSLw2XfKKSAhvYXzfTzNHt7r3OB732d0E8R /XucXGP6FpCfYfE1Z9nDaWsGljMGufg1CTKSxtGD891kyrC8+JCw73KnHLkSvK3z3inj R23btctaA+cLacBTnF9RAMueLYVlf+l7mb2cw1+Rw79/Cw4/Xqa45N+9oeisc15xeG0p MQBfHWY2lUwE20r+y4ubE1Xy77MUc8725gHkzjGfIQ+qUliwEttvU0pza02pJY4jSItt /umSchukp5I6U8NMpXzD8vErybaomfHe1V+2U1yMeATPWBq9w43yG5JGUVGyAF0JJ++y yylQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=IK+4m+Ro; 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 l26si1677508eje.712.2021.09.29.18.14.41; Wed, 29 Sep 2021 18:14:42 -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=IK+4m+Ro; 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 2185C689C54; Thu, 30 Sep 2021 04:14:16 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f169.google.com (mail-pf1-f169.google.com [209.85.210.169]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0F8AF68A5C2 for ; Thu, 30 Sep 2021 04:14:08 +0300 (EEST) Received: by mail-pf1-f169.google.com with SMTP id u7so3447478pfg.13 for ; Wed, 29 Sep 2021 18:14:07 -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=Gq0/W0T6SDqRmMw1dNy/gys1c3iYkqB6UxRqBptuJzA=; b=IK+4m+Rooh6R5CLmJifNBymJlL4QSjIKCpYnJe5Rzjo1y4ODXQWaS1TJwHmjdlplqS K7ntFwPP/tSqORJlCCvg0TXzTgtftkRBEIyBuZjAjxOzi7j8d47b+cg8lpr/H2sjUTsr Y2bnGODPy0vPyfR8b3FzMBypk536WtacSx6VUBhM6d4D7bOSBIk6zJghKb9fW3tfBEfD 8lBcOW9iquXaqRuiwrFu3Lrh/ybSQTuj9H6AYiBKiuQ5gY6/AabTfdG6lYmKtROGE5r+ NC52iQXWXUEvsEDQ3gEA6AKXbpl9PQnfNT4wdiNXPbTPTqTaL0YoZC8kteXxIMTDxd6T 8yNA== 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=Gq0/W0T6SDqRmMw1dNy/gys1c3iYkqB6UxRqBptuJzA=; b=SChuIDiN60KM0ZmXdRVQxdzSNsxhyw9SKM9F1v4sJHmMSARGclvdrNaLRMj9N9pwJB lSm7U1MhHmcJXHqXE3p1hH5KcpEYpUnkVCC47Fecuk79BP3XkLYQXQx1IpD5VEY+m94t NjsSzaApAu1yXu43F6xoD07ISkY13LoFoijCH6uynzxznEv7IGEy15sbxwhHrzkTDsiF daO0vGeyzMmnK9JYO2q+xdnPfuOZwWiu5zTev50JmXfmRSprUGTYsHoGbbzbNVvS05IT UhekXaiFHJCtc8dtvzPSMbcsvry3aaGcH6AafUgdLF3PojE8ItX3sBVvywz3XXhPhdyl 9mWA== X-Gm-Message-State: AOAM533fsd+fggx7sRa+NoyRQ4eJX46KjWadJwHn/AtLRaw5bX56QS9p QJkQTZhZfP5IBYeH3kfJ0YOhmBxPO/k= X-Received: by 2002:a63:fe41:: with SMTP id x1mr2544706pgj.272.1632964446291; Wed, 29 Sep 2021 18:14:06 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id o12sm778666pgn.33.2021.09.29.18.14.05 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 29 Sep 2021 18:14:05 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 09:13:58 +0800 Message-Id: <1632964440-24060-3-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 3/5] avformat/libsrt: use strtoll/strtol for int64_t/int 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: r51cydbXg5Yu From: Limin Wang Signed-off-by: Limin Wang --- libavformat/libsrt.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/libavformat/libsrt.c b/libavformat/libsrt.c index a80f249..5aef0e7 100644 --- a/libavformat/libsrt.c +++ b/libavformat/libsrt.c @@ -397,10 +397,10 @@ static int libsrt_setup(URLContext *h, const char *uri, int flags) p = strchr(uri, '?'); if (p) { if (av_find_info_tag(buf, sizeof(buf), "timeout", p)) { - s->rw_timeout = strtol(buf, NULL, 10); + s->rw_timeout = strtoll(buf, NULL, 10); } if (av_find_info_tag(buf, sizeof(buf), "listen_timeout", p)) { - s->listen_timeout = strtol(buf, NULL, 10); + s->listen_timeout = strtoll(buf, NULL, 10); } } if (s->rw_timeout >= 0) { @@ -566,19 +566,19 @@ static int libsrt_open(URLContext *h, const char *uri, int flags) s->inputbw = strtoll(buf, NULL, 10); } if (av_find_info_tag(buf, sizeof(buf), "oheadbw", p)) { - s->oheadbw = strtoll(buf, NULL, 10); + s->oheadbw = strtol(buf, NULL, 10); } if (av_find_info_tag(buf, sizeof(buf), "latency", p)) { - s->latency = strtol(buf, NULL, 10); + s->latency = strtoll(buf, NULL, 10); } if (av_find_info_tag(buf, sizeof(buf), "tsbpddelay", p)) { - s->latency = strtol(buf, NULL, 10); + s->latency = strtoll(buf, NULL, 10); } if (av_find_info_tag(buf, sizeof(buf), "rcvlatency", p)) { - s->rcvlatency = strtol(buf, NULL, 10); + s->rcvlatency = strtoll(buf, NULL, 10); } if (av_find_info_tag(buf, sizeof(buf), "peerlatency", p)) { - s->peerlatency = strtol(buf, NULL, 10); + s->peerlatency = strtoll(buf, NULL, 10); } if (av_find_info_tag(buf, sizeof(buf), "tlpktdrop", p)) { s->tlpktdrop = strtol(buf, NULL, 10); @@ -587,7 +587,7 @@ static int libsrt_open(URLContext *h, const char *uri, int flags) s->nakreport = strtol(buf, NULL, 10); } if (av_find_info_tag(buf, sizeof(buf), "connect_timeout", p)) { - s->connect_timeout = strtol(buf, NULL, 10); + s->connect_timeout = strtoll(buf, NULL, 10); } if (av_find_info_tag(buf, sizeof(buf), "payload_size", p) || av_find_info_tag(buf, sizeof(buf), "pkt_size", p)) { From patchwork Thu Sep 30 01:13:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 30669 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp149898iob; Wed, 29 Sep 2021 18:14:54 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw+BMnZEKtVF88FuqhrpGHZH+QGQ71uGy3LHWuGDxNs8bDMCANmu7SZFckQ+pDPPUD9JZXJ X-Received: by 2002:a17:907:7848:: with SMTP id lb8mr3494619ejc.494.1632964494671; Wed, 29 Sep 2021 18:14:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632964494; cv=none; d=google.com; s=arc-20160816; b=q7YkmEBoXahBI+tkWIFVRmPUahZBU0FEpcIpOO5YoXDe8YHYPRQ3kxg/o2qZJOD0Au tk0B9RtB+98kn99JlnXag4wy3lcn0HKpO3eBVzsI9rn/S13/SetH+GFfjXp5LWONqTBG ThKAH/9ST5Whing4O7hmxzQ0t3atUIv6tH5hbBYHX6HfUnMYieQOz/JVMZ2uiwplwIUV +qVmNqngWuDlJBKgyCgpylDwhz0NKoIVokS1h8D+uFb2XsSEZ/Ejp4N5ZM6Xhu7pUwIA +8aa5s4/crZknI0X1MR4Tmdkmgpq7LtdaK4RYY2OAESQH0EjlOcNcVndW47fD728wfCO eaiQ== 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=630XhBcPF5nlK1rcmFlEQnrH3cuT6Junl+ONflC5YW4=; b=YLOIZ0lZHV8yCFTm9UTWlz8ILqLAPaVaQqWeFXpV24YjqkJkdq+SO6sc63W534IorP 9AHjoXUORVFkM4fiRGm1fW+IIWmjefsQvqfwI9S2HLYSr/xVDeXdEsNm8AaQFZJsc/kT 08QECx5ABReU9Q/6OLMtlN/EU6R21iQjLsoQLoJWU/4SI26Du0GnyDdmrFSS3ukaLP48 0ZW/+WNQYYJgFHCKZTuKfn0uXJn0B309QXXkpwyAe9gRGiu2WrFk8i92Ha5HH25/cYbr KO4pLlVZY5HIkmITbbn24Oc5X3+WYcwZb7EdUJyizdFPLDdZvvXe371wel40U2WjURa3 MwjQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=fO4Lw6PZ; 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 r28si1575103eda.445.2021.09.29.18.14.52; Wed, 29 Sep 2021 18:14:54 -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=fO4Lw6PZ; 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 5535D68A6CD; Thu, 30 Sep 2021 04:14:18 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f172.google.com (mail-pg1-f172.google.com [209.85.215.172]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3C33B68A39C for ; Thu, 30 Sep 2021 04:14:09 +0300 (EEST) Received: by mail-pg1-f172.google.com with SMTP id n18so4526183pgm.12 for ; Wed, 29 Sep 2021 18:14:09 -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=5m58r3j3rjhV8yRFQW7xCqHqAfY9iUWVAhLbAK9skug=; b=fO4Lw6PZ34q8WruLO8LINpKkcaK34V/+kuDve4y1tjgmNtdPdeCOOXV0UuFzOHNZmO Mw44DAzzPr2DvvVuBfmS+qztpmp/42+p99cbHVg9zY0qv4robzjybA4uZTvZ8sWwzGw2 /8EM/ANKJ/eUl7kYCSmzxCGB242+9ro+mnF+3ZuXZFVHyo5Y3NJV3BfBBUB6Vs8IgSLU 6FJdJlE/8f9NnbflICsEMU1fFWOO2Sgus9OaMcgK5MxhSKfKMOvZRjsl4Qw+DguupaCi Abl6xB5Gn5Nq53VS3MVUuyBxabAqXZjM9aWUyS9yIzK/gkx/XvMB9WWJYo1cInNGKsg+ t6wA== 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=5m58r3j3rjhV8yRFQW7xCqHqAfY9iUWVAhLbAK9skug=; b=P0nGXPnPr0vqJjgrhOHW7JCvA4a89fieMRwy02txBiv+fHrLu+canDSiUczX/Yr7+L 1Res/dvVZ51yq8ijk1781fHKCieCITYh5fU+3Zu2VBkCZx10n0i2Gc45SK2Ownf5cq/C CUlLhk6iFsz9nCd9F/L4U3y9c+hWY5QcV6BmgG/zKu4EbGPFWG8uXcNhn+2tl8rXtJq+ PY1VBop0ETHRixJi/rmuM7WBJD/TagwB2zF2OTaUVVtO5UZJEvnxM0WJ7hQHqoxJGxaf pisvbs9Y0iPkAYycyV6kiLOYkadibU7AyLuc/2t7yc3gtyxN2zOTkKlQ/RzqVyK5V/t2 eWdg== X-Gm-Message-State: AOAM533XT6tu05tyac+f3LDD17j5Pg6ru66YapXYaDLx7kxdTYxBqIU+ mtjFEF3HR3YAqSh8+qgD6xS71tLuvrM= X-Received: by 2002:a63:8f0e:: with SMTP id n14mr2531090pgd.75.1632964447495; Wed, 29 Sep 2021 18:14:07 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id o12sm778666pgn.33.2021.09.29.18.14.06 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 29 Sep 2021 18:14:07 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 09:13:59 +0800 Message-Id: <1632964440-24060-4-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 4/5] avformat/libsrt: specify base of maxbw string to 10 instead of auto-detect 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: svqXuhglYGaX From: Limin Wang Make all options string conversion consistent. Signed-off-by: Limin Wang --- libavformat/libsrt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/libsrt.c b/libavformat/libsrt.c index 5aef0e7..c6308d1 100644 --- a/libavformat/libsrt.c +++ b/libavformat/libsrt.c @@ -530,7 +530,7 @@ static int libsrt_open(URLContext *h, const char *uri, int flags) p = strchr(uri, '?'); if (p) { if (av_find_info_tag(buf, sizeof(buf), "maxbw", p)) { - s->maxbw = strtoll(buf, NULL, 0); + s->maxbw = strtoll(buf, NULL, 10); } if (av_find_info_tag(buf, sizeof(buf), "pbkeylen", p)) { s->pbkeylen = strtol(buf, NULL, 10); 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);