From patchwork Wed Aug 19 12:21:01 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gautam Ramakrishnan X-Patchwork-Id: 21738 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 96A2944B0ED for ; Wed, 19 Aug 2020 15:21:33 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 79D61689CFF; Wed, 19 Aug 2020 15:21:33 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f67.google.com (mail-pj1-f67.google.com [209.85.216.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2B36E6899A1 for ; Wed, 19 Aug 2020 15:21:25 +0300 (EEST) Received: by mail-pj1-f67.google.com with SMTP id mw10so1043730pjb.2 for ; Wed, 19 Aug 2020 05:21:25 -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=YEGzp5ETiq+KfJTf4eY4GRdflWVj8OQXMtJKRLVq2jY=; b=CuZ/VWVmPWU71Y4zLUlmZoNo9OdtK3OiDM3sTaL6ng3YIs6EaE4T3VIRl77jlCSHih GZqAQP2skIdlfBtzru40BkvBPok+WiolvkLEjOfmckNgDeJOmHwKWPJ2c7ANVSoAX0Tr iXoFyqmrenV9s7kpQi/bY53If8ZeTwX4c8tQNdHh32QUItwy5WGJgpt5yYWAakrpStmR JXde8Tg8kkRc2nquLFdsKl5y2fVu2H0bC7iRzxi45tqkUjNXB0pDh23QaG4jXh2USqH8 lhZQ3qP03uSdYIO6eaDMhoTYZDGSoF09SvZqrmeMRAyOjwe3+hwRqyIPWKB1VflLG6Bf /rew== 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=YEGzp5ETiq+KfJTf4eY4GRdflWVj8OQXMtJKRLVq2jY=; b=sU5/t6HPD7crGse/1FBbdtJI+BOQgMnvxJ+hv36rcnkHWIomHmLKpUg0FNSiszEQGT 2R476FRMtfmKjZc0tV7m/aVp/a3XeYDh3a7k9r4Nt9rmDenGq0X8cPa/hlrldkyvL/Th JtY9gfCS8ibkH8GB9C0BNX260sLKxobr9wF+A0EaWqeDO5vCMOMP0h79e4TZ060jEpGz uLy6kSiFCJWlYq9BN4tqKSQMzyiqaUB9RQldPicdYxOUwkhYk0bG8y6YpUtdcca0mtH+ JXE2g2d0PEF2fqK+eCBCG2xwGR70YcTMeOqChn+9RLDkX2h0EMyCmw2NbPezp/gc0O+G PBcA== X-Gm-Message-State: AOAM533vtw02Aff6rPyvexU9lnC7DKP8FOOnCylqYTIRkLh70jBg+Xim KAXORb93tkxPDw74pklYAfN3HMvCJLM= X-Google-Smtp-Source: ABdhPJwGEoDVj2FskRt66rZOoZcDAI5nv7LZFqvr7EzX0Cy2Pw4Ow+JqzJbWg2pU4YebJMG8fAvtRw== X-Received: by 2002:a17:902:bcc5:: with SMTP id o5mr19027593pls.335.1597839683280; Wed, 19 Aug 2020 05:21:23 -0700 (PDT) Received: from localhost.localdomain ([122.166.129.193]) by smtp.gmail.com with ESMTPSA id k88sm3039767pjk.19.2020.08.19.05.21.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Aug 2020 05:21:22 -0700 (PDT) From: gautamramk@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Wed, 19 Aug 2020 17:51:01 +0530 Message-Id: <20200819122102.5584-3-gautamramk@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200819122102.5584-1-gautamramk@gmail.com> References: <20200819122102.5584-1-gautamramk@gmail.com> Subject: [FFmpeg-devel] [RFC 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 d9777fe07f..8699296434 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 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);