From patchwork Wed Aug 19 12:21:00 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gautam Ramakrishnan X-Patchwork-Id: 21737 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 58C4444B0ED for ; Wed, 19 Aug 2020 15:21:30 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3298D689C71; Wed, 19 Aug 2020 15:21:30 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BE0D8689AD1 for ; Wed, 19 Aug 2020 15:21:23 +0300 (EEST) Received: by mail-pl1-f174.google.com with SMTP id r4so10742604pls.2 for ; Wed, 19 Aug 2020 05:21:23 -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=r3050TDDiFGByggGay00VvYNulgDDZFevja1BP3fjkI=; b=OybBQAMsf9ffWsHHJxxFexaYuPhjSLfBW42GE8R02MY9L0iWoSOV7OIjNOtTkTpSdm /00ifW7ybGRr8C+8fVbYEynW/qDTPVoQvtOtQbLqBmhSPaSYrVvg0zgBaImMo1D6PB3c edSOXxIllGSkTSyFMylwNQwUOE7qNQU0xK114d6JYhzSXH8ElBD4TEEWOW07aANMU9sU VfG3qxQgp/nNrn8zv8+1Ot1UvTgV6xku64wV1Lj1X7dvyIHmMvHvpvCPI+ijTYUuoqSu QiNC9BeHwf7KpSiPOf6SbkKVaTAjtwXiMWLsGHIzHUEQY2dHmPiqbYbkhTayHtMXJIue nygg== 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=r3050TDDiFGByggGay00VvYNulgDDZFevja1BP3fjkI=; b=B/IpqMu6KGsnxExmVicD/NlsZx97Oy3/sI0RTAYtJ7V1jsTMI1tnNma0a9k33u7NaX 8E+CQA+I05WkAwYrN9bGh/O/mPDS3P/kLOE2YzEbOpPBT6SG9UcHFgtJ8BnNFyGhM34h CKJ1KHsNrS2E/wgUpzmmp8f9GKmA+Y00rAfajgBEHz6AWRtsrixWMBj9ZohyZtFdT6gu uheZoIDrckPRLkNEDYLIMTo3FeXI6pmVgCQDEnM6M/aw/xFmH3XQD4kx525SCL4qPx/y Sga+MACnP4Xbf/wC3Bw9wDe61LWksB5oHf1z0OzVUzD+opNl/8i4/S79KWEmih4xZ+dx Wbzg== X-Gm-Message-State: AOAM530sR7bf6Px9hvNM6hzk4PzPRXUMPZlxafiycr4HuyedhTTOjqBJ N1aZzXJAzjJ38U4JXl4ofNL8p4wTAPQ= X-Google-Smtp-Source: ABdhPJwUinlU4PcKdwHiLQ57eOodVEreldeNOd23rB4f2rNrvE2X95yg9nqPgSCTFdDtxxFIGuwUgw== X-Received: by 2002:a17:90a:c207:: with SMTP id e7mr4123322pjt.172.1597839681245; Wed, 19 Aug 2020 05:21:21 -0700 (PDT) Received: from localhost.localdomain ([122.166.129.193]) by smtp.gmail.com with ESMTPSA id k88sm3039767pjk.19.2020.08.19.05.21.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Aug 2020 05:21:20 -0700 (PDT) From: gautamramk@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Wed, 19 Aug 2020 17:51:00 +0530 Message-Id: <20200819122102.5584-2-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 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 This patch fixes tag tree coding for JPEG2000 encoder. --- libavcodec/j2kenc.c | 41 ++++++++++++++++++++++++----------------- libavcodec/jpeg2000.c | 1 + libavcodec/jpeg2000.h | 1 + 3 files changed, 26 insertions(+), 17 deletions(-) diff --git a/libavcodec/j2kenc.c b/libavcodec/j2kenc.c index 16863f8e8c..d9777fe07f 100644 --- a/libavcodec/j2kenc.c +++ b/libavcodec/j2kenc.c @@ -242,27 +242,34 @@ 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){ - put_bits(s, 0, threshold - curval); - break; + + while (1) { + if (curval > node->temp_val) + node->temp_val = curval; + else { + curval = node->temp_val; } - put_bits(s, 0, stack[sp]->val - curval); - put_bits(s, 1, 1); - curval = stack[sp]->val; + while (curval < threshold) { + if (curval >= node->val) { + if (!node->vis) { + node->vis = 1; + put_bits(s, 1, 1); + } + break; + } + put_bits(s, 0, 1); + curval++; + } + 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;