From patchwork Tue Apr 19 08:17:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Caleb Etemesi X-Patchwork-Id: 35343 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b9e:b0:7d:cfb5:dc7c with SMTP id b30csp228751pzh; Tue, 19 Apr 2022 01:17:19 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyZjuz8uwV8ZuOW571uRNFQx3IvUIX0N3JJCYqIW6bm24XW20aSBPXLArwRO9gX+09+TVP8 X-Received: by 2002:a05:6402:696:b0:41d:7345:41e1 with SMTP id f22-20020a056402069600b0041d734541e1mr15882794edy.179.1650356239377; Tue, 19 Apr 2022 01:17:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1650356239; cv=none; d=google.com; s=arc-20160816; b=X7D/oy7prGeFA/eRY0Irc1ak3Y0XsPtC1j6JWJPL3ns5BGMnnSFGRlQCkmdv4jp4Ap vQdNEf9yZZ7GCABQUSR2vPnBRvmFSYz8YKVN2H+TIhHLF0aVAfoWXmkPm59OAl9Wnjgu qiDwGrU0MxLaLNrMSvKZZ8ypovsTi861cJ8boWOL3668J3Wuk8gbD7XJb4EgHXqWgbXC e8SaPGta5TK+nTjjisSmZI2a7qoEr8WZkZ7gnM4H6jILVocDxA4Kvxtw/+jEqsPzBgbM IZ7xm1WGUjbgp5nZmWr71L9dfXP2ITjgFJAfJvrvsRvYzH4L2GBX8twFeVdq+1N+wFCQ pHNw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=yRB+7HRsZYLPzSzaM1V74/YYK0fqgGtGygd2tVd4NvU=; b=TH/n+i7ZFAqKJUkpJF3fhqsC8YrHxLv5dCNmmqRwm4bnwHEPhkrCmTIdRJD1A9VyE5 MkORsXni9CepRV/xX2vLeFXAnYPTXdYpGqxTR23DPMmCURTSgU2grdF1mVkewPjMSTAN axOH2q8iJPxFh0NSKziwU/5q1gkAuVkl+APYfh+ixzqPcEG1ox/H2yFJ+53/SA8MsOtI kjyn+x4+T8+E/O1haoSxOn61Kyz2LALn+MTdPWHcikVqfWwy7R4FooJyAWBhzDxJlxLV s0Npgxvu3j/yJKBP9A89UtDjw8wpkoXsN+0Q/+gOaUaxQXBM8Kuxm+v9YCL3goh/aTli EhLw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=A19YuvmO; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id h2-20020a056402280200b00423f55d46c9si2591574ede.285.2022.04.19.01.17.19; Tue, 19 Apr 2022 01:17:19 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=A19YuvmO; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1714368B36F; Tue, 19 Apr 2022 11:17:15 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1AB1D68B0B4 for ; Tue, 19 Apr 2022 11:17:09 +0300 (EEST) Received: by mail-wm1-f47.google.com with SMTP id n126-20020a1c2784000000b0038e8af3e788so953859wmn.1 for ; Tue, 19 Apr 2022 01:17:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=inibKOi7fKT9pgYtXZGBnhcNbNhIUSfUWEUZvgj/d/Q=; b=A19YuvmOEF8qcZwVKCn1EJT+gWTHHgQWk0ehpjf3GgAUlUBX9PlW6MkN31w9SKroBy VmXhKGqfHl9c2hCD3dg32v5k5uR+qPjW8kgucXT91PNlaJp8mA8D/nQmRb/okwjazYqZ ma2YyCun2odY7u5Dsy+0yddd/isVhlZgkKV3VLqQktT8YoLeWN4fGzmfsuWZ03Mf0qv/ 2RKNR7PZ7mhNESJPt34MD0wzsLRrhAibcork7l9aGJ4PkA35RuFaXXMTJuuGpRw6fziX LFhJfmUIUxEFDnGrALFinOl0Wdnxje4bfv7wVCN0XJGX35Qz+CwRO/9x4OoPDt+reJD8 PFHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=inibKOi7fKT9pgYtXZGBnhcNbNhIUSfUWEUZvgj/d/Q=; b=rgAgMZKyjOKPeXLo0zks2rFiphgzLgDrTh95NszYdYFPtymkCCz64MncPJfADboAAq DXKhKzjrbtVJhjPBarATY4a0mqwQFkp/1xEJlo2YEJ0Q5GFbq7K/aYL3YsQKSc5YNsi3 sTFOsiNTGYEwW2rZrwF0oTkXrHiU3VB6yXkjejpna7VzRIOJwySxE00ZxNOMW0J4K9oB GNJofZnggY19pEtf+nwjRnl4lCk3CnD2UzKsSeYXp5DFAOhTz9RRpogwdWHt1K9Ed4Ze USL4K3N1K7OFjGfFTpvlFTMtDhKlsA9lU9R02tA21vns4/U9fcvhiLhp0rAcrvYAxq8V h+jw== X-Gm-Message-State: AOAM531cY4WNSsc0/KDXmGVbL0agXif76Ev1UmBNIXlK9AuyRnDbEQOu hjU0/jGnlC6e/C7ON5lw2kUcfnv4e212GQ== X-Received: by 2002:a1c:3bd6:0:b0:38f:4e30:6c2f with SMTP id i205-20020a1c3bd6000000b0038f4e306c2fmr15082828wma.66.1650356227807; Tue, 19 Apr 2022 01:17:07 -0700 (PDT) Received: from caleb.strathmore.local ([156.0.232.55]) by smtp.gmail.com with ESMTPSA id j14-20020a05600c190e00b00392910b276csm9307012wmq.27.2022.04.19.01.17.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Apr 2022 01:17:07 -0700 (PDT) From: caleb To: ffmpeg-devel@ffmpeg.org Date: Tue, 19 Apr 2022 11:17:01 +0300 Message-Id: <20220419081701.8021-1-etemesicaleb@gmail.com> X-Mailer: git-send-email 2.34.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/jpeg2000:fast-fail if HTJ2K codeblocks are present X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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: caleb Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: lTYcdLMbDwTW --- This patch adds support for detecting Part 15 codeblocks to JPEG2000 specified in (Rec. ITU-T T.814 | ISO/IEC 15444-15). The decoder on detecting Part 15 codeblocks now fails gracefully with a AVERROR_PATCHWELCOME return code libavcodec/jpeg2000.h | 2 ++ libavcodec/jpeg2000dec.c | 9 +++++++++ 2 files changed, 11 insertions(+) diff --git a/libavcodec/jpeg2000.h b/libavcodec/jpeg2000.h index d06313425e..e5ecb4cbf9 100644 --- a/libavcodec/jpeg2000.h +++ b/libavcodec/jpeg2000.h @@ -110,6 +110,8 @@ enum Jpeg2000Quantsty { // quantization style #define JPEG2000_CSTY_PREC 0x01 // Precincts defined in coding style #define JPEG2000_CSTY_SOP 0x02 // SOP marker present #define JPEG2000_CSTY_EPH 0x04 // EPH marker present +#define JPEG2000_CTSY_HTJ2K_F 0x40 // Only HT code-blocks (Rec. ITU-T T.814 | ISO/IEC 15444-15) are present +#define JPEG2000_CTSY_HTJ2K_M 0xC0 // HT code blocks (Rec. ITU-T T.814 | ISO/IEC 15444-15) can be present // Progression orders #define JPEG2000_PGOD_LRCP 0x00 // Layer-resolution level-component-position progression diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index 92966b11f5..ef4a653afe 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -521,6 +521,15 @@ static int get_cox(Jpeg2000DecoderContext *s, Jpeg2000CodingStyle *c) c->cblk_style = bytestream2_get_byteu(&s->g); if (c->cblk_style != 0) { // cblk style + if (c->cblk_style & JPEG2000_CTSY_HTJ2K_M || c->cblk_style & JPEG2000_CTSY_HTJ2K_F) { + /* + * HT code-blocks (Rec. ITU-T T.814 | ISO/IEC 15444-15) bit-stream + * Not yet supported in ffmpeg, cannot continue. + */ + av_log(s->avctx, AV_LOG_FATAL, "Support for High throughput JPEG 2000 is not yet available\n"); + return AVERROR_PATCHWELCOME; + } + av_log(s->avctx, AV_LOG_WARNING, "extra cblk styles %X\n", c->cblk_style); if (c->cblk_style & JPEG2000_CBLK_BYPASS) av_log(s->avctx, AV_LOG_WARNING, "Selective arithmetic coding bypass\n");