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);