From patchwork Fri May 6 06:55:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Caleb Etemesi X-Patchwork-Id: 35614 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a885:b0:7f:4be2:bd17 with SMTP id ca5csp1509575pzb; Thu, 5 May 2022 23:56:18 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwc7OzVIrLKDzYaA4F5W+TOogyR28F0/RaP0okOJ6ZA6Pyiwm6m7SRsMW7733YFXs6M+cfm X-Received: by 2002:a17:907:16ac:b0:6f4:60e1:723b with SMTP id hc44-20020a17090716ac00b006f460e1723bmr1683251ejc.272.1651820178687; Thu, 05 May 2022 23:56:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1651820178; cv=none; d=google.com; s=arc-20160816; b=yJMQbH/FdU0bbmtvNKvQEMX0oYwY6uB06iz8AxcZjjP4KUC3tiFfEuOTBEwiX8WDKt /j7yuarbT48Qj9wjl3wNRIuT2NI/1vkYV1ewp7OwFWm3n167f0EEHVQN1kzAWwSocc9R Vt4ETtsM1yVLZLy/c9c7qiRqCrGJRfKDeqIES7DGAXMTJqfst8ymI13Qbe2ECpnIRwK3 66SbtXkaUWf5LFbWU5DkMoDIoppulkKMcWiCliAu5sHe6yfLVYFIC4qRKk6kmkbK7APU zM+wk8t6gRtJ8pvUNAE7mj7rV7s4hr93Vf2Ki9q0BwPzsirjgYgxglaaurxCrZpcWCH7 cJqg== 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=MqeD9TDWEdO6B9vX8GocioMxcbsZL4wZIEVyEOuY+u4=; b=cYBYBD0LG5E/o8QNPjoK4dv67uokKBoo3x7yaRQhgN+AyXTrm0btX0jh3wsrvrHvzt jqrGZ/7k8oIqpcXAhRzIkgcOujkLQrW4CvGS/yPEVa3+16rHqpjiHIpNdp7M/yw0cegJ QcwDGtpYzkNuy1rQ9HXDt+g0kZndDpKgm69ckUMjWjAYfWaR7OBwv4nIdTQd40IOVeK/ 7RXR9phjgBwMKr41TOmRPMQ0QmscjfFw6a3uAsB97J3r1J6HNQd6eSEQfzY+ojToE2GU G2hY35TmIUfVGQLJEAfTQj52savhucMUpZ3sUwX2R7ShCN9z5d/gDeRMxrGIb5e79F0d BVWQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=ALn64ncZ; 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 nb5-20020a1709071c8500b006f50917110esi3130920ejc.163.2022.05.05.23.56.16; Thu, 05 May 2022 23:56:18 -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=ALn64ncZ; 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 F1C3068B0BE; Fri, 6 May 2022 09:56:12 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f44.google.com (mail-wr1-f44.google.com [209.85.221.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C55E068B289 for ; Fri, 6 May 2022 09:56:05 +0300 (EEST) Received: by mail-wr1-f44.google.com with SMTP id b19so8723876wrh.11 for ; Thu, 05 May 2022 23:56:05 -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=0TdR9T2sP+Q2ehyzOj09B9XkolpRFmNxITyK8bF/hjM=; b=ALn64ncZFlzGll+LCnRa3rQFLGga7rNipUbACH/50X/AAYJ0TNWkIVXuZZbFEM0IaS 5qOmBfoiZrz4D45K7pGHG5S3X1YS/5HRHedoirzytk31zm/TGWrCNW1VnFbnjdws6XLD lpyQYRZj9a1EqjrfQ8usdNwLkWQ5b9Xky0Cjf/f6cPslQWoqTUyhaLHwATPxJ0umXs4g VcrGjGNu0j5CQzszmoYUSpJOMynVf/Vyg7/wDQvVLsOdbHnmTyqJl4G4Dg2Mc8Rdc6Sq /D7H6ee5dWEkU+Xf59XxXhBReJU/EZG3PJ1QMKFpEyDW7ZRcFPTm70sXFRsO3bJB+LOQ dIBw== 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=0TdR9T2sP+Q2ehyzOj09B9XkolpRFmNxITyK8bF/hjM=; b=39k0VVysFxbleKzjNhu16fciCGQqPpsV6dU0qGSKifXKoQXG8WZ9ywhr4T71xwLgDf GLoAgpaFXx3DGImveqtGb3tmpNC1sY4sceyaeJCEqz4TK+sljGRaYmo4kLhqlgYAjNxn sSppq7KHy/jrlVq5pKNd086p4tUFmX116Mr5tMWswBACreI51ABGT3Djh3t0iGI9cC31 W7TWTdom934ne3FLPhoeZ5xg/PRxt1sukElM+2KihzOMNfdpsKoqbcIG64mVJKT25xHY zIVxDdc4Fg5xEF9RYgMWlG9niIyQJNViFzth0kg5ISbNbmN7eQQmUP/3wnPITineyyZu pQmw== X-Gm-Message-State: AOAM533MvXbDdVGgwOIscCEUo0mxVcvylg02oWfIt+t37qVpItMmk1b7 hsyOcnnxCDvQ9y9ZlwHpTxKDzewgZHyv+A== X-Received: by 2002:a5d:5051:0:b0:20c:884b:2347 with SMTP id h17-20020a5d5051000000b0020c884b2347mr1432006wrt.224.1651820163616; Thu, 05 May 2022 23:56:03 -0700 (PDT) Received: from caleb.strathmore.local ([156.0.233.50]) by smtp.gmail.com with ESMTPSA id l12-20020a7bc44c000000b003942a244edfsm3468109wmi.36.2022.05.05.23.56.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 May 2022 23:56:03 -0700 (PDT) From: caleb To: ffmpeg-devel@ffmpeg.org Date: Fri, 6 May 2022 09:55:43 +0300 Message-Id: <20220506065543.9085-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 , pal@sandflow.com Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 0SndXSjA4dly --- libavcodec/jpeg2000.h | 2 ++ libavcodec/jpeg2000dec.c | 4 ++++ 2 files changed, 6 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..30f8c878d1 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -521,6 +521,10 @@ 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) { + av_log(s->avctx, AV_LOG_ERROR, "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");