From patchwork Tue Aug 25 04:20:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gautam Ramakrishnan X-Patchwork-Id: 21900 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 A61B144A14C for ; Tue, 25 Aug 2020 07:48:03 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8BBE1689AD1; Tue, 25 Aug 2020 07:48:03 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi1-f193.google.com (mail-oi1-f193.google.com [209.85.167.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C6F6A687FA8 for ; Tue, 25 Aug 2020 07:47:56 +0300 (EEST) Received: by mail-oi1-f193.google.com with SMTP id z195so7466104oia.6 for ; Mon, 24 Aug 2020 21:47:56 -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:in-reply-to:references; bh=hKC6cJfg1r6uGA3Yl/Jz9RGe6Kxmz3lC+7QnNNMFrRA=; b=Hgv1IUSbEA0kWVYWT4ByehBNUQjW5HjPB7liR1M+UB+Fgm/MiCffHYFfgJkU4gpZ5H BayQXeCjyEDZIfeANT0xSrW1ZmkSRrcA+//SWJF9vVHspiWeX26znYcJNIHiOglPdO+U VWUluBvHN/TDYPGO1o/34+GXxX7irijf+Peg86eETwI9aLJOu2dJr4capyv5tBSSaIke t6LMFFoGhX/jYmBBRWXqIdpXTTKJGolfQFzZ480g2cu+mxH20SUsZMh9FNCsVArShYyD hpXHiP62vnc6itezOD554yiRpoeB0bXpdwx7TJK7H8oUiT98b3+bMiFipvefRuGwfMKR 5TkQ== 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:in-reply-to :references; bh=hKC6cJfg1r6uGA3Yl/Jz9RGe6Kxmz3lC+7QnNNMFrRA=; b=CZ1qtk8fnl1spv3Nk2RzA+sx4DNeMP7l3H7BbU1rBHKSYtvTOq+R2grlLLxuCzAjmL 2rOgesR5H/JrGRXpA1PNnBnTHYKoRIkPYkcytdwIGqFsjUcPB1/Q2xmQMWa5zkjEwWZZ SwkeWCNeuiNcFki5IMxFoxu45YQQIqLWnNikOY+EpETfuSnpc76V7N3ieY8eJJmBMhvz ukQEWgJE7Zlm/7LrhfPsroSaw8X4lIZJf9qXJnBrNDlOFE6E6YRkcvm5R1G+6PR/+1HR G6lAHkBGipQoApe0OtG6tkZ2n0pviyM2PN8jh9ZRW0zaFDiOSx8rjCT1EK40M4cjGfZU d86Q== X-Gm-Message-State: AOAM532xwOm/tpc8ZeBoO81zzu3WaZGOQwqP1bYXni/MgIerU5TN7Kr5 Wgf2auioyd4FQfoVbWoaTxRZiKG7Wf0jLw== X-Google-Smtp-Source: ABdhPJxrhGKx+g0SCPEU2MyxNGeNIZwmiVzO0NfDqZLcbOtJ35oRj5AeTP5/3sUHwC01taJQRmfPfg== X-Received: by 2002:a17:90a:4ec3:: with SMTP id v3mr63264pjl.72.1598329224287; Mon, 24 Aug 2020 21:20:24 -0700 (PDT) Received: from localhost.localdomain ([122.167.211.143]) by smtp.gmail.com with ESMTPSA id 205sm13976667pfy.9.2020.08.24.21.20.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Aug 2020 21:20:23 -0700 (PDT) From: gautamramk@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Tue, 25 Aug 2020 09:50:05 +0530 Message-Id: <20200825042007.18535-3-gautamramk@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200825042007.18535-1-gautamramk@gmail.com> References: <20200825042007.18535-1-gautamramk@gmail.com> Subject: [FFmpeg-devel] [RFC PATCH v4 3/5] libavcodec/jpeg2000: Modify cleanup 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 ff_jpeg2000_cleanup function take in an extra parameter which indicates whether it is called from the encoder or decoder. --- libavcodec/j2kenc.c | 2 +- libavcodec/jpeg2000.c | 2 +- libavcodec/jpeg2000.h | 2 +- libavcodec/jpeg2000dec.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libavcodec/j2kenc.c b/libavcodec/j2kenc.c index 87acd2d5c9..711655f1d6 100644 --- a/libavcodec/j2kenc.c +++ b/libavcodec/j2kenc.c @@ -1220,7 +1220,7 @@ static void cleanup(Jpeg2000EncoderContext *s) for (tileno = 0; tileno < s->numXtiles * s->numYtiles; tileno++){ for (compno = 0; compno < s->ncomponents; compno++){ Jpeg2000Component *comp = s->tile[tileno].comp + compno; - ff_jpeg2000_cleanup(comp, codsty); + ff_jpeg2000_cleanup(comp, codsty, 1); } av_freep(&s->tile[tileno].comp); } diff --git a/libavcodec/jpeg2000.c b/libavcodec/jpeg2000.c index 3d3e7ec313..70c25a0ca2 100644 --- a/libavcodec/jpeg2000.c +++ b/libavcodec/jpeg2000.c @@ -580,7 +580,7 @@ void ff_jpeg2000_reinit(Jpeg2000Component *comp, Jpeg2000CodingStyle *codsty) } } -void ff_jpeg2000_cleanup(Jpeg2000Component *comp, Jpeg2000CodingStyle *codsty) +void ff_jpeg2000_cleanup(Jpeg2000Component *comp, Jpeg2000CodingStyle *codsty, int isencoder) { int reslevelno, bandno, precno; for (reslevelno = 0; diff --git a/libavcodec/jpeg2000.h b/libavcodec/jpeg2000.h index ad58b1ae88..fee9607e86 100644 --- a/libavcodec/jpeg2000.h +++ b/libavcodec/jpeg2000.h @@ -272,7 +272,7 @@ int ff_jpeg2000_init_component(Jpeg2000Component *comp, void ff_jpeg2000_reinit(Jpeg2000Component *comp, Jpeg2000CodingStyle *codsty); -void ff_jpeg2000_cleanup(Jpeg2000Component *comp, Jpeg2000CodingStyle *codsty); +void ff_jpeg2000_cleanup(Jpeg2000Component *comp, Jpeg2000CodingStyle *codsty, int isencoder); static inline int needs_termination(int style, int passno) { if (style & JPEG2000_CBLK_BYPASS) { diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index 624542c2f8..c5192d007f 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -2123,7 +2123,7 @@ static void jpeg2000_dec_cleanup(Jpeg2000DecoderContext *s) Jpeg2000Component *comp = s->tile[tileno].comp + compno; Jpeg2000CodingStyle *codsty = s->tile[tileno].codsty + compno; - ff_jpeg2000_cleanup(comp, codsty); + ff_jpeg2000_cleanup(comp, codsty, 0); } av_freep(&s->tile[tileno].comp); av_freep(&s->tile[tileno].packed_headers);