From patchwork Tue Aug 18 19:40:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gautam Ramakrishnan X-Patchwork-Id: 21713 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 6400B44AE61 for ; Tue, 18 Aug 2020 22:40:57 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 51F90688084; Tue, 18 Aug 2020 22:40:57 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f177.google.com (mail-pf1-f177.google.com [209.85.210.177]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E859B6880DE for ; Tue, 18 Aug 2020 22:40:50 +0300 (EEST) Received: by mail-pf1-f177.google.com with SMTP id d188so10472869pfd.2 for ; Tue, 18 Aug 2020 12:40:50 -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=0C9PCjKTQOo0kIRYPr5Pe4W+v/IPKX5vYgb3lyso38Y=; b=BBw9jt/qfIP6cEZlRI85lWseBuzqIW+ZEPACTDdqTgAuiUTsfn8AbGYgSH1zpKGvex hQd3N4Lz737e6zBnWKS38WXjzJDx4pJckmfdHd2sDexzYcoYRrlFHxqwdJVMlGRgJhS0 THIsmVRpHqkEf55qsC1AhwRLDpzku9dWkbmo28iSpKW21KOi4etj89szTgk4ZT8154Pp 2Y1yf8XV6TDvas9ALEY6xTamQQ0MXiSWNP0yYlnzzhJDrqNHgruqZGO62qxaaFX9RNYf YrreaxGgCXOb4yYRaGJQCVmFO9i3LTDyr/Q0hxpQrC5x7CPpYtOZS1cJ2rvbVfgC6+9A 8PCQ== 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=0C9PCjKTQOo0kIRYPr5Pe4W+v/IPKX5vYgb3lyso38Y=; b=eNHYLmAzTwp06cJ4YEOTnl6xFwAVvJJ1UhdJgzH08XKpDM58OqC4pK2DJNgj/IrJZZ VBxfeXbS2+W6z2kcFwqGqNjtjV8BYf7FVuWHOZZCo3zi5ZAmg5MJ+XLpsuo4HXySiEbk 5PEUAwBQpcFkAG+mLak1Q+hIiMI6HM06ya7LKv8tyF8gLI/noAvQiw7phZmpq0BHHzFH pC7UvOJOBMs+rRH32JijeSv6HxWxvJHQ9O4KN4gduO1nECzk1FiyM7yBr8al954a7o+f QbyVaPzr8wF0ClxojX5YozdwJoLTnEWD1BKlpfSoHZQR9KQB2aO7lpUx0g8h8IGkhF40 5XDA== X-Gm-Message-State: AOAM532XdiNPUA+j+JbuQt9EjTkivPfm/bQ1RQiMOgb07adnxh1YZsFf yKqk1VUCqqEJQXW6AsDiop6vcQsiQ3Q= X-Google-Smtp-Source: ABdhPJwbDdrmL4cFjrGHypjHUJ3zExHu3sYLo1p37zC1dV6JeXNqNWStJyrHpgo2UH8XnY+EW3HMsw== X-Received: by 2002:a63:571c:: with SMTP id l28mr14906228pgb.168.1597779649061; Tue, 18 Aug 2020 12:40:49 -0700 (PDT) Received: from localhost.localdomain ([122.166.129.193]) by smtp.gmail.com with ESMTPSA id z77sm27140885pfc.199.2020.08.18.12.40.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Aug 2020 12:40:48 -0700 (PDT) From: gautamramk@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Wed, 19 Aug 2020 01:10:35 +0530 Message-Id: <20200818194037.25422-2-gautamramk@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200818194037.25422-1-gautamramk@gmail.com> References: <20200818194037.25422-1-gautamramk@gmail.com> Subject: [FFmpeg-devel] [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 | 43 +++++++++++++++++++++++++------------------ libavcodec/jpeg2000.c | 1 + libavcodec/jpeg2000.h | 1 + 3 files changed, 27 insertions(+), 18 deletions(-) diff --git a/libavcodec/j2kenc.c b/libavcodec/j2kenc.c index 16863f8e8c..1c31e48d61 100644 --- a/libavcodec/j2kenc.c +++ b/libavcodec/j2kenc.c @@ -239,30 +239,37 @@ static void j2k_flush(Jpeg2000EncoderContext *s) /* tag tree routines */ /** code the value stored in node */ -static void tag_tree_code(Jpeg2000EncoderContext *s, Jpeg2000TgtNode *node, int threshold) +static void tag_tree_code(Jpeg2000EncoderContext *s, Jpeg2000TgtNode *node, int threshold, int log) { 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 35e21f54a4..7a34a36121 100644 --- a/libavcodec/jpeg2000.c +++ b/libavcodec/jpeg2000.c @@ -88,6 +88,7 @@ void 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 4ea7daa5da..e9f4a51261 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;