From patchwork Wed Aug 26 15:58:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gautam Ramakrishnan X-Patchwork-Id: 21935 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id F3676448EC1 for ; Wed, 26 Aug 2020 19:04:17 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D050B68AC85; Wed, 26 Aug 2020 19:04:17 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f195.google.com (mail-pf1-f195.google.com [209.85.210.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 51A4068AB18 for ; Wed, 26 Aug 2020 19:04:10 +0300 (EEST) Received: by mail-pf1-f195.google.com with SMTP id m71so1220387pfd.1 for ; Wed, 26 Aug 2020 09:04:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=7SsBHLcUbrsGWagCGMAdHQSuTa81mM/Z4XwCjEwekwg=; b=dKnO4K1PUcLuVckwisS9flqEQkDrm+MkkOH63gCU5y29jyCB5Wi2h2TFTAnnDQ3FGk AVrvbOQM48WhMxkapIYf7xrb0PzUBu/Ty4sWZfra24JwJ2yrI5+lRoUXi3oOhFJJoCyL DXYiEO5mgK6THi6Gi5hnJYZOxFxrQzSFwOWCUc12mZvvEtIxgleEjJ/uZXPGLnkmzbcY 3JawpQiEQVOIKulNWzG32ny2FvhzKzqM0JjKXnAuLqI0mTpbnR7z04Q57KF5eMCt4bZp 71CbtSgF9v7C1T7+1IWYgTqRt8kgfBo99UtMQyqzpkCDm0LhzIqGjegD1jGX0Ijj5Tm8 PCOg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=7SsBHLcUbrsGWagCGMAdHQSuTa81mM/Z4XwCjEwekwg=; b=E9Qtv2FfDNu4h2dVYIi2dQBXERciOJulq/dcnEP0d0hunyW61+pQfKFqpMdp96b4gY 0ZcJ3D5a+7bfeH3aXb2e7MSQRbtcvMPZp24+0PJHvNtPHJFkcYm/plpyP/P3n0phCvs4 FiT2CCxnYT1iWVdnBkQIrhMDcpKFB4mSpLw21TmKb84gt9kWLb2fObwHZow26cv8zC3+ 75QbPzulvmLCX5XdACvt9RzbIf503PjT3hnu6QtXOB/rs4ln5HhsF8VuW/y8Vak33nVx 0vwCjWbXMCatG1/CO5/nx/8VFVMLBlkRudBVES5hiadWFvW3hrNCyl8NZqu19FaHGwtf nQsg== X-Gm-Message-State: AOAM532+CLEFhji+Iods7QyxqKqAGBCqkB2hkQmMCBhTGMSXSYJ9bflT i9Js3agayx3sd0dPVf/ylgrbzpovI2bBHw== X-Google-Smtp-Source: ABdhPJz7AcuOQx38ZU0Xi++oEv4768ZXU3wMQvcjPH1FrYMsw3XvHrPj99AukyYF/mwYRepyeSnyMw== X-Received: by 2002:a63:c62:: with SMTP id 34mr11300621pgm.115.1598457505414; Wed, 26 Aug 2020 08:58:25 -0700 (PDT) Received: from localhost.localdomain ([122.167.211.143]) by smtp.gmail.com with ESMTPSA id n22sm2505555pjq.25.2020.08.26.08.58.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Aug 2020 08:58:24 -0700 (PDT) From: gautamramk@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Wed, 26 Aug 2020 21:28:15 +0530 Message-Id: <20200826155818.8777-1-gautamramk@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [RFC PATCH v6 1/4] libavcodec/jpeg2000: Make tag tree functions non static X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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: Gautam Ramakrishnan MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Gautam Ramakrishnan This patch makes the tag_tree_zero() and tag_tree_size() functions non static and callable from other files. --- libavcodec/jpeg2000.c | 12 ++++++------ libavcodec/jpeg2000.h | 3 +++ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/libavcodec/jpeg2000.c b/libavcodec/jpeg2000.c index 1aca31ffa4..26e09fbe38 100644 --- a/libavcodec/jpeg2000.c +++ b/libavcodec/jpeg2000.c @@ -39,7 +39,7 @@ /* tag tree routines */ /* allocate the memory for tag tree */ -static int32_t tag_tree_size(int w, int h) +int32_t ff_tag_tree_size(int w, int h) { int64_t res = 0; while (w > 1 || h > 1) { @@ -57,7 +57,7 @@ static Jpeg2000TgtNode *ff_jpeg2000_tag_tree_init(int w, int h) Jpeg2000TgtNode *res, *t, *t2; int32_t tt_size; - tt_size = tag_tree_size(w, h); + tt_size = ff_tag_tree_size(w, h); t = res = av_mallocz_array(tt_size, sizeof(*t)); if (!res) @@ -82,9 +82,9 @@ static Jpeg2000TgtNode *ff_jpeg2000_tag_tree_init(int w, int h) return res; } -static void tag_tree_zero(Jpeg2000TgtNode *t, int w, int h) +void ff_tag_tree_zero(Jpeg2000TgtNode *t, int w, int h) { - int i, siz = tag_tree_size(w, h); + int i, siz = ff_tag_tree_size(w, h); for (i = 0; i < siz; i++) { t[i].val = 0; @@ -567,8 +567,8 @@ void ff_jpeg2000_reinit(Jpeg2000Component *comp, Jpeg2000CodingStyle *codsty) Jpeg2000Band *band = rlevel->band + bandno; for(precno = 0; precno < rlevel->num_precincts_x * rlevel->num_precincts_y; precno++) { Jpeg2000Prec *prec = band->prec + precno; - tag_tree_zero(prec->zerobits, prec->nb_codeblocks_width, prec->nb_codeblocks_height); - tag_tree_zero(prec->cblkincl, prec->nb_codeblocks_width, prec->nb_codeblocks_height); + ff_tag_tree_zero(prec->zerobits, prec->nb_codeblocks_width, prec->nb_codeblocks_height); + ff_tag_tree_zero(prec->cblkincl, prec->nb_codeblocks_width, prec->nb_codeblocks_height); for (cblkno = 0; cblkno < prec->nb_codeblocks_width * prec->nb_codeblocks_height; cblkno++) { Jpeg2000Cblk *cblk = prec->cblk + cblkno; cblk->length = 0; diff --git a/libavcodec/jpeg2000.h b/libavcodec/jpeg2000.h index 5b0627c3dc..c3437b02fe 100644 --- a/libavcodec/jpeg2000.h +++ b/libavcodec/jpeg2000.h @@ -290,4 +290,7 @@ 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); + #endif /* AVCODEC_JPEG2000_H */