From patchwork Mon Mar 30 16:21:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gautam Ramakrishnan X-Patchwork-Id: 18521 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 1889B44AD2E for ; Mon, 30 Mar 2020 19:22:12 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D6E7068B15A; Mon, 30 Mar 2020 19:22:11 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f193.google.com (mail-pg1-f193.google.com [209.85.215.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EE3BA68AFE9 for ; Mon, 30 Mar 2020 19:22:05 +0300 (EEST) Received: by mail-pg1-f193.google.com with SMTP id 142so8877341pgf.11 for ; Mon, 30 Mar 2020 09:22:05 -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=V8hKoa2IFcPBQDizFoTzXR8KcmpxACiColJIizyihUc=; b=Ds/14TK7bl45ISQhhhjWyT96+4WL4FqjeT0wGruL8uzkMaqEx+HxbxxWTuytZeXgCN AVGfAUJQr/3q4LfDenH/aLoUUivj2T+FsYQkCD9cZ3b3IcTqWLhAAGPS0JOvYjud+Wp+ JspgBj3aCUmn3UL+xam/q4/fMjONGDv7xJXYldmHlhSHoH9BOIDzJucFT6aqO/chNBiF 2JctQfqO+Xn33b3sZ2m8MVLbVu9YicxEOUZDRDYOo6wmFHhdlPPDBygktbO9TpirSped 6Y6Ck4IEXc2C/marLVsO3gPNO6UlAj7VoJ5ikEfyE/L+2ThaRrfwLJWHB6KHfzY3JOrz jyRw== 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=V8hKoa2IFcPBQDizFoTzXR8KcmpxACiColJIizyihUc=; b=hsh3LrruKuZqzKobTNUkMAzVWHPEw0GuXWutkJORbKnCxcYm71FaotWLPXAGz4JGdj m+XjfnRLZmi3KjNMUyz2IGY4toLdhg1bJDDUXAIow0PXNXKjPicqSWEMhIDpOwnisXJc rvJODPbStkuoHxadfJ5l1m/tlOoVTFAdr+IaWa02kO0JnCQbAOaELGIM9qBwU8PApnFG xDBl/M6oNLby962q3tRVJKzi8zOCO0Ul4VOrH9b27RdQ1GO7LwrFvbW8VWHZMumXQADK UpGpSHZGmp4mp7/+XJsh+YTeXLPNAgnTehIgZn0avkrS928zUFce3dv5BMqKR7opwHUv ng0Q== X-Gm-Message-State: ANhLgQ1wCtO9PSdynsqnAQtbgl6Svf1ScxbXwxp/TK2TJUEaAZlOPv8I syO2gy/m2tIuFCPU+KLGmIv8yNdR03Y= X-Google-Smtp-Source: ADFU+vvDYWSskiDK/P6KrBLF0TW2CabkK3zoLppllGmq/8iZU0/MkfyJsAcfgIUECqkJBNnsIng0DA== X-Received: by 2002:a65:648e:: with SMTP id e14mr12954754pgv.182.1585585323776; Mon, 30 Mar 2020 09:22:03 -0700 (PDT) Received: from localhost.localdomain ([223.235.255.212]) by smtp.gmail.com with ESMTPSA id r59sm10840127pjb.45.2020.03.30.09.22.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Mar 2020 09:22:02 -0700 (PDT) From: gautamramk@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Mon, 30 Mar 2020 21:51:53 +0530 Message-Id: <20200330162155.6901-1-gautamramk@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH v8 1/3] libavcodec/jpeg2000dec.c: Split function and modify structs for PPM 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 --- libavcodec/jpeg2000dec.c | 48 ++++++++++++++++++++++++++++++++++------ 1 file changed, 41 insertions(+), 7 deletions(-) diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index 7103cd6ceb..9d52969821 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; @@ -935,21 +939,32 @@ static int jpeg2000_decode_packet(Jpeg2000DecoderContext *s, Jpeg2000Tile *tile, int bandno, cblkno, ret, nb_code_blocks; int cwsno; +// This part decodes the packet header + 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; + // Select appropriate 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); + // 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; } else if (ret < 0) return ret; @@ -1056,6 +1071,23 @@ 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)); } + if (tile->has_ppt) + tile->packed_headers_stream = s->g; + else + tile->tile_part[*tp_index].tpg = s->g; + +// This part decodes the packet data. + // Select appropriate stream to read from + 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; @@ -1097,6 +1129,8 @@ 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; }