From patchwork Mon Apr 20 19:37:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gautam Ramakrishnan X-Patchwork-Id: 19112 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 13C4244B17E for ; Mon, 20 Apr 2020 22:37:55 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D70DA68B828; Mon, 20 Apr 2020 22:37:54 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f176.google.com (mail-pf1-f176.google.com [209.85.210.176]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D870C68B314 for ; Mon, 20 Apr 2020 22:37:47 +0300 (EEST) Received: by mail-pf1-f176.google.com with SMTP id p25so5425659pfn.11 for ; Mon, 20 Apr 2020 12:37:47 -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=EbPzy+jXXo764d5IAeYeZ7FFL4a0JPK4O7E36ICLick=; b=vameiUDvkMB0R1no6oOl95DjLAzc46cClykYka7S+xI9ivbrxquoWImLVtSOachLTX 5wxYR4JfAN0ZRhha7f7b03C0slNSkBDq7yLldvgFDIYGcA0qY/HAiZaZWPR3R331vGyu mLgEwNMP+R0DBdnTMcJ/DTaBzln9L6XRgQsCaeMOysGRVB1biskNOmw6FUqk8UAzlqz/ OV4h/MlfaNJqTcol/p0hTeOVyYUtO9sXWDPzvX/mSACaa19dpZIJyxTHuDRoLKHiQLmU OSw3t5PToLejSA9Lw4CDbpR6DVA17yJNrsKyf0Bq92lsmRKducK3pJb5FmssbH2CTIYI TEAg== 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=EbPzy+jXXo764d5IAeYeZ7FFL4a0JPK4O7E36ICLick=; b=AWHUyTYzAByhP+Pb346hHp6RAvDwKlEBYdx5/MPjL/M0IS/Z4bp687PY+Il9P9B1bf PxTP7CYqXeHAHp1LIRwokkhkGiajJkUm15tvgvDQo9jb3DrOM+PxTy/L5F34DrJrx6Zw 0phsQiJfX4mdmM53AuzFHqEybjoJiSDxNr6qbwuLfDL3OLjZW/f/k27z3tz7lSrRmDoj Tjh1CdrVbbVRZqOLMe3JxtPksk10jourF8ZIVjdPF0ey0QAxH6Y7BbtB/G1trMSSDVTs 9ZQ7OdSSjSEQ9JdwHfQKOU+ws6T6rbRcoYV0C3D9tk5qrV7cI59qGwSCZxu+lB7fEXCz EnyQ== X-Gm-Message-State: AGi0PuaU2tpcqECj5WaP8UyrZDR/Cq/xPoMIt/L7OUlyAq2JOBaMbdwr LSehoZ2kbcQyhaUsqE/U2mwHGk+7J7c= X-Google-Smtp-Source: APiQypJWx+dxKemKXXS5pgtdrXOkW+aPBY65RduVEepUB2NeKt6mkfsp/VyXk8/vam3xcGxfoiXj0w== X-Received: by 2002:a63:d742:: with SMTP id w2mr16666380pgi.401.1587411465670; Mon, 20 Apr 2020 12:37:45 -0700 (PDT) Received: from localhost.localdomain ([223.235.255.212]) by smtp.gmail.com with ESMTPSA id nk12sm154135pjb.41.2020.04.20.12.37.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Apr 2020 12:37:44 -0700 (PDT) From: gautamramk@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Tue, 21 Apr 2020 01:07:38 +0530 Message-Id: <20200420193739.15378-1-gautamramk@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH 1/2] libavcodec/jpeg2000dec.c: Support for CRG 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 support for CRG marker. Allows samples such as p0_03.j2k to be decoded. --- libavcodec/jpeg2000dec.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index af6dcee228..5a7d9e7882 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -798,6 +798,15 @@ static int get_sot(Jpeg2000DecoderContext *s, int n) return 0; } +static int read_crg(Jpeg2000DecoderContext *s, int n) +{ + if (s->ncomponents*4 != n - 2) { + av_log(s->avctx, AV_LOG_ERROR, "Invalid CRG marker.\n"); + return AVERROR_INVALIDDATA; + } + bytestream2_skip(&s->g, n - 2); + return 0; +} /* Tile-part lengths: see ISO 15444-1:2002, section A.7.1 * Used to know the number of tile parts and lengths. * There may be multiple TLMs in the header. @@ -2061,6 +2070,9 @@ static int jpeg2000_read_main_headers(Jpeg2000DecoderContext *s) // the comment is ignored bytestream2_skip(&s->g, len - 2); break; + case JPEG2000_CRG: + ret = read_crg(s, len); + break; case JPEG2000_TLM: // Tile-part lengths ret = get_tlm(s, len);