From patchwork Fri Mar 27 16:16:01 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gautam Ramakrishnan X-Patchwork-Id: 18441 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 1096544A518 for ; Fri, 27 Mar 2020 18:21:39 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E649968B832; Fri, 27 Mar 2020 18:21:38 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi1-f193.google.com (mail-oi1-f193.google.com [209.85.167.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 24CAC68B75F for ; Fri, 27 Mar 2020 18:21:32 +0200 (EET) Received: by mail-oi1-f193.google.com with SMTP id l22so9223092oii.12 for ; Fri, 27 Mar 2020 09:21:32 -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; bh=c6AfuCk5+w5nzbuHu8Se5M4qwBZERRxj1znnaGV8ftI=; b=i/AMPVTVqxdOA0UwZ5OUrykRI4dfvAR+6J4s9XGRaHMz15iXNYM+uquQwvb9O83Ea7 Q1J69PwGhFszlGpPPh5lIQuwdENMR69CCrHvKsltOMyVbZ92XGJaMd6UZAe/4edatp51 /pR90JFptUOvJGx8ddtuccstJBhfDNd8av2nQPSlHujhUztpihXXohX9r6mRRlRFnuKj /h02Xec9U52mQN0nFTXXQIfFp8jtKNPsBxllTYmTKZmU2DFEPO1LOFzoN4zDOziSeD+R Xf+hknHxA/Vumh828k8K624Zn7frCwWdT0pxJZ8JBPaT+IkfroB/MZC7XTxIvZ2QBaYa uCnA== 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; bh=c6AfuCk5+w5nzbuHu8Se5M4qwBZERRxj1znnaGV8ftI=; b=IyQ4fFvnQDhlkXNK6Btq7mz1MqT92oFvDVXi97txOjJZl2Pcnq8eEpiwcCe1Mtiddy gf+ob9U1aGKd3PrrSCQ/uuUBL+o8TGw3ICu4SzmbOFS6/ORotHNM6duzZEDvGuVhaiBX yGZA+QmH6qfXKl0qTQxx5EwUiDXvTUR9+mhvBhTP4qDjR0zMIWlQ0FNQytTR01unHiLT 6fo8wt2HMjtYPnQ/0SllNjA9QyYnGXrul7xP6GSQNKsahWbhXp8l+fVacNJpZcJMAoRH q9q8PlyLyHmZ1gIWBpdXUUbQael8BQesVyvYcByThMQ5sqW/nsG6FlBgcqywVToX5SfP DNMw== X-Gm-Message-State: ANhLgQ0m6NJZhqqRmlyO7HNDKKM0jUwixSfHEl9IfHKPkkiHwnolmxpO pnjqb5JArTIvZSIODMnrFlQJq1wbklM= X-Google-Smtp-Source: ADFU+vvR0XiSYIY0QMYwEV6aYyKx12rw0r73J2y45yL0df371P6Yxs7F3ybz0UUwzNA5WULp4NFjgw== X-Received: by 2002:a17:90a:20ad:: with SMTP id f42mr145519pjg.135.1585325778977; Fri, 27 Mar 2020 09:16:18 -0700 (PDT) Received: from localhost.localdomain ([223.235.255.212]) by smtp.gmail.com with ESMTPSA id q12sm4482316pfs.48.2020.03.27.09.16.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Mar 2020 09:16:18 -0700 (PDT) From: gautamramk@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Fri, 27 Mar 2020 21:46:01 +0530 Message-Id: <20200327161602.1263-1-gautamramk@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH v2 1/2] libavcodec/jpeg2000dec.c: Add functions and modify structs for PPT 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 modifies the Jpeg2000Tile struct and breaks the jpeg2000_decode_packet() function into two to decode packet header and data separately. --- libavcodec/jpeg2000dec.c | 250 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 248 insertions(+), 2 deletions(-) diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index 019dc81f56..7236e9b7bb 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -83,8 +83,12 @@ typedef struct Jpeg2000Tile { Jpeg2000QuantStyle qntsty[4]; Jpeg2000POC poc; Jpeg2000TilePart tile_part[32]; - uint16_t tp_idx; // Tile-part index - int coord[2][2]; // border coordinates {{x0, x1}, {y0, y1}} + uint8_t has_ppt; // whether this tile has a ppt marker + uint8_t *packed_headers; // contains packed headers. Used only along with PPT marker + int packed_headers_size; // size in bytes of the packed headers + GetByteContext packed_headers_stream; // byte context corresponding to packed headers + uint16_t tp_idx; // Tile-part index + int coord[2][2]; // border coordinates {{x0, x1}, {y0, y1}} } Jpeg2000Tile; typedef struct Jpeg2000DecoderContext { @@ -851,6 +855,38 @@ static int get_plt(Jpeg2000DecoderContext *s, int n) return 0; } +static int get_ppt(Jpeg2000DecoderContext *s, int n) +{ + Jpeg2000Tile *tile; + + tile = &s->tile[s->curtileno]; + + av_assert1(s->curtileno >= 0); + if (tile->tp_idx != 0) { + av_log(s->avctx, AV_LOG_ERROR, + "PPT marker can occur only on first tile part of a tile.\n"); + return AVERROR_INVALIDDATA; + } + + tile->has_ppt = 1; // this tile has a ppt marker +/* Zppt = */ bytestream2_get_byte(&s->g); + if (!tile->packed_headers) { + tile->packed_headers = av_malloc_array(n - 3, sizeof(uint8_t)); + memcpy(tile->packed_headers, s->g.buffer, sizeof(uint8_t)*(n - 3)); + tile->packed_headers_size = n - 3; + } else { + tile->packed_headers = av_realloc_array(tile->packed_headers, + tile->packed_headers_size + n - 3, + sizeof(uint8_t)); + memcpy(tile->packed_headers + tile->packed_headers_size, + s->g.buffer, sizeof(uint8_t)*(n - 3)); + tile->packed_headers_size += n - 3; + } + bytestream2_skip(&s->g, n - 3); + + return 0; +} + static int init_tile(Jpeg2000DecoderContext *s, int tileno) { int compno; @@ -923,6 +959,216 @@ static int getlblockinc(Jpeg2000DecoderContext *s) return res; } +static int jpeg2000_decode_packet_header(Jpeg2000DecoderContext *s, Jpeg2000Tile *tile, + int *tp_index, + Jpeg2000CodingStyle *codsty, + Jpeg2000ResLevel *rlevel, int precno, + int layno, uint8_t *expn, int numgbits, + int *process_data) +{ + int bandno, cblkno, ret, nb_code_blocks; + + if (layno < rlevel->band[0].prec[precno].decoded_layers) { + *process_data = 0; + return 0; + } + rlevel->band[0].prec[precno].decoded_layers = layno + 1; + + if (tile->has_ppt) { + s->g = tile->packed_headers_stream; + } else { + s->g = tile->tile_part[*tp_index].tpg; + if (bytestream2_get_bytes_left(&s->g) == 0 && s->bit_index == 8) { + if (*tp_index < FF_ARRAY_ELEMS(tile->tile_part) - 1) { + s->g = tile->tile_part[++(*tp_index)].tpg; + } + } + if (bytestream2_peek_be32(&s->g) == JPEG2000_SOP_FIXED_BYTES) + bytestream2_skip(&s->g, JPEG2000_SOP_BYTE_LENGTH); + } + + if (!(ret = get_bits(s, 1))) { + jpeg2000_flush(s); + *process_data = 0; + goto end; + } else if (ret < 0) + return ret; + + for (bandno = 0; bandno < rlevel->nbands; bandno++) { + Jpeg2000Band *band = rlevel->band + bandno; + Jpeg2000Prec *prec = band->prec + precno; + + if (band->coord[0][0] == band->coord[0][1] || + band->coord[1][0] == band->coord[1][1]) + continue; + nb_code_blocks = prec->nb_codeblocks_height * + prec->nb_codeblocks_width; + for (cblkno = 0; cblkno < nb_code_blocks; cblkno++) { + Jpeg2000Cblk *cblk = prec->cblk + cblkno; + int incl, newpasses, llen; + void *tmp; + + if (cblk->npasses) + incl = get_bits(s, 1); + else + incl = tag_tree_decode(s, prec->cblkincl + cblkno, layno + 1) == layno; + if (!incl) + continue; + else if (incl < 0) + return incl; + + if (!cblk->npasses) { + int v = expn[bandno] + numgbits - 1 - + tag_tree_decode(s, prec->zerobits + cblkno, 100); + if (v < 0 || v > 30) { + av_log(s->avctx, AV_LOG_ERROR, + "nonzerobits %d invalid or unsupported\n", v); + return AVERROR_INVALIDDATA; + } + cblk->nonzerobits = v; + } + if ((newpasses = getnpasses(s)) < 0) + return newpasses; + av_assert2(newpasses > 0); + if (cblk->npasses + newpasses >= JPEG2000_MAX_PASSES) { + avpriv_request_sample(s->avctx, "Too many passes"); + return AVERROR_PATCHWELCOME; + } + if ((llen = getlblockinc(s)) < 0) + return llen; + if (cblk->lblock + llen + av_log2(newpasses) > 16) { + avpriv_request_sample(s->avctx, + "Block with length beyond 16 bits"); + return AVERROR_PATCHWELCOME; + } + + cblk->lblock += llen; + + cblk->nb_lengthinc = 0; + cblk->nb_terminationsinc = 0; + av_free(cblk->lengthinc); + cblk->lengthinc = av_mallocz_array(newpasses , sizeof(*cblk->lengthinc)); + if (!cblk->lengthinc) + return AVERROR(ENOMEM); + tmp = av_realloc_array(cblk->data_start, cblk->nb_terminations + newpasses + 1, sizeof(*cblk->data_start)); + if (!tmp) + return AVERROR(ENOMEM); + cblk->data_start = tmp; + do { + int newpasses1 = 0; + + while (newpasses1 < newpasses) { + newpasses1 ++; + if (needs_termination(codsty->cblk_style, cblk->npasses + newpasses1 - 1)) { + cblk->nb_terminationsinc ++; + break; + } + } + + if ((ret = get_bits(s, av_log2(newpasses1) + cblk->lblock)) < 0) + return ret; + if (ret > cblk->data_allocated) { + size_t new_size = FFMAX(2*cblk->data_allocated, ret); + void *new = av_realloc(cblk->data, new_size); + if (new) { + cblk->data = new; + cblk->data_allocated = new_size; + } + } + if (ret > cblk->data_allocated) { + avpriv_request_sample(s->avctx, + "Block with lengthinc greater than %"SIZE_SPECIFIER"", + cblk->data_allocated); + return AVERROR_PATCHWELCOME; + } + cblk->lengthinc[cblk->nb_lengthinc++] = ret; + cblk->npasses += newpasses1; + newpasses -= newpasses1; + } while(newpasses); + } + } + jpeg2000_flush(s); + + if (codsty->csty & JPEG2000_CSTY_EPH) { + if (bytestream2_peek_be16(&s->g) == JPEG2000_EPH) + bytestream2_skip(&s->g, 2); + else + av_log(s->avctx, AV_LOG_ERROR, "EPH marker not found. instead %X\n", bytestream2_peek_be32(&s->g)); + } +end: + if (tile->has_ppt) + tile->packed_headers_stream = s->g; + else + tile->tile_part[*tp_index].tpg = s->g; + return 0; +} + +static int jpeg2000_decode_packet_data(Jpeg2000DecoderContext *s, Jpeg2000Tile *tile, + int *tp_index, + Jpeg2000CodingStyle *codsty, + Jpeg2000ResLevel *rlevel, int precno, + int layno, uint8_t *expn, int numgbits) +{ + int bandno, cblkno, nb_code_blocks; + int cwsno; + + s->g = tile->tile_part[*tp_index].tpg; + if (tile->has_ppt) { + if (bytestream2_get_bytes_left(&s->g) == 0 && s->bit_index == 8) { + if (*tp_index < FF_ARRAY_ELEMS(tile->tile_part) - 1) { + s->g = tile->tile_part[++(*tp_index)].tpg; + } + } + if (bytestream2_peek_be32(&s->g) == JPEG2000_SOP_FIXED_BYTES) + bytestream2_skip(&s->g, JPEG2000_SOP_BYTE_LENGTH); + } + + + for (bandno = 0; bandno < rlevel->nbands; bandno++) { + Jpeg2000Band *band = rlevel->band + bandno; + Jpeg2000Prec *prec = band->prec + precno; + + nb_code_blocks = prec->nb_codeblocks_height * prec->nb_codeblocks_width; + for (cblkno = 0; cblkno < nb_code_blocks; cblkno++) { + Jpeg2000Cblk *cblk = prec->cblk + cblkno; + if (!cblk->nb_terminationsinc && !cblk->lengthinc) + continue; + for (cwsno = 0; cwsno < cblk->nb_lengthinc; cwsno ++) { + if (cblk->data_allocated < cblk->length + cblk->lengthinc[cwsno] + 4) { + size_t new_size = FFMAX(2*cblk->data_allocated, cblk->length + cblk->lengthinc[cwsno] + 4); + void *new = av_realloc(cblk->data, new_size); + if (new) { + cblk->data = new; + cblk->data_allocated = new_size; + } + } + if ( bytestream2_get_bytes_left(&s->g) < cblk->lengthinc[cwsno] + || cblk->data_allocated < cblk->length + cblk->lengthinc[cwsno] + 4 + ) { + av_log(s->avctx, AV_LOG_ERROR, + "Block length %"PRIu16" or lengthinc %d is too large, left %d\n", + cblk->length, cblk->lengthinc[cwsno], bytestream2_get_bytes_left(&s->g)); + return AVERROR_INVALIDDATA; + } + + bytestream2_get_bufferu(&s->g, cblk->data + cblk->length, cblk->lengthinc[cwsno]); + cblk->length += cblk->lengthinc[cwsno]; + cblk->lengthinc[cwsno] = 0; + if (cblk->nb_terminationsinc) { + cblk->nb_terminationsinc--; + cblk->nb_terminations++; + cblk->data[cblk->length++] = 0xFF; + cblk->data[cblk->length++] = 0xFF; + cblk->data_start[cblk->nb_terminations] = cblk->length; + } + } + av_freep(&cblk->lengthinc); + } + } + tile->tile_part[*tp_index].tpg = s->g; + return 0; +} + static int jpeg2000_decode_packet(Jpeg2000DecoderContext *s, Jpeg2000Tile *tile, int *tp_index, Jpeg2000CodingStyle *codsty, Jpeg2000ResLevel *rlevel, int precno, From patchwork Fri Mar 27 16:16:02 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gautam Ramakrishnan X-Patchwork-Id: 18440 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 68EAC44A902 for ; Fri, 27 Mar 2020 18:16:30 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 48DD468B81A; Fri, 27 Mar 2020 18:16:30 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f47.google.com (mail-pj1-f47.google.com [209.85.216.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 837D768B5EB for ; Fri, 27 Mar 2020 18:16:23 +0200 (EET) Received: by mail-pj1-f47.google.com with SMTP id nu11so3975228pjb.1 for ; Fri, 27 Mar 2020 09:16: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=PCzPxyPRYE3RYysbLTFuqzxZR1joAhRrGpQUEJxy6HQ=; b=lk2H+djyy5fT3rjPbPnIdYljSRDiJTiIbGPPSETLIxNF2hl+P3X6pQG/ZSE1iGlwB5 XqKSKOgLT2k74OoKVi6LTV1TIS5GZkP2oPMGlgM2wkPmJvzTIzM8N3EKrUcOPmNxSJce VF0jpB7PfgCUlcKbvo098CrfcgkMVzF2mrhL3ragtE7q+uM7mlIrkJfG/hKLktvm8AL9 1RE9vska262zMmyd54ePTA6sDCkXIzbyNUpOd0ZyMWs1aY3N8opopbLloPyB8tx1aV/4 d3Es1XUiveon22DELMyRpwEgcgpNAIr4JpQpUb3h28GAzvzgbfWpLuZoAB/42TNWEMrI xEaA== 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=PCzPxyPRYE3RYysbLTFuqzxZR1joAhRrGpQUEJxy6HQ=; b=UJnPYxYDFuNY0FCXkfDaLg3DAUusDuoBLJfnuBDJroIREsYWpl/Bmx5fcznLKlX/hK lscre888mmNOC+n6EnEXJh0ZpaSzv11Zn73yuTVVab8OSkVP3SjVcCGqnNnyD17bxpdo ZaBzr4SjfDQ7VuNoEcS9+SpdNNB0nxtZGZvYPfFUW2WniatblF3AY4tsyieBAgq5uDyz P5DgFjZm3a1Rc85KYrUJA7ga1xh/NHMgCkA80jLO/Wmoceu+DH0nE7MNatpE0EXUGQZg capxXDyVy9vTqH3YXcIAyeYZG7kNyBHnvVa3zrc+gTr0ilH/+hSCLwUZQjo29fqedZd0 UHwg== X-Gm-Message-State: ANhLgQ2Rf/LSRj9Dbh5fV+QyIaTF7ZoE/e6jEKIBV6XDUN30yaRbxeIQ o5+i9WD9KCJiO1T0FhRHz+ffLTy0gXA= X-Google-Smtp-Source: ADFU+vsLt1g1/Z9eMXBMayONEUabCydspyHRugcOf5LDLW2oeV0SVFpeSLCx4t0+s88qrqK3GpGf/w== X-Received: by 2002:a17:90a:25c8:: with SMTP id k66mr200219pje.90.1585325781093; Fri, 27 Mar 2020 09:16:21 -0700 (PDT) Received: from localhost.localdomain ([223.235.255.212]) by smtp.gmail.com with ESMTPSA id q12sm4482316pfs.48.2020.03.27.09.16.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Mar 2020 09:16:20 -0700 (PDT) From: gautamramk@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Fri, 27 Mar 2020 21:46:02 +0530 Message-Id: <20200327161602.1263-2-gautamramk@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200327161602.1263-1-gautamramk@gmail.com> References: <20200327161602.1263-1-gautamramk@gmail.com> Subject: [FFmpeg-devel] [PATCH v2 2/2] libavcodec/jpeg2000dec.c: Functional changes to support PPT marker 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 functional changes to support the PPT marker. It allows the PPT marker to be read in jpeg2000_read_main_headers(). --- libavcodec/jpeg2000dec.c | 270 ++++++++++++--------------------------- 1 file changed, 82 insertions(+), 188 deletions(-) diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index 7236e9b7bb..fbc025449a 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -1169,179 +1169,6 @@ static int jpeg2000_decode_packet_data(Jpeg2000DecoderContext *s, Jpeg2000Tile * return 0; } -static int jpeg2000_decode_packet(Jpeg2000DecoderContext *s, Jpeg2000Tile *tile, int *tp_index, - Jpeg2000CodingStyle *codsty, - Jpeg2000ResLevel *rlevel, int precno, - int layno, uint8_t *expn, int numgbits) -{ - int bandno, cblkno, ret, nb_code_blocks; - int cwsno; - - if (layno < rlevel->band[0].prec[precno].decoded_layers) - return 0; - rlevel->band[0].prec[precno].decoded_layers = layno + 1; - - if (bytestream2_get_bytes_left(&s->g) == 0 && s->bit_index == 8) { - if (*tp_index < FF_ARRAY_ELEMS(tile->tile_part) - 1) { - s->g = tile->tile_part[++(*tp_index)].tpg; - } - } - - if (bytestream2_peek_be32(&s->g) == JPEG2000_SOP_FIXED_BYTES) - bytestream2_skip(&s->g, JPEG2000_SOP_BYTE_LENGTH); - - if (!(ret = get_bits(s, 1))) { - jpeg2000_flush(s); - return 0; - } else if (ret < 0) - return ret; - - for (bandno = 0; bandno < rlevel->nbands; bandno++) { - Jpeg2000Band *band = rlevel->band + bandno; - Jpeg2000Prec *prec = band->prec + precno; - - if (band->coord[0][0] == band->coord[0][1] || - band->coord[1][0] == band->coord[1][1]) - continue; - nb_code_blocks = prec->nb_codeblocks_height * - prec->nb_codeblocks_width; - for (cblkno = 0; cblkno < nb_code_blocks; cblkno++) { - Jpeg2000Cblk *cblk = prec->cblk + cblkno; - int incl, newpasses, llen; - void *tmp; - - if (cblk->npasses) - incl = get_bits(s, 1); - else - incl = tag_tree_decode(s, prec->cblkincl + cblkno, layno + 1) == layno; - if (!incl) - continue; - else if (incl < 0) - return incl; - - if (!cblk->npasses) { - int v = expn[bandno] + numgbits - 1 - - tag_tree_decode(s, prec->zerobits + cblkno, 100); - if (v < 0 || v > 30) { - av_log(s->avctx, AV_LOG_ERROR, - "nonzerobits %d invalid or unsupported\n", v); - return AVERROR_INVALIDDATA; - } - cblk->nonzerobits = v; - } - if ((newpasses = getnpasses(s)) < 0) - return newpasses; - av_assert2(newpasses > 0); - if (cblk->npasses + newpasses >= JPEG2000_MAX_PASSES) { - avpriv_request_sample(s->avctx, "Too many passes"); - return AVERROR_PATCHWELCOME; - } - if ((llen = getlblockinc(s)) < 0) - return llen; - if (cblk->lblock + llen + av_log2(newpasses) > 16) { - avpriv_request_sample(s->avctx, - "Block with length beyond 16 bits"); - return AVERROR_PATCHWELCOME; - } - - cblk->lblock += llen; - - cblk->nb_lengthinc = 0; - cblk->nb_terminationsinc = 0; - av_free(cblk->lengthinc); - cblk->lengthinc = av_mallocz_array(newpasses , sizeof(*cblk->lengthinc)); - if (!cblk->lengthinc) - return AVERROR(ENOMEM); - tmp = av_realloc_array(cblk->data_start, cblk->nb_terminations + newpasses + 1, sizeof(*cblk->data_start)); - if (!tmp) - return AVERROR(ENOMEM); - cblk->data_start = tmp; - do { - int newpasses1 = 0; - - while (newpasses1 < newpasses) { - newpasses1 ++; - if (needs_termination(codsty->cblk_style, cblk->npasses + newpasses1 - 1)) { - cblk->nb_terminationsinc ++; - break; - } - } - - if ((ret = get_bits(s, av_log2(newpasses1) + cblk->lblock)) < 0) - return ret; - if (ret > cblk->data_allocated) { - size_t new_size = FFMAX(2*cblk->data_allocated, ret); - void *new = av_realloc(cblk->data, new_size); - if (new) { - cblk->data = new; - cblk->data_allocated = new_size; - } - } - if (ret > cblk->data_allocated) { - avpriv_request_sample(s->avctx, - "Block with lengthinc greater than %"SIZE_SPECIFIER"", - cblk->data_allocated); - return AVERROR_PATCHWELCOME; - } - cblk->lengthinc[cblk->nb_lengthinc++] = ret; - cblk->npasses += newpasses1; - newpasses -= newpasses1; - } while(newpasses); - } - } - jpeg2000_flush(s); - - if (codsty->csty & JPEG2000_CSTY_EPH) { - if (bytestream2_peek_be16(&s->g) == JPEG2000_EPH) - bytestream2_skip(&s->g, 2); - else - av_log(s->avctx, AV_LOG_ERROR, "EPH marker not found. instead %X\n", bytestream2_peek_be32(&s->g)); - } - - for (bandno = 0; bandno < rlevel->nbands; bandno++) { - Jpeg2000Band *band = rlevel->band + bandno; - Jpeg2000Prec *prec = band->prec + precno; - - nb_code_blocks = prec->nb_codeblocks_height * prec->nb_codeblocks_width; - for (cblkno = 0; cblkno < nb_code_blocks; cblkno++) { - Jpeg2000Cblk *cblk = prec->cblk + cblkno; - if (!cblk->nb_terminationsinc && !cblk->lengthinc) - continue; - for (cwsno = 0; cwsno < cblk->nb_lengthinc; cwsno ++) { - if (cblk->data_allocated < cblk->length + cblk->lengthinc[cwsno] + 4) { - size_t new_size = FFMAX(2*cblk->data_allocated, cblk->length + cblk->lengthinc[cwsno] + 4); - void *new = av_realloc(cblk->data, new_size); - if (new) { - cblk->data = new; - cblk->data_allocated = new_size; - } - } - if ( bytestream2_get_bytes_left(&s->g) < cblk->lengthinc[cwsno] - || cblk->data_allocated < cblk->length + cblk->lengthinc[cwsno] + 4 - ) { - av_log(s->avctx, AV_LOG_ERROR, - "Block length %"PRIu16" or lengthinc %d is too large, left %d\n", - cblk->length, cblk->lengthinc[cwsno], bytestream2_get_bytes_left(&s->g)); - return AVERROR_INVALIDDATA; - } - - bytestream2_get_bufferu(&s->g, cblk->data + cblk->length, cblk->lengthinc[cwsno]); - cblk->length += cblk->lengthinc[cwsno]; - cblk->lengthinc[cwsno] = 0; - if (cblk->nb_terminationsinc) { - cblk->nb_terminationsinc--; - cblk->nb_terminations++; - cblk->data[cblk->length++] = 0xFF; - cblk->data[cblk->length++] = 0xFF; - cblk->data_start[cblk->nb_terminations] = cblk->length; - } - } - av_freep(&cblk->lengthinc); - } - } - return 0; -} - static int jpeg2000_decode_packets_po_iteration(Jpeg2000DecoderContext *s, Jpeg2000Tile *tile, int RSpoc, int CSpoc, int LYEpoc, int REpoc, int CEpoc, @@ -1366,13 +1193,25 @@ static int jpeg2000_decode_packets_po_iteration(Jpeg2000DecoderContext *s, Jpeg2 Jpeg2000ResLevel *rlevel = tile->comp[compno].reslevel + reslevelno; ok_reslevel = 1; - for (precno = 0; precno < rlevel->num_precincts_x * rlevel->num_precincts_y; precno++) - if ((ret = jpeg2000_decode_packet(s, tile, tp_index, + for (precno = 0; precno < rlevel->num_precincts_x * rlevel->num_precincts_y; precno++) { + int process_data = 1; + if ((ret = jpeg2000_decode_packet_header(s, tile, tp_index, + codsty, rlevel, + precno, layno, + qntsty->expn + (reslevelno ? 3 * (reslevelno - 1) + 1 : 0), + qntsty->nguardbits, &process_data)) < 0) + return ret; + + if (!process_data) + continue; + + if ((ret = jpeg2000_decode_packet_data(s, tile, tp_index, codsty, rlevel, precno, layno, qntsty->expn + (reslevelno ? 3 * (reslevelno - 1) + 1 : 0), qntsty->nguardbits)) < 0) return ret; + } } } } @@ -1392,13 +1231,25 @@ static int jpeg2000_decode_packets_po_iteration(Jpeg2000DecoderContext *s, Jpeg2 Jpeg2000ResLevel *rlevel = tile->comp[compno].reslevel + reslevelno; ok_reslevel = 1; - for (precno = 0; precno < rlevel->num_precincts_x * rlevel->num_precincts_y; precno++) - if ((ret = jpeg2000_decode_packet(s, tile, tp_index, + for (precno = 0; precno < rlevel->num_precincts_x * rlevel->num_precincts_y; precno++) { + int process_data = 1; + if ((ret = jpeg2000_decode_packet_header(s, tile, tp_index, + codsty, rlevel, + precno, layno, + qntsty->expn + (reslevelno ? 3 * (reslevelno - 1) + 1 : 0), + qntsty->nguardbits, &process_data)) < 0) + return ret; + + if (!process_data) + continue; + + if ((ret = jpeg2000_decode_packet_data(s, tile, tp_index, codsty, rlevel, precno, layno, qntsty->expn + (reslevelno ? 3 * (reslevelno - 1) + 1 : 0), qntsty->nguardbits)) < 0) return ret; + } } } } @@ -1460,7 +1311,19 @@ static int jpeg2000_decode_packets_po_iteration(Jpeg2000DecoderContext *s, Jpeg2 } for (layno = 0; layno < LYEpoc; layno++) { - if ((ret = jpeg2000_decode_packet(s, tile, tp_index, codsty, rlevel, + int process_data = 1; + if ((ret = jpeg2000_decode_packet_header(s, tile, tp_index, + codsty, rlevel, + precno, layno, + qntsty->expn + (reslevelno ? 3 * (reslevelno - 1) + 1 : 0), + qntsty->nguardbits, &process_data)) < 0) + return ret; + + if (!process_data) + continue; + + if ((ret = jpeg2000_decode_packet_data(s, tile, tp_index, + codsty, rlevel, precno, layno, qntsty->expn + (reslevelno ? 3 * (reslevelno - 1) + 1 : 0), qntsty->nguardbits)) < 0) @@ -1530,14 +1393,25 @@ static int jpeg2000_decode_packets_po_iteration(Jpeg2000DecoderContext *s, Jpeg2 continue; } - for (layno = 0; layno < LYEpoc; layno++) { - if ((ret = jpeg2000_decode_packet(s, tile, tp_index, - codsty, rlevel, - precno, layno, - qntsty->expn + (reslevelno ? 3 * (reslevelno - 1) + 1 : 0), - qntsty->nguardbits)) < 0) - return ret; - } + for (layno = 0; layno < LYEpoc; layno++) { + int process_data = 1; + if ((ret = jpeg2000_decode_packet_header(s, tile, tp_index, + codsty, rlevel, + precno, layno, + qntsty->expn + (reslevelno ? 3 * (reslevelno - 1) + 1 : 0), + qntsty->nguardbits, &process_data)) < 0) + return ret; + + if (!process_data) + continue; + + if ((ret = jpeg2000_decode_packet_data(s, tile, tp_index, + codsty, rlevel, + precno, layno, + qntsty->expn + (reslevelno ? 3 * (reslevelno - 1) + 1 : 0), + qntsty->nguardbits)) < 0) + return ret; + } } } } @@ -1601,7 +1475,19 @@ static int jpeg2000_decode_packets_po_iteration(Jpeg2000DecoderContext *s, Jpeg2 } for (layno = 0; layno < LYEpoc; layno++) { - if ((ret = jpeg2000_decode_packet(s, tile, tp_index, codsty, rlevel, + int process_data = 1; + if ((ret = jpeg2000_decode_packet_header(s, tile, tp_index, + codsty, rlevel, + precno, layno, + qntsty->expn + (reslevelno ? 3 * (reslevelno - 1) + 1 : 0), + qntsty->nguardbits, &process_data)) < 0) + return ret; + + if (!process_data) + continue; + + if ((ret = jpeg2000_decode_packet_data(s, tile, tp_index, + codsty, rlevel, precno, layno, qntsty->expn + (reslevelno ? 3 * (reslevelno - 1) + 1 : 0), qntsty->nguardbits)) < 0) @@ -2171,6 +2057,11 @@ static int jpeg2000_read_main_headers(Jpeg2000DecoderContext *s) av_log(s->avctx, AV_LOG_ERROR, "Invalid tpend\n"); return AVERROR_INVALIDDATA; } + + if (tile->has_ppt && tile->tp_idx == 0) { + bytestream2_init(&tile->packed_headers_stream, tile->packed_headers, tile->packed_headers_size); + } + bytestream2_init(&tp->tpg, s->g.buffer, tp->tp_end - s->g.buffer); bytestream2_skip(&s->g, tp->tp_end - s->g.buffer); @@ -2233,6 +2124,10 @@ static int jpeg2000_read_main_headers(Jpeg2000DecoderContext *s) // Packet length, tile-part header ret = get_plt(s, len); break; + case JPEG2000_PPT: + // Packed headers, tile-part header + ret = get_ppt(s, len); + break; default: av_log(s->avctx, AV_LOG_ERROR, "unsupported marker 0x%.4"PRIX16" at pos 0x%X\n", @@ -2262,7 +2157,6 @@ static int jpeg2000_read_bitstream_packets(Jpeg2000DecoderContext *s) if ((ret = init_tile(s, tileno)) < 0) return ret; - s->g = tile->tile_part[0].tpg; if ((ret = jpeg2000_decode_packets(s, tile)) < 0) return ret; }