From patchwork Sun Aug 23 10:32:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gautam Ramakrishnan X-Patchwork-Id: 21836 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 87C2744B222 for ; Sun, 23 Aug 2020 14:00:26 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 615EC6880CC; Sun, 23 Aug 2020 14:00:26 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi1-f180.google.com (mail-oi1-f180.google.com [209.85.167.180]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 703CF681871 for ; Sun, 23 Aug 2020 14:00:19 +0300 (EEST) Received: by mail-oi1-f180.google.com with SMTP id z195so2683228oia.6 for ; Sun, 23 Aug 2020 04:00:19 -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=GhLx/xpC2hid5lbHDQr4PYeXHELBmA1EdM56W9eTsHqzV6oVMKbrirTGxM/1OJgbKo CfXcKxkBBpUlpk6JIjS3XCSz7JwGN5nf8haT8bhUapF9SGPMGsfdOS4KtfQ0ezeUsmdy pgZ541OXBg3hc4mhwT/K3ncf57I94KmxmsTcOAq155dZj68941VNnEIEhcH6zCTc4wgd 2TeNxzTpFfYnY+GTKfR3qh+TEtWW4RQwCmvqx0LbJ/7tvsUvX8nKe0Nxb23uKwSEmuEI 9TrQD+IpAQQp9EKNmcVDElzrt92PtJgDXUYtEqz9/qyEeGkfKWXx8UeT0exnIc3LnHhf twcQ== 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=WGse/RmU/66MyUuem/XtPE/tuz+pboJBYoqDSel273h9ZGb6EGKZ3Jn9bZrzhTivr2 N7hdpsMCcq3U4cT7CE6D2WV6zlBWcHSJO68gsglrSKxy/qEQCC8BXsY3vgVTUrK0RbxA ofQFxWRCsFBSPlAkELx6Dk4+cyXJc3ctvo+WnaOWvb48Z8bK0EZ3m+O9nnkkDSqSNBVM aQvWVYRyFAnkxmc0kXknC17++dQ3Fv2HpezEQ0A61iIlAl/aPNfN5BP3XTfE9H6ZJWpg QOy0FYWYab27Ioq6ANVh7IRfF/X7DXX5sEYQDgb3cUImwwUu20oePjA7Dc3UEP0d2ghF sokw== X-Gm-Message-State: AOAM533oscMNXJiWXDXosXHeTtchJQF/zBDcBquPtUJdbYPMPh4TMC4e 48d9I2BEkL2ZzwWovTABBAwGLrfbkxo= X-Google-Smtp-Source: ABdhPJxFla365GJEBmmmFV5pLGFzuVEgMWaf2E0OAEb2FOoX5czM/eoD+/M6uj+Wr7AwNqCARCqVkw== X-Received: by 2002:a17:90b:1b09:: with SMTP id nu9mr660697pjb.214.1598178751733; Sun, 23 Aug 2020 03:32:31 -0700 (PDT) Received: from localhost.localdomain ([122.167.211.143]) by smtp.gmail.com with ESMTPSA id x20sm6509365pgh.93.2020.08.23.03.32.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 23 Aug 2020 03:32:31 -0700 (PDT) From: gautamramk@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Sun, 23 Aug 2020 16:02:21 +0530 Message-Id: <20200823103223.22289-2-gautamramk@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200823103223.22289-1-gautamramk@gmail.com> References: <20200823103223.22289-1-gautamramk@gmail.com> Subject: [FFmpeg-devel] [RFC PATCH v2 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;