From patchwork Tue Aug 18 19:40:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gautam Ramakrishnan X-Patchwork-Id: 21723 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 3B63544B082 for ; Wed, 19 Aug 2020 00:25:29 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1A52D6880CA; Wed, 19 Aug 2020 00:25:29 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-vs1-f68.google.com (mail-vs1-f68.google.com [209.85.217.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7811068096F for ; Wed, 19 Aug 2020 00:25:23 +0300 (EEST) Received: by mail-vs1-f68.google.com with SMTP id k25so10886088vsm.11 for ; Tue, 18 Aug 2020 14:25:23 -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=oTWlO+1Whot8oAKPq49qkCCP27LN3zzb0RrwMt/D86Q=; b=YhQfSzmk8E/iKO0w4jFSd4fWGofWoVQ2fW6oag1edJrEehmS+jCfdCtCiCGAMNh+9n frsghpErNQpHBNSf/9/DhfauvgE/7zKKXVbjRCI8p0HvcAfnvmTrYUGYl5IO9tMoOpKH YZ42vCjfp28x1dfQkwal0VR0tQGmAY3+0ED5eD1DXumJ5yzq4EQsfP/nk3EXgOhjeneN 3rGB4qGe7ZopaW0yiuwdwl+VtAftC+3wmtm/NxBFomVa3nN6xgIzfDykOmmLYRwHIx4D LYX7U1ZungQGiyCFnQfP6i5W+G3nqxirHwEv8zO7CHkaSdTToNcboJgSBYgcyPhg7jEf +4Jw== 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=oTWlO+1Whot8oAKPq49qkCCP27LN3zzb0RrwMt/D86Q=; b=i5NaU5qgFQ+lTyPUpeggysdc42e662WPPGqXPJqD6yJNX9qTNzYgC2VebgN0+eunJ3 0XxP5EgG6/OJphXtyqkogoxvxIUIPejBOez9sbgDLcBiv8fI6u0zPKGbWwyevQ/SIffm vU85LqTRRhXNK06tV2JmBfnY86zVxxZeK3joJHowBsJdH1Kz5NDHZWM10z7fhoPLJJi7 8/zFUiQVk1wHAYEyMzmHROHK4x8ln+MZ+Dfvi8b9qggFKpGxy9NZ6RKIt6ZhUBslcR0z 1kW567MU7EtlJiNV59xfpH64t2hDTfCUz95EMMvSoKbHcjADOZtInDafWD4dt33wZ/zA mcZQ== X-Gm-Message-State: AOAM530POguR+j6CwXdaraM+q3Wp0OtBsXJrsD1hYI//Ic5UqDyTGv9Z zWWf/jieX9H9rPaqqmmgn5/4AVdQQ64= X-Google-Smtp-Source: ABdhPJySkN97ebUVM5bajpxbPfAeLt6mLHyLo0AF93WFDkiDUF83rm5GTDBReo6mc6EVGP5SUiP7IQ== X-Received: by 2002:aa7:9a1c:: with SMTP id w28mr13019150pfj.116.1597779651404; Tue, 18 Aug 2020 12:40:51 -0700 (PDT) Received: from localhost.localdomain ([122.166.129.193]) by smtp.gmail.com with ESMTPSA id z77sm27140885pfc.199.2020.08.18.12.40.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Aug 2020 12:40:50 -0700 (PDT) From: gautamramk@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Wed, 19 Aug 2020 01:10:36 +0530 Message-Id: <20200818194037.25422-3-gautamramk@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200818194037.25422-1-gautamramk@gmail.com> References: <20200818194037.25422-1-gautamramk@gmail.com> Subject: [FFmpeg-devel] [PATCH 3/4] 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 1c31e48d61..264bae3f73 100644 --- a/libavcodec/j2kenc.c +++ b/libavcodec/j2kenc.c @@ -1218,7 +1218,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 7a34a36121..88e6ebc8b3 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 e9f4a51261..611aea1665 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);