From patchwork Tue Apr 7 16:57:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gautam Ramakrishnan X-Patchwork-Id: 18751 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 3CDA244A555 for ; Tue, 7 Apr 2020 19:57:39 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 14AA568B611; Tue, 7 Apr 2020 19:57:39 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f196.google.com (mail-pl1-f196.google.com [209.85.214.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3883768B5EC for ; Tue, 7 Apr 2020 19:57:32 +0300 (EEST) Received: by mail-pl1-f196.google.com with SMTP id k18so1462070pll.6 for ; Tue, 07 Apr 2020 09:57: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=rD8LIQesPUwedPlOZhofGXu8ofQiZ6Z5pzYNX9hPdKo=; b=KGLWp7ImG/aItgbjySjIrgNnj+wazshZhzn1IgpuoyaAXMnwv4N39Nv3XGPQESFibN TM6uM+6QsXrmitscgnL178k/fOH5FBRT84emhTqBWIBB0RLuPGpaVm/GECSEes9so3Z7 LNRN8nABGHoMpT/XNoIz0t0BSKAfImJksFc05jQB8cz+Qdmx8ofbKkKC4SvCe/y+mlIe k/wCUStADnQ6ljnG3Bu3Ya7IL/hci9+fd5V15XfzXM9Mrgohb/xsruTc6aCl8L4MRA6H zY4Rrhjb1tczo6BqySkGzUCmCztNYcnawfRn6OKNg0XpjvZPhDUI2v/WY236maUXHTnr JwtA== 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=rD8LIQesPUwedPlOZhofGXu8ofQiZ6Z5pzYNX9hPdKo=; b=RT/3WtL1lQ/++s6T8Cr2u0ZlQI+6Zh1Yt11Q23Hg195XXLeRNZDqu3EPl1/dz8YZel UfrOR2eLUgRSxoW1gdM4x4DWxePP1JaVsDhpPK6gI7a4u/97tzYrSNKSHchjMmFTUDwE 3QtnBbMJxKXqGNVCNx964i2n9mL/zsjAoLlY2UR2faoxY0q5PFUuxSXZ8S4i2tlyH03n /0MLBK02Tce2+2bpc9pwYBfbrOge769VQ2dSRV+dJkwbP8AjS/yLH9dQ4byXhgSTZtmP uu8oz5NdmAEx48TpfDOy/YXqpIOnH0T3oNN5J8MOHHKT/r56+18rF9kMYKmK7T4DYXrA Z1Ew== X-Gm-Message-State: AGi0PubgPPxhBkf6OgzrVcdHP0+qGxBJtUUqL55YdxKJuzqUwWkURlsJ ruaCU1w3Bm+vQKkTUS/o+eIWs/xcCRY= X-Google-Smtp-Source: APiQypISWwbiiLWyI0xy5ZdXe1r4KZWEMge1v5nsVSDP9RvecUW7pQ6vqZ7uhjxohBOuMmEuTWTjPA== X-Received: by 2002:a17:902:207:: with SMTP id 7mr3385742plc.216.1586278650154; Tue, 07 Apr 2020 09:57:30 -0700 (PDT) Received: from localhost.localdomain ([223.235.255.212]) by smtp.gmail.com with ESMTPSA id b2sm7182912pgg.77.2020.04.07.09.57.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Apr 2020 09:57:29 -0700 (PDT) From: gautamramk@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Tue, 7 Apr 2020 22:27:13 +0530 Message-Id: <20200407165713.25239-1-gautamramk@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH v14] 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. This patch fixes bug ticket #4610. --- libavcodec/jpeg2000dec.c | 91 +++++++++++++++++++++++++++++++++++----- 1 file changed, 80 insertions(+), 11 deletions(-) diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index 732d88e6fc..846e31d0a2 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,40 @@ static int get_plt(Jpeg2000DecoderContext *s, int n) return 0; } +static int get_ppt(Jpeg2000DecoderContext *s, int n) +{ + Jpeg2000Tile *tile; + + if (n < 3) { + av_log(s->avctx, AV_LOG_ERROR, "Invalid length for PPT data.\n"); + return AVERROR_INVALIDDATA; + } + 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 + bytestream2_get_byte(&s->g); // Zppt is skipped and not used + void* new = av_realloc(tile->packed_headers, + tile->packed_headers_size + n - 3); + if (new) { + tile->packed_headers = new; + } else + return AVERROR(ENOMEM); + 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; @@ -927,6 +965,19 @@ static int getlblockinc(Jpeg2000DecoderContext *s) return res; } +static inline void select_stream(Jpeg2000DecoderContext *s, Jpeg2000Tile *tile, + int *tp_index) +{ + 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); +} + static int jpeg2000_decode_packet(Jpeg2000DecoderContext *s, Jpeg2000Tile *tile, int *tp_index, Jpeg2000CodingStyle *codsty, Jpeg2000ResLevel *rlevel, int precno, @@ -938,19 +989,15 @@ static int jpeg2000_decode_packet(Jpeg2000DecoderContext *s, Jpeg2000Tile *tile, 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); + // Select stream to read from + if (tile->has_ppt) + s->g = tile->packed_headers_stream; + else + select_stream(s, tile, tp_index); if (!(ret = get_bits(s, 1))) { jpeg2000_flush(s); - return 0; + goto skip_data; } else if (ret < 0) return ret; @@ -1056,6 +1103,11 @@ static int jpeg2000_decode_packet(Jpeg2000DecoderContext *s, Jpeg2000Tile *tile, av_log(s->avctx, AV_LOG_ERROR, "EPH marker not found. instead %X\n", bytestream2_peek_be32(&s->g)); } + // Save state of stream + if (tile->has_ppt) { + tile->packed_headers_stream = s->g; + select_stream(s, tile, tp_index); + } for (bandno = 0; bandno < rlevel->nbands; bandno++) { Jpeg2000Band *band = rlevel->band + bandno; Jpeg2000Prec *prec = band->prec + precno; @@ -1097,6 +1149,15 @@ static int jpeg2000_decode_packet(Jpeg2000DecoderContext *s, Jpeg2000Tile *tile, av_freep(&cblk->lengthinc); } } + // Save state of stream + tile->tile_part[*tp_index].tpg = s->g; + return 0; + +skip_data: + if (tile->has_ppt) + tile->packed_headers_stream = s->g; + else + tile->tile_part[*tp_index].tpg = s->g; return 0; } @@ -1929,6 +1990,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); @@ -1995,6 +2061,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", @@ -2024,7 +2094,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; }