From patchwork Mon Aug 24 17:40:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gautam Ramakrishnan X-Patchwork-Id: 21885 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 544D84491F6 for ; Mon, 24 Aug 2020 20:41:03 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3F436689F05; Mon, 24 Aug 2020 20:41:03 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f193.google.com (mail-pf1-f193.google.com [209.85.210.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 66377689AD2 for ; Mon, 24 Aug 2020 20:40:55 +0300 (EEST) Received: by mail-pf1-f193.google.com with SMTP id k18so5191400pfp.7 for ; Mon, 24 Aug 2020 10:40:55 -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=Y+u8KYL4+W+oZ4M9CixaR9Ro8P45qAAqwT+wru9Vu+g=; b=tdC8egNRyBCJdy+rH+tXd6n1cYWfQAXcEeH2UeCzsfNFdC88I+K8ydJODWYsDEnoOC 9fuf5WGnqruT3TNx1/QqIJiSCNxF7SK8YFKZWD1ZynZ0T58ARTIj10tOunuvx+/GBJye b01JuFBORi8a55zJS7ELfcH9reoeDJzLwX/rQPFapWMcRhXoIGJvXFTXY9Fyap8SpQpy CJMthnsxPyV2Y1cJHIsI7vbqQuyhVJuQmfrx7dIzwIiu6Wbk8gsoCrkJ2snJe//nmlax pXZx8FVaijzCcyI7mU/IAVnaJT78r95/a/UMG7SdzZImy20yBhl7iliqUJyOCVMYGAEa h1lA== 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=Y+u8KYL4+W+oZ4M9CixaR9Ro8P45qAAqwT+wru9Vu+g=; b=Jl7MPouUEChlsdkY07MEC2H5oNCet4udkzdcDPVCXqyE4Ox5Jq30By17FTDJySa4Y3 xOS9uhpGnuXEDiJmb7DIAJOvU7K5tHp+t8ODrjdwE13eW4abACy0wC6KxBOQxLCOfgnJ 8GPFGmwUMjsGmIia65c9HZ4+IrEu0kfRf5WLn5p7gO7B9FIDLDlijhjcJfiM7/g3DAYT 7CiFFmZ666z5iXGVKXUJ3F+Mk5nUjrYPW7kQ6V1O5DlTdTjP4KiWjJixem0oEYho3TTd 7R2VYJopCcBTs2CYT2D3AmUXWy3QzCAmJe7lWw5OvUPKQ4YL4eN0fHoy2XIy25HrXZgT tTyw== X-Gm-Message-State: AOAM530Cs45PhuQ45gCjOVz5QPkl637Gmmc2PXG+RI+uycMxcCYsDK6m KklK1Pb1eOQwf94Ae6b0uqbAo/2qHqCjhQ== X-Google-Smtp-Source: ABdhPJwK9LFiIuI03Ou/CM61/gBW8J6jIffxQ9E0YmQgbyVwJg/8HgJoZVzEYgyHF+u7U1YQjoEYKQ== X-Received: by 2002:a62:7acb:: with SMTP id v194mr4827692pfc.302.1598290849560; Mon, 24 Aug 2020 10:40:49 -0700 (PDT) Received: from localhost.localdomain ([122.167.211.143]) by smtp.gmail.com with ESMTPSA id v2sm5260414pfn.116.2020.08.24.10.40.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Aug 2020 10:40:49 -0700 (PDT) From: gautamramk@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Mon, 24 Aug 2020 23:10:31 +0530 Message-Id: <20200824174034.17837-2-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 2/5] 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, 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;