From patchwork Mon Sep 6 12:42:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30036 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp3721965iov; Mon, 6 Sep 2021 05:43:53 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy25lc+r4HCWcP+/LMO/LVLV7hnYc/SSWjmQtZQ22JA0ykGdymRWDTpT0EOlxUrKng+7Wry X-Received: by 2002:a05:6402:455:: with SMTP id p21mr13266881edw.309.1630932233718; Mon, 06 Sep 2021 05:43:53 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id f21si7220987ejj.305.2021.09.06.05.43.53; Mon, 06 Sep 2021 05:43:53 -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=@outlook.com header.s=selector1 header.b=KFiIbYlw; arc=fail (body hash mismatch); 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=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D1F4268A5FC; Mon, 6 Sep 2021 15:43:29 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-oln040092069046.outbound.protection.outlook.com [40.92.69.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5C70668A5F7 for ; Mon, 6 Sep 2021 15:43:23 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GzO5+VWWf8/NsudJiQkpfPRjALRcHAKTDIkRj/u16cOH1fqw2a3S5Dxg8zBV8jkxSvEG45oco/mSZH6Zb3yTjL+A1bz8JaLdKfN9ZB7geJIK9HUxTzJchFh/aixsWk4kEaMrBSG//GFkM+4QqyQV45C5/uCNsR07pYdSKHLRBW80gPgT1y8/rJlRF/a2i8XY7jty2a4hmeB1XXfUdxtSNdZ+sOaT0CNwnAuWqt1W36cOHe1tO7uA/siZx7yB21gbEOu7OhiS4lZxGJ+NKFCP4cB+Y7YBuDuzdPmP+mABU77SBGUs8cU7da8BUWUfa72w7ZslHuIR4qxxPsBH4TN5Jw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=Q+IPwzTmfboncMLrOjcCK9sEi9FK/AXuUANoM7QlYZk=; b=KPMijhJwBLtJcgzDmACIh/ZzPwzW+mUmaA8hhNBF1o7LquPFM0yijTPaUX681D5brthUGP5GmwzyTbiesRGBUTiBEnVEUaHACknzC2FKP+kHZyVOg7FYYRdN5Bo+90rH+x7Cg2WrWVOcbTVlVkH6fZcIR2uDJ1bZhbndHDadqrL9IEtnKR2e22I00G5DW3o94nZTdAk3KG1nP5jf3IBpye1ctBS/zJ24YzQZZGKE4c3uFjd2j7VcLdSy6VOMDW/5ilx5FIodDpFLJbc4YXM+1pazgFBbaRMydiVkLPrjcsuPqCbqjjavRR357vAuFmwKJ1O4lj7oq8Xpn8z4FsjEyA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Q+IPwzTmfboncMLrOjcCK9sEi9FK/AXuUANoM7QlYZk=; b=KFiIbYlwjaqdmgIWcc1g1KEnaHbKxKb36BY96Ab/vljUeORVQXEpZJbbR1ZRxXraOyMuCkP4S/UhkR6ukySQ3vUFJ79HyyZ2JqQi6yT/qx/qyASczuJM5iYy0SeUChQPonUfp43gRcZIMOZNw5nIN/Uv2MITbHdHiErxZgpSqT9SuxUivRSl901tOpOafWDSa6JOXF5tNExxmttMMfOByjAls4O2abavi98lGT8IRCW8FqX14B79Fi5PV0jDNWtOC69DUwtuf38JBvHtTnqDbfIIlGnhUOylDrrcNZMHwFfWkLwgUJV+A5pVrcxF0D7nqf8r8phPH0cJnTRahonXCQ== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM5PR0301MB2515.eurprd03.prod.outlook.com (2603:10a6:203:8::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.21; Mon, 6 Sep 2021 12:43:18 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::787b:2156:ca99:fe00]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::787b:2156:ca99:fe00%3]) with mapi id 15.20.4478.025; Mon, 6 Sep 2021 12:43:18 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 6 Sep 2021 14:42:56 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [xu+eNqa4UekYmZ2c9/9hcAlNDxB8yJSZ] X-ClientProxiedBy: AM0PR01CA0084.eurprd01.prod.exchangelabs.com (2603:10a6:208:10e::25) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210906124301.4161498-5-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM0PR01CA0084.eurprd01.prod.exchangelabs.com (2603:10a6:208:10e::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.19 via Frontend Transport; Mon, 6 Sep 2021 12:43:17 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8a5d6d35-c68c-46a5-434e-08d97133e6d0 X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/UKb3QWS1fMq2gIDvxJlS4pEAdL39qOFKc8vHjJ+upNJ6ihbwqM6mi2dZ5hfrCulpzp6nE/59uUSx/Tv0jD4crOLafLYuMJSpsksdSU5c8kz6tPjSoS7zRI0Xx748H6/YB93oJ+i04olZ/B2jtGXNa+LpT+7+nTeRDIQ5cVXR4qT35GVRWMArKF5AkEV4O5CVl4uN1O36QxnBIskVMjtFWWAUo1DwYVymQTNUbVHXlZMxpA3pjHNZvHTMsM0Nqzu/8+qApTh0KuXY8xDRcvBib3mQRFawZ94r7RbKf7HviN8vXE5QQnKvb6FLpmY9VmjLXcNmT4EZ6/oEzUiuyzmam+eRb8sbVgKt3GKVKLxgKZgEWeevaYgT5yeoDdJoZWVJ9FP7XrVzEzYND37Y9fNmU8EDEw9YAjOP+fClGK8dj79uAL8kvG1mx30c5f1OQycmspm5f/CvyyrM2kZ5bGpOMVX4zBr1pITjT5hlKRHcJ5PXt0jnDfE0AH5E0xEx/ZhMMPQArYY1alVsEgXLNfutlz1iH0MEaaOwiXcN1XaBVXPFBvSzICSF3g+f8Y0zbpUNsLKkcstiNHS7vO6S2lv9rQc1nYMAQIThGlUkrkjCbyiGveE1/xVTEiSwKIzPGJatnK3ISAMR1Dps6xdfgVpRWw4MVUVb9dZAKtlF/EIjsAyrUX9BfWJoKWt5CSR4RWYe3QGBOyCR9Lybw== X-MS-TrafficTypeDiagnostic: AM5PR0301MB2515: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Yw3bSH2mYiLv4KyVIQyiGtxcswyOmQMO+2U39Z95Adu0wuAfdy2yXRce2rwVaBFyQIz/1/NeBWCGFVPpNqRiZCIg39Yv3FH6XgmrWovLPMVceLrUnNhlvttEmLSGgo2qKwgT35IdaZ81Ke89r/vhPr/yoYAbDRTwtxUSAlJzPe6ojlIGmpYPeuwInHfkGCWeF3KyVzo97lUVb/PMVAtL38rKwsIq4UUvaFaKLZAy9EtJUceAa5aA1HfeNSkCafziKgGZyHlo7ahlTGDcI2ijW/cvXUNrUmGFyy5gA6VfJLJmgUIwEIM0NxFzKSLgg2pGRlN91neTAui8VDeSj+dTxcp302kZEcIEb2V28s+tScIQhY7y9Qqzhv0bn9/K20AkutXxrG5obposfaI1JnSU2h/JchJfi9thjH+fZxBlXvYnorONfWp22ednDKB/W/+v X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: XkMTwowQ/ldzZqalng2B2/7nnDsVEc47C51u5HALhlFZuVMoU2Ioz9tpgYm0urKcE/5fbF7Iiv+HDGYoOVoF9PrYiL4jsyibkbHBpDENHxzbuSORgk78Zp1HUGcRbVwkNYVpxqR6GogGf+PIOgpCmw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8a5d6d35-c68c-46a5-434e-08d97133e6d0 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Sep 2021 12:43:18.1286 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR0301MB2515 Subject: [FFmpeg-devel] [PATCH 06/11] avcodec/jpeg2000: Make ff_tag_tree_size() static 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: ontJU7ncSjqf Signed-off-by: Andreas Rheinhardt --- libavcodec/jpeg2000.c | 8 ++++---- libavcodec/jpeg2000.h | 1 - 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/libavcodec/jpeg2000.c b/libavcodec/jpeg2000.c index 324908d833..2fbdb64280 100644 --- a/libavcodec/jpeg2000.c +++ b/libavcodec/jpeg2000.c @@ -39,8 +39,7 @@ /* tag tree routines */ -/* allocate the memory for tag tree */ -int32_t ff_tag_tree_size(int w, int h) +static int32_t tag_tree_size(int w, int h) { int64_t res = 0; while (w > 1 || h > 1) { @@ -52,13 +51,14 @@ int32_t ff_tag_tree_size(int w, int h) return (int32_t)(res + 1); } +/* allocate the memory for tag tree */ static Jpeg2000TgtNode *ff_jpeg2000_tag_tree_init(int w, int h) { int pw = w, ph = h; Jpeg2000TgtNode *res, *t, *t2; int32_t tt_size; - tt_size = ff_tag_tree_size(w, h); + tt_size = tag_tree_size(w, h); t = res = av_mallocz_array(tt_size, sizeof(*t)); if (!res) @@ -85,7 +85,7 @@ static Jpeg2000TgtNode *ff_jpeg2000_tag_tree_init(int w, int h) void ff_tag_tree_zero(Jpeg2000TgtNode *t, int w, int h, int val) { - int i, siz = ff_tag_tree_size(w, h); + int i, siz = tag_tree_size(w, h); for (i = 0; i < siz; i++) { t[i].val = val; diff --git a/libavcodec/jpeg2000.h b/libavcodec/jpeg2000.h index 612832c872..d06313425e 100644 --- a/libavcodec/jpeg2000.h +++ b/libavcodec/jpeg2000.h @@ -301,7 +301,6 @@ static inline int needs_termination(int style, int passno) { return 0; } -int32_t ff_tag_tree_size(int w, int h); void ff_tag_tree_zero(Jpeg2000TgtNode *t, int w, int h, int val); #endif /* AVCODEC_JPEG2000_H */