From patchwork Tue Aug 25 13:55:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gautam Ramakrishnan X-Patchwork-Id: 21903 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 9C55F44998A for ; Tue, 25 Aug 2020 16:56:14 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 888E368A0D3; Tue, 25 Aug 2020 16:56:14 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f195.google.com (mail-pf1-f195.google.com [209.85.210.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 48BC56880C1 for ; Tue, 25 Aug 2020 16:56:07 +0300 (EEST) Received: by mail-pf1-f195.google.com with SMTP id m8so7422943pfh.3 for ; Tue, 25 Aug 2020 06:56:07 -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=ZdiVWaBpnwWNEF0vecT9eNAvNUeD0GuQfORQUBQgM3Y=; b=Sh4JJE85dYblT8bWDLJsQG8YE/KFasXqojOleANL/GGHKxjeuhfGbhps37WEaiAjGA 3oXgAoxroDnZF6aQ6XBfjyK/4GE5uF7AsIntyR57mz0svi9omOW5J5ck2hXWf6m86WDV Z6WWpDjUTSZhPEjJF4qx6nT9Kl4JCGMeBSQA46LnqmQf1SJ0uPe5Kb+nW1m9SlnJWcc8 fDYkiIo+ncqA+eF8Fq0BU8e2DgvtOetooGZWdNzkZkKFdibnElRnyfZtEecBTjsZtU/E zlmp3l5j7VcBEADyw/aHctb24cpVlEp2RALAI1EXbQMdBHMWzPgL5fFNVKxyvgK6jbSL wq2Q== 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=ZdiVWaBpnwWNEF0vecT9eNAvNUeD0GuQfORQUBQgM3Y=; b=a4g4aPWwfswqJQbjOsrGrQTF/4TzYORNNzbtZn19Y7YDtJS7cXRkbSUrb/vHFRKPRC R1ibd5f3CsGgsSG/UKa6wq2rnB2lpa7BApksCMsspjBrHtU9oBGt1u5DI16CWAnDZynh O8UbASlhT+X5/l7khZ9bBVCcvnLpaeIalAQ/Ym51nBo9/YbTL8oZ2jrf2m+4/hHZ49zp x35jwdk2KwIevFcTwKwotznWgU9Duonp3+VFjwR1vbZ4ETWRvoQPRu8RIIijNqxRWm9u 9WrrugLSpCtI2OLRlfIk2SVFaI2IP7aOY+si6YUQfyPFEOGSehiC/mCsDBe0jh2iLKqx Jhbw== X-Gm-Message-State: AOAM533FNLWemNRTdRHau7oxsCfepMmuEjw1R+cPwQCEMGlRfOS/dGhA GqtKZHvFPDQVGHf4mCvyJMetLXLbt5E= X-Google-Smtp-Source: ABdhPJwhEktpiIcXNpYibYYy5iJu5b+wlcLrf/paE3sGifRtaN+okltXmWfzhynVU8ronXlBgPGGdg== X-Received: by 2002:a63:4726:: with SMTP id u38mr7070484pga.246.1598363765180; Tue, 25 Aug 2020 06:56:05 -0700 (PDT) Received: from localhost.localdomain ([122.167.211.143]) by smtp.gmail.com with ESMTPSA id j81sm7749417pfd.213.2020.08.25.06.56.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Aug 2020 06:56:04 -0700 (PDT) From: gautamramk@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Tue, 25 Aug 2020 19:25:44 +0530 Message-Id: <20200825135545.16438-2-gautamramk@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200825135545.16438-1-gautamramk@gmail.com> References: <20200825135545.16438-1-gautamramk@gmail.com> Subject: [FFmpeg-devel] [RFC PATCH v5 2/3] 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 | 9 +++++---- libavcodec/jpeg2000.h | 3 ++- 3 files changed, 32 insertions(+), 21 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..2e26bc5b00 100644 --- a/libavcodec/jpeg2000.c +++ b/libavcodec/jpeg2000.c @@ -82,12 +82,13 @@ static Jpeg2000TgtNode *ff_jpeg2000_tag_tree_init(int w, int h) return res; } -void ff_tag_tree_zero(Jpeg2000TgtNode *t, int w, int h) +void ff_tag_tree_zero(Jpeg2000TgtNode *t, int w, int h, int val) { int i, siz = ff_tag_tree_size(w, h); for (i = 0; i < siz; i++) { - t[i].val = 0; + t[i].val = val; + t[i].temp_val = 0; t[i].vis = 0; } } @@ -567,8 +568,8 @@ void ff_jpeg2000_reinit(Jpeg2000Component *comp, Jpeg2000CodingStyle *codsty) Jpeg2000Band *band = rlevel->band + bandno; for(precno = 0; precno < rlevel->num_precincts_x * rlevel->num_precincts_y; precno++) { Jpeg2000Prec *prec = band->prec + precno; - ff_tag_tree_zero(prec->zerobits, prec->nb_codeblocks_width, prec->nb_codeblocks_height); - ff_tag_tree_zero(prec->cblkincl, prec->nb_codeblocks_width, prec->nb_codeblocks_height); + ff_tag_tree_zero(prec->zerobits, prec->nb_codeblocks_width, prec->nb_codeblocks_height, 0); + ff_tag_tree_zero(prec->cblkincl, prec->nb_codeblocks_width, prec->nb_codeblocks_height, 0); for (cblkno = 0; cblkno < prec->nb_codeblocks_width * prec->nb_codeblocks_height; cblkno++) { Jpeg2000Cblk *cblk = prec->cblk + cblkno; cblk->length = 0; diff --git a/libavcodec/jpeg2000.h b/libavcodec/jpeg2000.h index c3437b02fe..a9f2e01632 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; @@ -291,6 +292,6 @@ static inline int needs_termination(int style, int passno) { } int32_t ff_tag_tree_size(int w, int h); -void ff_tag_tree_zero(Jpeg2000TgtNode *t, int w, int h); +void ff_tag_tree_zero(Jpeg2000TgtNode *t, int w, int h, int val); #endif /* AVCODEC_JPEG2000_H */