From patchwork Wed Apr 22 18:34:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gautam Ramakrishnan X-Patchwork-Id: 19177 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 2B18044A0A7 for ; Wed, 22 Apr 2020 21:34:57 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EF80668BD33; Wed, 22 Apr 2020 21:34:56 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 57F8968BC3E for ; Wed, 22 Apr 2020 21:34:50 +0300 (EEST) Received: by mail-pl1-f175.google.com with SMTP id c21so455458plz.4 for ; Wed, 22 Apr 2020 11:34:50 -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=m0giBtBloujR4mOPQsEvaNhp8adjhc3gVjSTbckriDs=; b=Tp+3nGl29MhKb95/5YNHFi+/z+F4/S+T+BO3ZNZINQfAtD9q71L1/4nrnROxtOPaXC oq1AKeKvLGa/lg4r3Jze1RBP5hpkLGSc1b8UB/BJ7eSFXA8fWFsy3ek96h3xK9m+4+B5 peDVMDItPWqBBoGMZMY8S7YzMOv53CzZr2YX7oaskWEivMstE9ShtNfNRVkpRa/iVxEY ydfYu9mVnDFNVMZJ8ivnsocZ7PInc6krEiB/82sX8Kl32pu6S3THETp8hgSoq2SMzHQc OZ5XAGyObEH8nMos9potkd1htJ9a3b34O6JIsj2f/ZqViBgwz7TaobNBmI474cHrHVTB NGGQ== 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=m0giBtBloujR4mOPQsEvaNhp8adjhc3gVjSTbckriDs=; b=SXSn5VJBShqc0VqeLRBUWBkSM5nGUxjWfX50zbz4MReBtWjjcSHfrnj20LrGeOUmSF g2PgYlJv4ybCbBgkppti/SNAjsYEjZdKTINwtrrifDqwyx7Zk054CQEN7UJ8fOX1LRnn c87uwMesP/uUDp5eiuErLqRMqhOyH9E7vdldvrDyPBtQVh8lBe2/j14Qto5TjXsRe+bd lUT43bDef3IaWYspFDsK7kMIrrm5UgZmHQODzV/jGNyEVnRAUeftW8wXzd7DDYg2HWhT T+rXVsThXLGB9IyBO4YFgRu0ub0GnZxw0YMzehKqR1RGDofFirjmPYahfcOv48Tow6mh 7CDA== X-Gm-Message-State: AGi0PuZryifR+9XQSKL3DD1dm2c9Zr7n76vU5rmwbp1LyV4t2iPMCNjJ sQtlQbAPLOM7YtWuolHGhIUqMWrTY+Q= X-Google-Smtp-Source: APiQypITDrszYJoYez0WnUG4BNpSAegCAsgELAvmiOXAm+yLENxQQEd/5vI6Bav5qocLWYomDJBJqg== X-Received: by 2002:a17:90a:cb8c:: with SMTP id a12mr46038pju.153.1587580488054; Wed, 22 Apr 2020 11:34:48 -0700 (PDT) Received: from localhost.localdomain ([122.166.129.53]) by smtp.gmail.com with ESMTPSA id x128sm184238pfd.109.2020.04.22.11.34.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Apr 2020 11:34:47 -0700 (PDT) From: gautamramk@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Thu, 23 Apr 2020 00:04:39 +0530 Message-Id: <20200422183440.11141-1-gautamramk@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH v2 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 to skip the CRG marker. The CRG marker, is an informational 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);