From patchwork Wed Aug 26 15:58:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gautam Ramakrishnan X-Patchwork-Id: 21932 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 CB76544A7B7 for ; Wed, 26 Aug 2020 18:58:37 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id AB676689722; Wed, 26 Aug 2020 18:58:37 +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 E888D687FAE for ; Wed, 26 Aug 2020 18:58:30 +0300 (EEST) Received: by mail-pj1-f67.google.com with SMTP id z18so1090572pjr.2 for ; Wed, 26 Aug 2020 08:58:30 -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=Rjcer3MLtXAO8eDqft0+ooSEDaWrEKzqdPasXQhGFfnUVGMmh8sS1jNTRIT4FmTSex eOMsoRgX54MNep6Jx1Td+FeQcYDgKrNifPiKw2OVFGffIzum6hDlv3pi+3rQNOnzs2ut gYnyNwW74e+6Ck+xDQmW6DsgcwafZbdUGT+1CHi0iuRjYqmQb7pEtY1tsqacBOTUAyR4 02VtrHEWDxNfEOYoTblK8dVB6KPcmdOkCP4f+1QkALoJDJEqu2b7FdTT3IrK1L81amcE DGFzU25eugIeoTsEJwehs2qZNoub4ev+ODJ/XZLbwnsUaiMcB0SwyFBV/T1v80t8lPCO He7A== 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=kuSgFHH10+xe+NjoOCIiDOuu4JxkAy0jA0HJjyF8jxAQqJpsqmQMUVHO30CFGG8ESX V835OE4S/cXmO8vl4pEpFyI4ngbSfegPf6yTom3cKoitfnD13ESJeVzWj/ikWh1I/XWr pnhXXyBLZqGROXndWpKrIEsAifhwENFFjoQSvRpX/RIoLpps49xdJ3C32JmkzrqPDP2m mySNP/lRLx0PQCc6r3VzrXkuXDf0puRmcXRhxW+fTMhn0MSSX3I1hP95VQKl0NMRtWbQ K3hn+7yTdiP2o++iaBdZ3irZSQOwJEwq1xitEYrVxtSMbm3cROQQQGEmJ2qEUEyOxylH NKqQ== X-Gm-Message-State: AOAM530O0l74NJJaJa1KxS+xvLm51wg758voP6+nrOOryfNaJyiNvCRm TIj5UtFsEMbHd3uCoC+d42TNCURcz8jImw== X-Google-Smtp-Source: ABdhPJyFhzrhFuHQJt5mIZcauOySpjTs9bGNqCGrvBlGtgM4lD9Oi4Hx4WlQ0Kaw/S3VvG0r5+7F6w== X-Received: by 2002:a17:90a:644b:: with SMTP id y11mr6886217pjm.13.1598457508535; Wed, 26 Aug 2020 08:58:28 -0700 (PDT) Received: from localhost.localdomain ([122.167.211.143]) by smtp.gmail.com with ESMTPSA id n22sm2505555pjq.25.2020.08.26.08.58.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Aug 2020 08:58:28 -0700 (PDT) From: gautamramk@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Wed, 26 Aug 2020 21:28:16 +0530 Message-Id: <20200826155818.8777-2-gautamramk@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200826155818.8777-1-gautamramk@gmail.com> References: <20200826155818.8777-1-gautamramk@gmail.com> Subject: [FFmpeg-devel] [RFC PATCH v6 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;