From patchwork Mon Aug 24 17:40:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gautam Ramakrishnan X-Patchwork-Id: 21886 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 25FEE4491F6 for ; Mon, 24 Aug 2020 20:41:05 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id F31AB689F10; Mon, 24 Aug 2020 20:41:04 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f195.google.com (mail-pl1-f195.google.com [209.85.214.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4947268A0EA for ; Mon, 24 Aug 2020 20:40:58 +0300 (EEST) Received: by mail-pl1-f195.google.com with SMTP id h2so4588596plr.0 for ; Mon, 24 Aug 2020 10:40:58 -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=JCPX20laxdtcBPJQ7KbHFcAgBoc50vRZM2PgUeqyUoxm49r4PWPIhwXbCV5Y+sqv3v dpTLkX23fwYA25c3oSrTy113d7zZSywDWIlWVJh+wslwa2DEKtY0+wqW1BdzzrJHrCVu l0d4ihqyH53EvscHHhCGRs7mBoxGMS0k4RGofDCjVuzWPtPmha6ntLVXeT4q31yk9zCO TMfKhqLPfuh+Q3agFzn65cH3vgYQn8miXgoumrg1oBHmDWq6T50FiDLLIbuHTu4qR+4y dC0HJEaQpZpIVA/Snrnf52vuHh5sBkqVXf2HkE7QOzFzOWDlkWEjO8vGej54LnQOL82k phTQ== 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=szft13xTkR2yGlF3tzxOJ6A6X/P8kLyV+i4LiJ8GZB7giZa/6nc2OjNf9iUs5dLCgW EnZoMaqrcq0A76j/0jWS+ENSxyw+a+okZSojWfYABhDuF6mdeFiSEIi7n/sZF4EF23IV uP/wpH9x4lwzSikHiqsHWDylvxSglmTX60xNvpSL33/khnEWV0A0RNBJ+1RQYBiv7qyI fJfHol9sXUe//RIvXz4VdygdydWdb+PI4IOc22qxAJ6PvYXe7KdXJtyShMw25nMPMYo1 uNuGgKKwTUPE/xrw/8z3BDwOeD5GpZgIA6VNggWjqyZ655Jy/DShv4tmUF4XB/mYfYUw d/Lg== X-Gm-Message-State: AOAM530qrvwS+/FkGGkWnv8I5nwGWUzE6LkkvboqWiO0S+Sv79pw7aLN KL1U9H31Oe9j2Y8ciml+nt/DZ2d4jptY0w== X-Google-Smtp-Source: ABdhPJxM9LxpstMFhsa8XoEcGy+npvXNGq89kZ5ncRZiWwNVMndcF8Sse3KIa3+ZMd9OImMPWQbdBg== X-Received: by 2002:a17:902:bd8d:: with SMTP id q13mr4411887pls.142.1598290851629; Mon, 24 Aug 2020 10:40:51 -0700 (PDT) Received: from localhost.localdomain ([122.167.211.143]) by smtp.gmail.com with ESMTPSA id v2sm5260414pfn.116.2020.08.24.10.40.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Aug 2020 10:40:51 -0700 (PDT) From: gautamramk@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Mon, 24 Aug 2020 23:10:32 +0530 Message-Id: <20200824174034.17837-3-gautamramk@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200824174034.17837-1-gautamramk@gmail.com> References: <20200824174034.17837-1-gautamramk@gmail.com> Subject: [FFmpeg-devel] [RFC PATCH v3 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 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);