From patchwork Tue Sep 28 13:36:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 30629 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp5210641iob; Tue, 28 Sep 2021 06:37:19 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxMxj5OXTXDNPVdV5saI7UTrGYLaIO4GhjsU2AopeCMUhALrv2m8mDXKjH63wwaldEF1F4i X-Received: by 2002:a17:906:31cf:: with SMTP id f15mr6745816ejf.272.1632836239760; Tue, 28 Sep 2021 06:37:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632836239; cv=none; d=google.com; s=arc-20160816; b=n1EXI/f86lgDaQM2zTpg7gqfYgt2l1AZ4ya3QqWaKI+kbZJEnbLXfjH55XBkdWQG4k H3Kcpd/azU8aHyaJkAReRHu+f/0aDacUZMJkkOB3hc+j1/2viZvCSX/UIsqItKRiia3r EFBB7kc5Nlba1syqd27UpG+oR55khjTpAsV66Cae0P4ow9XZDUraXAHDku7HlDFk93iF GSoSjczR3XOLEzC772TDCnDz+gJVHCKsZ4B6izNJpQAKnDm07OQLWcd7S0uYQceUaobK hY7UWc5Yni83P7uKYugdIqStdT2/gQ45YZRutB1ovlEaEjta/1xQO98o3CchdSVXwTio HsMg== 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=Hgpj8mf4YDJQizQgbNWShLIy9GdBFoSLGlodPwYssO0=; b=K9VT4Z44n5yt0IUUvS++aaXloPJaK1bdSFXFQl1R7FTomkkX6vKoXtuAZh2pkL5AiJ GEMHKqA9rmbYZ8o6RGAlFrtD/GCCg0IiKAXO0r/9RbzeTxU5N6kunvAO3hZMXE2UA7gA 1OZqzTur64c+FRds59n2IWSHtBLtchQxEVld35iQ8AWNfxxqU0VbksBzUi0od3UkDa0K DRhRsR9Kk1vW08iUb7zod51ZbLwOXUf41UataJaj6LcJXrWhOUNpDgwWatwyXbnO+/rE 9CNPsmQ1JiGc2J/TWv+F3IKibwLNtwbNWo5iIZje1yCflG1wK/1zrX9/7Ut4IpmDPSRI znEQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b="RCricVA/"; 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 30si23700534eji.702.2021.09.28.06.37.18; Tue, 28 Sep 2021 06:37:19 -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="RCricVA/"; 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 4B5B1689F59; Tue, 28 Sep 2021 16:36:58 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8BDD9688057 for ; Tue, 28 Sep 2021 16:36:51 +0300 (EEST) Received: by mail-pl1-f172.google.com with SMTP id bb10so14223702plb.2 for ; Tue, 28 Sep 2021 06:36:51 -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=Gf+BGRC9JkpyW/lG/u3yLFGEE+kwkuA9Lwt82+RNiQk=; b=RCricVA/OxKhcOX+AayiZcAbc3o+Tu7A4y+5MZ/BB/A/tGtuZjHcSTx6eQYEx9qVq+ 1tzXd4/s30aDmsAdIN+kV1qmA4nMcNO8y1pktobpjId81ufekSlBK/vWKmG4uKHzNXow oPXRV12UqkniYQySf4XuiRmPLGPpR3NqqY0k+p3XRjymN2kUN3s64FO8v3gzOtjlNI7T kuszmXjQSqCPZtXwHKU/T8PqBU26W/Ayq5HvkKggOs7yGuZldVRMJ540i6vxwK64eo95 cC4LVLQDS1XYHu9YcyEFxDfOZefNfijP55WdD9qx6zPzPyrwcJ5YuaoycWCCQmaRdyr+ snxQ== 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=Gf+BGRC9JkpyW/lG/u3yLFGEE+kwkuA9Lwt82+RNiQk=; b=C/Yo1qOadNuV5+EYCEjjw8AZ7q8GXh2zT8xmzzP26PI9lwB83OGFkPY8GPxgDwsCG0 U5PchDgV8Pp3+xMla8jEC/JaZspmiLtu7UJGS5rkkSAcYYp2a1RFLpYhtjnsbLSe3UgR kSVJ7fXJGfR5fNCGnzExxFEqNRNMl31rXWlq/kenebirDm5L7rsmSduLKiM9HWaejEhd q7sjNwL8gC3bkZz3oFUD3/LSW7I+UpKatYRBFNeGfh72Plz8MBq3NlVSWrtIDikAbw1H uK4DwhCQXC5RDzE73Ibh5Gw+gJDSZFY8wAXu55X+8Fx7DUK+jhVZN8n1cMFKmsbMnZur cmcQ== X-Gm-Message-State: AOAM531m11iPsZRFqt+rBCKnk0o5DucUYd9VcOAL4iyn0Mw6jFexTOn4 UFYXYjud9H2NQeX5vBDtIE5LsUVt+cI= X-Received: by 2002:a17:90a:e7cd:: with SMTP id kb13mr32634pjb.52.1632836209815; Tue, 28 Sep 2021 06:36:49 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id u6sm21636839pgr.3.2021.09.28.06.36.48 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 28 Sep 2021 06:36:49 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Tue, 28 Sep 2021 21:36:37 +0800 Message-Id: <1632836198-23044-3-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1632836198-23044-1-git-send-email-lance.lmwang@gmail.com> References: <1632836198-23044-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH 3/4] avutil/detection_bbox: simplify code for better readability 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: XFpom8/Fhf6n From: Limin Wang Signed-off-by: Limin Wang --- libavutil/detection_bbox.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/libavutil/detection_bbox.c b/libavutil/detection_bbox.c index 8bfdff7..3de66ce 100644 --- a/libavutil/detection_bbox.c +++ b/libavutil/detection_bbox.c @@ -23,27 +23,29 @@ AVDetectionBBoxHeader *av_detection_bbox_alloc(uint32_t nb_bboxes, size_t *out_s size_t size; struct BBoxContext { AVDetectionBBoxHeader header; - AVDetectionBBox boxes[1]; - } *ret; + AVDetectionBBox boxes; + }; const size_t bboxes_offset = offsetof(struct BBoxContext, boxes); + const size_t bbox_size = sizeof(AVDetectionBBox); + AVDetectionBBoxHeader *header; - size = sizeof(*ret); - if (nb_bboxes - 1 > (SIZE_MAX - size) / sizeof(*ret->boxes)) + size = bboxes_offset; + if (nb_bboxes > (SIZE_MAX - size) / bbox_size) return NULL; - size += sizeof(*ret->boxes) * (nb_bboxes - 1); + size += bbox_size * nb_bboxes; - ret = av_mallocz(size); - if (!ret) + header = av_mallocz(size); + if (!header) return NULL; - ret->header.nb_bboxes = nb_bboxes; - ret->header.bbox_size = sizeof(*ret->boxes); - ret->header.bboxes_offset = bboxes_offset; + header->nb_bboxes = nb_bboxes; + header->bbox_size = bbox_size; + header->bboxes_offset = bboxes_offset; if (out_size) *out_size = size; - return &ret->header; + return header; } AVDetectionBBoxHeader *av_detection_bbox_create_side_data(AVFrame *frame, uint32_t nb_bboxes)