From patchwork Mon Apr 20 19:37:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gautam Ramakrishnan X-Patchwork-Id: 19113 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 0C21C44B17E for ; Mon, 20 Apr 2020 22:37:57 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E067B68B853; Mon, 20 Apr 2020 22:37:56 +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 B6B4A68B75D for ; Mon, 20 Apr 2020 22:37:49 +0300 (EEST) Received: by mail-pf1-f193.google.com with SMTP id 145so3173987pfw.13 for ; Mon, 20 Apr 2020 12:37:49 -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=6ScnezpeYQu6WH9AAzt4uVn6O+GTAV5youOzsn04nj4=; b=ZcDtvpzO3H2n5iZb/KCnNrlfjs2qEfNXzM34masFJ8NTEN0nYV2wmGDIvTj+paPGj+ DyVEMRGPP+EvQGpdJGxNiMQ9HEeFYCS7AaVnDV1mpLU1NTIzyK/paMgC4hC/BAa/tSN+ fDtmQBLf14z/DHBP75Imj+4l1wTPxrb9Mw54M6tyXSxYF9Fy7liaD0Xjuh/rwhKrNMc5 Ilwg2PqlbvysY0ljTZ/c52+ULRBYqIUViJQHL1dvKOUTGBDYSiHWPSSnJSiBALuqYPbR 8wxdygEoYtxEC80CF7phWrDEGxuI/na4hIjXe1Jroa5aixBqusKtA8tG3hCEzCSiz9Vi bAWg== 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=6ScnezpeYQu6WH9AAzt4uVn6O+GTAV5youOzsn04nj4=; b=G9xk4O3W3KHUSUd5dnYsN5qNFduT9c6uffMbCfjhumRGno0N3KEXZogyhLF6p5TYMo f8eTEX3vhgJBvuyX4SafNcNhW3sjF1Q6jpDuTZE8RozESKCviAVTtJLjsaYy32M76O9k 5UdXKQLXKNXxMiCdf7thftFpcnJaq8MdEAjUoeTSv9pX/c3lna7VA4puE9cSYOk/a4ZY +Qc2r21ySKfQnMqgEUGnpF0nJ/YYniqDOB0C8D+x03+MHXkmaiX+fB3/arRDX/Fvwzhn Yh48yij/mYUWHFZbBIr7NI8fYAC6ZPAlPB3kOwDflaTR7Ktbw9ffY4kL/yN80pN0uqd3 zKRQ== X-Gm-Message-State: AGi0PublXjfeSKGuG3zPJ/4CohOXMloZuSCX40zQ2t+8DfTOuBPXd1Pw XyAGuKQUDP5zWddpFECjzL4Ub6S/BZQ= X-Google-Smtp-Source: APiQypINrPc8cgft/NOjIZ2VqZ8Gx+RQDXMGSR8FN+EFp5qPFCI6on/3kX9BxYoTxllerEhnmpYEzQ== X-Received: by 2002:a63:5b57:: with SMTP id l23mr4071625pgm.391.1587411467518; Mon, 20 Apr 2020 12:37:47 -0700 (PDT) Received: from localhost.localdomain ([223.235.255.212]) by smtp.gmail.com with ESMTPSA id nk12sm154135pjb.41.2020.04.20.12.37.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Apr 2020 12:37:47 -0700 (PDT) From: gautamramk@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Tue, 21 Apr 2020 01:07:39 +0530 Message-Id: <20200420193739.15378-2-gautamramk@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200420193739.15378-1-gautamramk@gmail.com> References: <20200420193739.15378-1-gautamramk@gmail.com> Subject: [FFmpeg-devel] [PATCH 2/2] libavcodec/jpeg2000dec.c: ROI marker support 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 adds support for decoding images with a Region of Interest. Allows decoding samples such as p0_03.j2k. This patch should fix ticket #4681. --- libavcodec/jpeg2000.h | 1 + libavcodec/jpeg2000dec.c | 57 +++++++++++++++++++++++++++++++++++----- 2 files changed, 51 insertions(+), 7 deletions(-) diff --git a/libavcodec/jpeg2000.h b/libavcodec/jpeg2000.h index 7b78c0193e..0f82716981 100644 --- a/libavcodec/jpeg2000.h +++ b/libavcodec/jpeg2000.h @@ -210,6 +210,7 @@ typedef struct Jpeg2000Component { int *i_data; int coord[2][2]; // border coordinates {{x0, x1}, {y0, y1}} -- can be reduced with lowres option int coord_o[2][2]; // border coordinates {{x0, x1}, {y0, y1}} -- original values from jpeg2000 headers + uint8_t roi_shift; // ROI scaling value for the component } Jpeg2000Component; /* misc tools */ diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index 5a7d9e7882..da19345ee7 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -117,6 +117,7 @@ typedef struct Jpeg2000DecoderContext { Jpeg2000CodingStyle codsty[4]; Jpeg2000QuantStyle qntsty[4]; Jpeg2000POC poc; + uint8_t roi_shift[4]; int bit_index; @@ -598,6 +599,29 @@ static int get_coc(Jpeg2000DecoderContext *s, Jpeg2000CodingStyle *c, return 0; } +static int get_rgn(Jpeg2000DecoderContext *s, int n) +{ + uint16_t compno; + compno = (s->ncomponents < 257)? bytestream2_get_byte(&s->g): + bytestream2_get_be16u(&s->g); + if (bytestream2_get_byte(&s->g)) { + av_log(s->avctx, AV_LOG_ERROR, "Invalid RGN header.\n"); + return AVERROR_INVALIDDATA; // SRgn field value is 0 + } + // SPrgn field + if (compno < s->ncomponents) { + if (s->curtileno == -1) + s->roi_shift[compno] = bytestream2_get_byte(&s->g); + else { + if (s->tile[s->curtileno].tp_idx != 0) + return AVERROR_INVALIDDATA; // marker occurs only in first tile part of tile + s->tile[s->curtileno].comp[compno].roi_shift = bytestream2_get_byte(&s->g); + } + return 0; + } + return AVERROR_INVALIDDATA; +} + /* Get common part for QCD and QCC segments. */ static int get_qcx(Jpeg2000DecoderContext *s, int n, Jpeg2000QuantStyle *q) { @@ -947,6 +971,9 @@ static int init_tile(Jpeg2000DecoderContext *s, int tileno) comp->coord[1][0] = ff_jpeg2000_ceildivpow2(comp->coord_o[1][0], s->reduction_factor); comp->coord[1][1] = ff_jpeg2000_ceildivpow2(comp->coord_o[1][1], s->reduction_factor); + if (!comp->roi_shift) + comp->roi_shift = s->roi_shift[compno]; + if (ret = ff_jpeg2000_init_component(comp, codsty, qntsty, s->cbps[compno], s->cdx[compno], s->cdy[compno], s->avctx)) @@ -1615,9 +1642,9 @@ static void decode_clnpass(Jpeg2000DecoderContext *s, Jpeg2000T1Context *t1, static int decode_cblk(Jpeg2000DecoderContext *s, Jpeg2000CodingStyle *codsty, Jpeg2000T1Context *t1, Jpeg2000Cblk *cblk, - int width, int height, int bandpos) + int width, int height, int bandpos, uint8_t roi_shift) { - int passno = cblk->npasses, pass_t = 2, bpno = cblk->nonzerobits - 1; + int passno = cblk->npasses, pass_t = 2, bpno = cblk->nonzerobits - 1 + roi_shift; int pass_cnt = 0; int vert_causal_ctx_csty_symbol = codsty->cblk_style & JPEG2000_CBLK_VSC; int term_cnt = 0; @@ -1691,6 +1718,19 @@ static int decode_cblk(Jpeg2000DecoderContext *s, Jpeg2000CodingStyle *codsty, return 1; } +static inline int roi_shift_param(Jpeg2000Component *comp, + int quan_parameter) +{ + uint8_t roi_shift; + int val; + roi_shift = comp->roi_shift; + val = (quan_parameter < 0)?-quan_parameter:quan_parameter; + + if (val > (1 << roi_shift)) + return (quan_parameter < 0)?-(val >> roi_shift):(val >> roi_shift); + return quan_parameter; +} + /* TODO: Verify dequantization for lossless case * comp->data can be float or int * band->stepsize can be float or int @@ -1708,7 +1748,7 @@ static void dequantization_float(int x, int y, Jpeg2000Cblk *cblk, float *datap = &comp->f_data[(comp->coord[0][1] - comp->coord[0][0]) * (y + j) + x]; int *src = t1->data + j*t1->stride; for (i = 0; i < w; ++i) - datap[i] = src[i] * band->f_stepsize; + datap[i] = roi_shift_param(comp, src[i]) * band->f_stepsize; } } @@ -1724,11 +1764,11 @@ static void dequantization_int(int x, int y, Jpeg2000Cblk *cblk, int *src = t1->data + j*t1->stride; if (band->i_stepsize == 32768) { for (i = 0; i < w; ++i) - datap[i] = src[i] / 2; + datap[i] = roi_shift_param(comp, src[i]) / 2; } else { // This should be VERY uncommon for (i = 0; i < w; ++i) - datap[i] = (src[i] * (int64_t)band->i_stepsize) / 65536; + datap[i] = (roi_shift_param(comp, src[i]) * (int64_t)band->i_stepsize) / 65536; } } } @@ -1743,7 +1783,7 @@ static void dequantization_int_97(int x, int y, Jpeg2000Cblk *cblk, int32_t *datap = &comp->i_data[(comp->coord[0][1] - comp->coord[0][0]) * (y + j) + x]; int *src = t1->data + j*t1->stride; for (i = 0; i < w; ++i) - datap[i] = (src[i] * (int64_t)band->i_stepsize + (1<<15)) >> 16; + datap[i] = (roi_shift_param(comp, src[i]) * (int64_t)band->i_stepsize + (1<<15)) >> 16; } } @@ -1818,7 +1858,7 @@ static inline void tile_codeblocks(Jpeg2000DecoderContext *s, Jpeg2000Tile *tile int ret = decode_cblk(s, codsty, &t1, cblk, cblk->coord[0][1] - cblk->coord[0][0], cblk->coord[1][1] - cblk->coord[1][0], - bandpos); + bandpos, comp->roi_shift); if (ret) coded = 1; else @@ -2046,6 +2086,9 @@ static int jpeg2000_read_main_headers(Jpeg2000DecoderContext *s) case JPEG2000_COD: ret = get_cod(s, codsty, properties); break; + case JPEG2000_RGN: + ret = get_rgn(s, len); + break; case JPEG2000_QCC: ret = get_qcc(s, len, qntsty, properties); break;