From patchwork Thu Aug 27 18:45:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gautam Ramakrishnan X-Patchwork-Id: 21951 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 9CB9444B86C for ; Thu, 27 Aug 2020 21:45:53 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8031968AB6F; Thu, 27 Aug 2020 21:45:53 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f194.google.com (mail-pf1-f194.google.com [209.85.210.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5388168AB96 for ; Thu, 27 Aug 2020 21:45:47 +0300 (EEST) Received: by mail-pf1-f194.google.com with SMTP id t185so4177954pfd.13 for ; Thu, 27 Aug 2020 11:45:47 -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=QPypVBVgu1ELphu43nw2aW+B8KoUEPyv8hNfJNOt138=; b=pS8Ui7TCjm4XfH/dZPwgJEtDUTABjZG7yq8r5Qw4o89JwwhqhoXyrTgtVlrOx0yQIQ QQxgbwNFVJxTBC+K16jfQwuYekPg7L2kdD7jNwaJ3S7LMgH00oWbur95lOspjl8hC4Hy 9RC1rkyYRDB3Z9bvDF3YwK3fxye654pwcaDoS2qeOcl8fODsjS2fsjetIR7yZccQaeW0 7oVi5FGmXHOPEeX1Ojk6fgfkzNSNr7Bm8LTM9rtB+5qiIhoPNikClPGZXCdMRiVoismQ X9yiiEyMjx5VbnpH7nCRFmdE2IJj8/YTee97TmkdAZGxUx6IVwVuQPLdZfi4sO+8fGQc ojlg== 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=QPypVBVgu1ELphu43nw2aW+B8KoUEPyv8hNfJNOt138=; b=E3ob0jDyNaG8LZmN8J0oBc/tRRzZFPUsaPKngyBlKys7QB1FCgez8x9xmFb/sheY8/ VeZKMWd3ZXnc57FYXCrzqUQsI14qgvtbnXSOipw46u43K3euqwc56V219Foiuwx8RbuQ izfX6p0ZFQGjcIlZfdVF3vTCOcrhG7Xhzt1LuzIaoQ1xt4exIlauf2tDT8gNb6kQ09Oq XisJajEGOJhgeqqi2GFEEaJ4WSKNbAoByU10vTxqB4OJPM7W32rYyADCwr/yXw1iif9F JDyEo+T2y/47c/pMnKWv8/RL1heKzzE97nCqe2A+kUFBgVrpUTxb7Oa6uMWTlNrnxVJK BCqQ== X-Gm-Message-State: AOAM531HasGzBPJO2v/DJqUo9046KQGPdA3xDZX6+phvsq2hipepmUnJ I9KJzAWlRv1HwXcp+Tk1dzBxXB4WQwCc9A== X-Google-Smtp-Source: ABdhPJwsVO29dVP2Y6u9uc/XR0hqyXFvOfMfmQIpKn61W0ks6r1H+zWPECWwHnqHF8vlvxqHYRzYpQ== X-Received: by 2002:a63:aa0d:: with SMTP id e13mr15530535pgf.439.1598553945308; Thu, 27 Aug 2020 11:45:45 -0700 (PDT) Received: from localhost.localdomain ([122.167.211.143]) by smtp.gmail.com with ESMTPSA id a20sm3597229pfi.11.2020.08.27.11.45.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Aug 2020 11:45:44 -0700 (PDT) From: gautamramk@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Fri, 28 Aug 2020 00:15:34 +0530 Message-Id: <20200827184536.10752-2-gautamramk@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200827184536.10752-1-gautamramk@gmail.com> References: <20200827184536.10752-1-gautamramk@gmail.com> Subject: [FFmpeg-devel] [RFC PATCH v7 2/4] libavcodec/j2kenc: Fix tag tree coding 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 The implementation of tag tree encoding was incorrect. However, this error was not visible as the current j2k encoder encodes only 1 layer. This patch fixes tag tree coding for JPEG2000 such tag tree coding would work for multi layer encoding. --- libavcodec/j2kenc.c | 41 +++++++++++++++++++++++++---------------- libavcodec/jpeg2000.c | 1 + libavcodec/jpeg2000.h | 1 + 3 files changed, 27 insertions(+), 16 deletions(-) diff --git a/libavcodec/j2kenc.c b/libavcodec/j2kenc.c index 16863f8e8c..87acd2d5c9 100644 --- a/libavcodec/j2kenc.c +++ b/libavcodec/j2kenc.c @@ -242,27 +242,36 @@ static void j2k_flush(Jpeg2000EncoderContext *s) static void tag_tree_code(Jpeg2000EncoderContext *s, Jpeg2000TgtNode *node, int threshold) { Jpeg2000TgtNode *stack[30]; - int sp = 1, curval = 0; - stack[0] = node; + int sp = -1, curval = 0; - node = node->parent; - while(node){ - if (node->vis){ - curval = node->val; - break; - } - node->vis++; - stack[sp++] = node; + while(node->parent){ + stack[++sp] = node; node = node->parent; } - while(--sp >= 0){ - if (stack[sp]->val >= threshold){ + + while (1) { + if (curval > node->temp_val) + node->temp_val = curval; + else { + curval = node->temp_val; + } + + if (node->val >= threshold) { put_bits(s, 0, threshold - curval); - break; + curval = threshold; + } else { + put_bits(s, 0, node->val - curval); + curval = node->val; + if (!node->vis) { + put_bits(s, 1, 1); + node->vis = 1; + } } - put_bits(s, 0, stack[sp]->val - curval); - put_bits(s, 1, 1); - curval = stack[sp]->val; + + node->temp_val = curval; + if (sp < 0) + break; + node = stack[sp--]; } } diff --git a/libavcodec/jpeg2000.c b/libavcodec/jpeg2000.c index 26e09fbe38..3d3e7ec313 100644 --- a/libavcodec/jpeg2000.c +++ b/libavcodec/jpeg2000.c @@ -88,6 +88,7 @@ void ff_tag_tree_zero(Jpeg2000TgtNode *t, int w, int h) for (i = 0; i < siz; i++) { t[i].val = 0; + t[i].temp_val = 0; t[i].vis = 0; } } diff --git a/libavcodec/jpeg2000.h b/libavcodec/jpeg2000.h index c3437b02fe..ad58b1ae88 100644 --- a/libavcodec/jpeg2000.h +++ b/libavcodec/jpeg2000.h @@ -127,6 +127,7 @@ typedef struct Jpeg2000T1Context { typedef struct Jpeg2000TgtNode { uint8_t val; + uint8_t temp_val; uint8_t vis; struct Jpeg2000TgtNode *parent; } Jpeg2000TgtNode;