From patchwork Tue Mar 31 12:02:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gautam Ramakrishnan X-Patchwork-Id: 18526 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 AEA25449278 for ; Tue, 31 Mar 2020 15:03:11 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 85FA668AF66; Tue, 31 Mar 2020 15:03:11 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f194.google.com (mail-pf1-f194.google.com [209.85.210.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 911E668AF5D for ; Tue, 31 Mar 2020 15:03:04 +0300 (EEST) Received: by mail-pf1-f194.google.com with SMTP id 23so10256463pfj.1 for ; Tue, 31 Mar 2020 05:03:04 -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=muark/wC4SnYVGoVArrLoVijpDembEaH+iWYVLfWrhg=; b=qh/89mca6eFFqZSvuMfaQj9xuC2rO31CM95dCn1Id6TEjyrzdoIHI7LomCAlcZjxnb orr3pDCY5RGsCVl00MiDKUAIDNUPBAfnF81jSDfuZnidlIr6qSVerDsuVFYalMXdY/jI bjzUe7vXJoU4GB5rPiafIIYW9oOuSyGzbfw7dFpcKoVxRGWAd69XrWT1vz2AVrBheafi tQnbjzZGJknTz7OBL+LcotcG9fAvyKumTfh4SOALUAWEZWDcdIVo/M6hx6dCtFLQ4OUZ hM/j3SNgWqfcs4dDE2ICfaqfm7K4azRvgxvs9Pddc6tWzL88BQ/wljBoW8CC2bkxTZH4 Bxpg== 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=muark/wC4SnYVGoVArrLoVijpDembEaH+iWYVLfWrhg=; b=p7s/qwQ+ShcJFIhKT3lFZRQ4T2IbrJ4KD1pXN5NyuTK74/NLxQj09Jv0Tvid5UdKoN ahTPc7kwdsKw0crctd2x5nnFm1vDzrq9MkrqfLYmzrjdqQGOi/IGNYpWJklFgyPLv2ma v8iryLqgUj+oYLJ4T3fKPaOGgYLQQ4iMly8x84OlKWzgUAMcwWifdWRpgVHp7RlBf5Fp tEFjWhLobHeNehTF7RbqoDMAovDy9ZbyEJxnOahsfR/SMZzrq0r+P3u+dBRBtqONt7BV 3ucuJGuBEuvAd/d5Kxjh8SVh80DgCCBYkyAtMtafrkZwwjbW2mGL1p0fSeWeZFj8vuTI 57LQ== X-Gm-Message-State: ANhLgQ2T5HBqMvks78Km9Ma6zLcwJSCLvR3UpdsKOoPOHrTJBUwYCmQ6 8Jq0phCgAaaM6n/ywoxyQIbmt5uTr4M= X-Google-Smtp-Source: ADFU+vtrvCsqd1WOmcLj7anroPcR3zgOuUkIMBB1e1W4NwvSvZoO/3DBcmUP5qgMYE6bRJBb0RlRJg== X-Received: by 2002:a62:a512:: with SMTP id v18mr17034108pfm.306.1585656181655; Tue, 31 Mar 2020 05:03:01 -0700 (PDT) Received: from localhost.localdomain ([223.235.255.212]) by smtp.gmail.com with ESMTPSA id o11sm1809396pjb.18.2020.03.31.05.02.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Mar 2020 05:03:00 -0700 (PDT) From: gautamramk@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Tue, 31 Mar 2020 17:32:40 +0530 Message-Id: <20200331120242.28648-1-gautamramk@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH v9 1/3] libavcodec/jpeg2000dec.c: Split function 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 splits the jpeg2000_decode_packet() function. --- libavcodec/jpeg2000dec.c | 150 ++++++++++++++++++++++++++++++--------- 1 file changed, 116 insertions(+), 34 deletions(-) diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index 7103cd6ceb..66361fa90a 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -927,16 +927,19 @@ static int getlblockinc(Jpeg2000DecoderContext *s) return res; } -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) +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; - int cwsno; - if (layno < rlevel->band[0].prec[precno].decoded_layers) + if (layno < rlevel->band[0].prec[precno].decoded_layers) { + *process_data = 0; return 0; + } rlevel->band[0].prec[precno].decoded_layers = layno + 1; if (bytestream2_get_bytes_left(&s->g) == 0 && s->bit_index == 8) { @@ -950,6 +953,7 @@ static int jpeg2000_decode_packet(Jpeg2000DecoderContext *s, Jpeg2000Tile *tile, if (!(ret = get_bits(s, 1))) { jpeg2000_flush(s); + *process_data = 0; return 0; } else if (ret < 0) return ret; @@ -1055,6 +1059,17 @@ static int jpeg2000_decode_packet(Jpeg2000DecoderContext *s, Jpeg2000Tile *tile, else av_log(s->avctx, AV_LOG_ERROR, "EPH marker not found. instead %X\n", bytestream2_peek_be32(&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; for (bandno = 0; bandno < rlevel->nbands; bandno++) { Jpeg2000Band *band = rlevel->band + bandno; @@ -1124,13 +1139,27 @@ 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, - codsty, rlevel, - precno, layno, - qntsty->expn + (reslevelno ? 3 * (reslevelno - 1) + 1 : 0), - qntsty->nguardbits)) < 0) + 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; + } } } } @@ -1150,13 +1179,27 @@ 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, - codsty, rlevel, - precno, layno, - qntsty->expn + (reslevelno ? 3 * (reslevelno - 1) + 1 : 0), - qntsty->nguardbits)) < 0) + 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; + } } } } @@ -1218,10 +1261,24 @@ 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, - precno, layno, - qntsty->expn + (reslevelno ? 3 * (reslevelno - 1) + 1 : 0), - qntsty->nguardbits)) < 0) + 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; } } @@ -1288,14 +1345,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; + } } } } @@ -1359,10 +1427,24 @@ 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, - precno, layno, - qntsty->expn + (reslevelno ? 3 * (reslevelno - 1) + 1 : 0), - qntsty->nguardbits)) < 0) + 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; } } From patchwork Tue Mar 31 12:02:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gautam Ramakrishnan X-Patchwork-Id: 18527 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 B8A7C449278 for ; Tue, 31 Mar 2020 15:03:13 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9E6D468B0EF; Tue, 31 Mar 2020 15:03:13 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f66.google.com (mail-pj1-f66.google.com [209.85.216.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 135B668B0BF for ; Tue, 31 Mar 2020 15:03:07 +0300 (EEST) Received: by mail-pj1-f66.google.com with SMTP id o12so984635pjs.2 for ; Tue, 31 Mar 2020 05:03:06 -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=K4MTQUK8ejXXNCH/GF2uIv5dCdBLXlGUuIbPVxVTo/c=; b=YjJXaNaoamq0TYz+lXbJYAjRHbTvGqXroVCVrhqBoTz3+svOWj+UBWUzPo3P/PqqKi ukfxEhr6W/jPwMoKkTxZuyvI2kGEweNotHftQXmONtQqGrKnqXvvuNfhue08Tnp6vmzu ONO+JVwVY0OPEw0zeicfSRhfSsULXljtjgKfn3yULpXbHaCTmuNHgJ32KfsO+az4LfYw eMgDJqYs4cFq803Xz+lx8Jh9HaiPK7tWDW7WYPYWzo3Lt3Wm61YOJ++q/9u+6ftgwqWJ VAWORxsUZWZS4zabXzHPLr7UV7Uph6nVjI8xhUCGb/vqD/eOs+AjfbAA+rPXUkzo5mEP bp0Q== 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=K4MTQUK8ejXXNCH/GF2uIv5dCdBLXlGUuIbPVxVTo/c=; b=LJJkmT7VIfILzJ/FkhZDZDrjH6nPeV/iytP7k9YUyGmpsgi1p2zyBxCm41WdU9Lw5k dY5D/zogxuTkZIAAei4rlB3WRQDzi5oqFgycvIKSemKIaxOex2S8G1tcsSahvKoyfkuD hdFidGpeTKmye6KYs7TyS8rWxElMY1QQsS8u2nFtriYKWK+I2MQJphxuCJfjt9NMhN6Z eIMIHwB/rbkAKkG25i7ZtkFcvcZNCXiOdrYVZj1nqX7jGz9EGIU8OWTyE43CdiSucrt8 axVJeOeUirtDwAz77kk+FxqH42JZ7rTseAYg8gyncozciPs3pFJmb3xDUKXzyKkC4sdv KMnA== X-Gm-Message-State: ANhLgQ3nWbSQkJQwrUnUIDEnfAa3Oxj28KyNscW8XB9K6GFassIcdBGK RMLiFuetQ/yEQ9Ped+ApK4gESOzWWU8= X-Google-Smtp-Source: ADFU+vtyohj03sbI+alnzqC0+4cVrJonoljCCZJdhdnpSnUIVEIWtri6FD9uihcHI6+/cH8/oj8z/A== X-Received: by 2002:a17:902:8a89:: with SMTP id p9mr16984000plo.286.1585656184357; Tue, 31 Mar 2020 05:03:04 -0700 (PDT) Received: from localhost.localdomain ([223.235.255.212]) by smtp.gmail.com with ESMTPSA id o11sm1809396pjb.18.2020.03.31.05.03.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Mar 2020 05:03:03 -0700 (PDT) From: gautamramk@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Tue, 31 Mar 2020 17:32:41 +0530 Message-Id: <20200331120242.28648-2-gautamramk@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200331120242.28648-1-gautamramk@gmail.com> References: <20200331120242.28648-1-gautamramk@gmail.com> Subject: [FFmpeg-devel] [PATCH v9 2/3] libavcodec/jpeg2000dec.c: Add support for 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. --- libavcodec/jpeg2000dec.c | 85 +++++++++++++++++++++++++++++++++++----- 1 file changed, 76 insertions(+), 9 deletions(-) diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index 66361fa90a..23e43ff052 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -83,6 +83,10 @@ typedef struct Jpeg2000Tile { Jpeg2000QuantStyle qntsty[4]; Jpeg2000POC poc; Jpeg2000TilePart tile_part[32]; + 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; @@ -855,6 +859,39 @@ static int get_plt(Jpeg2000DecoderContext *s, int n) return 0; } +static int get_ppt(Jpeg2000DecoderContext *s, int n) +{ + Jpeg2000Tile *tile; + + if (s->curtileno < 0) + return AVERROR_INVALIDDATA; + + tile = &s->tile[s->curtileno]; + 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); // Zppt is skipped and not used + if (!tile->packed_headers) { + tile->packed_headers = av_malloc_array(n - 3, 1); + memcpy(tile->packed_headers, s->g.buffer, n - 3); + tile->packed_headers_size = n - 3; + } else { + tile->packed_headers = av_realloc_array(tile->packed_headers, + tile->packed_headers_size + n - 3, + 1); + memcpy(tile->packed_headers + tile->packed_headers_size, + s->g.buffer, 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; @@ -941,20 +978,24 @@ static int jpeg2000_decode_packet_header(Jpeg2000DecoderContext *s, Jpeg2000Tile 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; + // Select stream to read from + 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 (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; - return 0; + goto end; } else if (ret < 0) return ret; @@ -1059,6 +1100,12 @@ static int jpeg2000_decode_packet_header(Jpeg2000DecoderContext *s, Jpeg2000Tile else av_log(s->avctx, AV_LOG_ERROR, "EPH marker not found. instead %X\n", bytestream2_peek_be32(&s->g)); } +end: + // Save state of stream + if (tile->has_ppt) + tile->packed_headers_stream = s->g; + else + tile->tile_part[*tp_index].tpg = s->g; return 0; } @@ -1071,6 +1118,16 @@ static int jpeg2000_decode_packet_data(Jpeg2000DecoderContext *s, Jpeg2000Tile * 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; @@ -1112,6 +1169,8 @@ static int jpeg2000_decode_packet_data(Jpeg2000DecoderContext *s, Jpeg2000Tile * av_freep(&cblk->lengthinc); } } + // Save state of stream + tile->tile_part[*tp_index].tpg = s->g; return 0; } @@ -2011,6 +2070,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); @@ -2073,6 +2137,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", @@ -2102,7 +2170,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; } From patchwork Tue Mar 31 12:02:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gautam Ramakrishnan X-Patchwork-Id: 18528 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 97D94449278 for ; Tue, 31 Mar 2020 15:03:15 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8261F68B0BF; Tue, 31 Mar 2020 15:03:15 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f174.google.com (mail-pf1-f174.google.com [209.85.210.174]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3C1C068B11E for ; Tue, 31 Mar 2020 15:03:09 +0300 (EEST) Received: by mail-pf1-f174.google.com with SMTP id u65so20078pfb.4 for ; Tue, 31 Mar 2020 05:03:09 -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=qyP4FIiTa6B4buFmBTunTWa1lU2Q1kh5yU8zSLUQEoc=; b=loHsACYnsBEzjgx3P6KulE9cpwwCmaEh27HadOZKI4iLbg6fwjgi7vf0g/qhJsjSqJ 9qFFCi8WZXeaPY78RQBDAYayrfThj6hzU1G016a7yctKdKmC+huuVO/UGA3z3y3Lb+5x 3+lYgiO/oYSAB0c93/ddWIvlvq1DdLN3A0SvvVtadQ9cjfBCY782SEfnP99IEFSzHiJk j8DcdBVh/7G20f5eQFqx+gSvtyhUAjz9w7BQyBmf+XoLHXJonR7x75CoD6SAGTj0+g7k zmApkSPf7qeGYhRXtYktzzKbUHdnduBBpoDBy/eHtymAmoi4v6VMOb5WLbtIWFzC2ySx 7Ymg== 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=qyP4FIiTa6B4buFmBTunTWa1lU2Q1kh5yU8zSLUQEoc=; b=idQxnFsaH66uzUoxPzS5MsvRImmj8bs8y2pK16aDJuY0DCL44oO6tZTbdW32ImIZ+O cuvwCop5YWWZ1O+9uRAMc7quCrIZ0QZLp2XwuGAUnjxYPO1197CE7/7bHL2tyI904kBp j9s0P2KBMbwb+Ni3kuiu1q2l6JUIZyJy+qIqz6ZwjSuIBa23Fb1nX05VShmzegWpeAMb MSlPTYEeE9lP9CoGznP+CMac1fMgmgNYZ5LngdZO4D4hqAMCZsxYXe+eURX5ZS/TPBlN gAeUNLkDY+GtvagIRSVCW+7sm96Su6Q3d8vCNlbUeTTaABYii0ulY8nRgR7Eozc5HcLN 16+Q== X-Gm-Message-State: AGi0PuYBasYCVKLut9Y1TOgb88rBZ3QIATKnlPRZ6M3RkLTmVQEtX0co 3tX+lCEH28kbGO6HHGTtSpGKFdRcar0= X-Google-Smtp-Source: APiQypIz3+8kntD3hH55p9zEOcrQuOiRMQ8sFivrzk3MCkWXeNFl+g5GAcN/0tBif69qvn3CCl4yNg== X-Received: by 2002:a63:c04e:: with SMTP id z14mr8164733pgi.359.1585656186840; Tue, 31 Mar 2020 05:03:06 -0700 (PDT) Received: from localhost.localdomain ([223.235.255.212]) by smtp.gmail.com with ESMTPSA id o11sm1809396pjb.18.2020.03.31.05.03.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Mar 2020 05:03:06 -0700 (PDT) From: gautamramk@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Tue, 31 Mar 2020 17:32:42 +0530 Message-Id: <20200331120242.28648-3-gautamramk@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200331120242.28648-1-gautamramk@gmail.com> References: <20200331120242.28648-1-gautamramk@gmail.com> Subject: [FFmpeg-devel] [PATCH v9 3/3] libavcodec/jpeg2000dec.c: Handle non EOC streams 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 allows decoding of j2k streams which do not have an EOC marker. --- libavcodec/jpeg2000dec.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index 23e43ff052..d27d753992 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -2085,8 +2085,12 @@ static int jpeg2000_read_main_headers(Jpeg2000DecoderContext *s) len = bytestream2_get_be16(&s->g); if (len < 2 || bytestream2_get_bytes_left(&s->g) < len - 2) { - av_log(s->avctx, AV_LOG_ERROR, "Invalid len %d left=%d\n", len, bytestream2_get_bytes_left(&s->g)); - return AVERROR_INVALIDDATA; + if (s->avctx->strict_std_compliance >= FF_COMPLIANCE_STRICT) { + av_log(s->avctx, AV_LOG_ERROR, "Invalid len %d left=%d\n", len, bytestream2_get_bytes_left(&s->g)); + return AVERROR_INVALIDDATA; + } + av_log(s->avctx, AV_LOG_WARNING, "Missing EOC Marker.\n"); + break; } switch (marker) {