From patchwork Tue Aug 25 13:55:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gautam Ramakrishnan X-Patchwork-Id: 21902 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 BE8A344998A for ; Tue, 25 Aug 2020 16:56:12 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 986C76898D5; Tue, 25 Aug 2020 16:56:12 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f193.google.com (mail-pf1-f193.google.com [209.85.210.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1C47068807B for ; Tue, 25 Aug 2020 16:56:05 +0300 (EEST) Received: by mail-pf1-f193.google.com with SMTP id t9so3245905pfq.8 for ; Tue, 25 Aug 2020 06:56:04 -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=qjkGZJ5hXgVNJGDfJVVjWt7wyCs7tyYKpmxL28lgPdfMpQChc4j/fiZ3op5ifO9RMH fJsfa+glZCXPJ4/wtGz7P3JzPkChLfXmRo/0PYsNwRMr68ti7hrrJ1XaZqI2kMl7jiBJ +qhUGI9grTvSX5+ZuSUrHljlDACPAo6fXxzSOmkI4Gt3hH9VqMEcOKkcqtkgAfsSzs5A n7qv+4lCB6z3EZHaDWdCbuBatqOkYtwM210ZJegA6akLGGYgglUOvNgDOh/OW/rGvaX0 WsRCYz0RT95HqEoF27HMC/vfsbVN98fwbbSTXfgvlxBVf9WMvsbUkyyiKA/GXUO7m172 IJLQ== 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=F9eZbpbdNfRzkyMp2c4w8Z2LKXoiuCqwqLaLmUG7EjXteRj3pViL+F5Lo3n1R4ifFj 5SaXUW9e+/BauGTwFzY3cur087Rp8cJCSILHV4HThBnNeSvLgFikuCe8xniqTMsWrF4O hz/kqOJx/MKLzpQpfmuMigiWaLKDCUJyHPjs6VWutEaI2P0dh6qcw+E3gqFgYJkiGwvE KOkMMP2+42ylgjungEYYq+ro7jRMd5HhLFJw5ZcrY76ejNFeNq2TYrI3NJVCn4U+zuv7 6Z9NF/f8oQJaStWJ+k+qZjCNnp0HXwTouXzaEqEN7SmxQwOEzd8blzfO0odlysZDvwey vX4Q== X-Gm-Message-State: AOAM532mqWcVsejj7VO6GH0R8GtrIdZ3ZDN1wGDbVtkxEi2oz9Z3wmrw YPXz4xWFhdyNKVnmIiRqbu4LQPn6n0U= X-Google-Smtp-Source: ABdhPJypQ1CD+2SftlHL3J04dsEWp625OEfvxpbIOXehimguIDOHYT78lxBSBHVlT+lkXvQkjbAWJQ== X-Received: by 2002:a62:6544:: with SMTP id z65mr7984557pfb.195.1598363763174; Tue, 25 Aug 2020 06:56:03 -0700 (PDT) Received: from localhost.localdomain ([122.167.211.143]) by smtp.gmail.com with ESMTPSA id j81sm7749417pfd.213.2020.08.25.06.56.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Aug 2020 06:56:02 -0700 (PDT) From: gautamramk@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Tue, 25 Aug 2020 19:25:43 +0530 Message-Id: <20200825135545.16438-1-gautamramk@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [RFC PATCH v5 1/3] 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 */