From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 9C6E540B25 for ; Fri, 6 May 2022 17:56:41 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5B62568B31C; Fri, 6 May 2022 20:56:38 +0300 (EEST) Received: from mail-ed1-f41.google.com (mail-ed1-f41.google.com [209.85.208.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7E8D368B0BE for ; Fri, 6 May 2022 20:56:31 +0300 (EEST) Received: by mail-ed1-f41.google.com with SMTP id y21so9557568edo.2 for ; Fri, 06 May 2022 10:56:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sandflow-com.20210112.gappssmtp.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=M2+mXxBLDbhMriffBwLTvoGzZ7OwIsRBpBHFSi/UqDc=; b=EqMFtqeSSasplgSUa+nadvmQF4+k3QNe6Dbw1+T446efKYbq3tH4sP34pCyNxgzKkn ozJItEaMSvAsPBg1XXPWrU0vt1eWF6nnPBetSCEn75gGrQwtvYCrK4IuWwcqhYNeLYLx G2kCI8X7xm+Z7JtI9RONd3blwqYY4NB++0cJRDzOmnKNKVh4J5AlIbuc4eZMDHZDxqoX LBU4S4hQZcZRrWi4W2dWl/Oo5Hy7OXDGoidfDiGqrOM3g6Zu9To3rveLgsNZkupQNH3I sg/Qvl7Un5xRrkgLhq+B7jX/Ya57xsSO/biRfIUd4ybw3GF0cn7IvqadtDGF1k7gN26c s56g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=M2+mXxBLDbhMriffBwLTvoGzZ7OwIsRBpBHFSi/UqDc=; b=2Q5vRKn+FZRN6jYucNBwT3vxL4g0D4Y45xWkb4x+sB41Rjt7fxqrT4Uq1fCmCvDDrM n7LyS7nF6RMMhFErzV8ksC0WaS7X6VrLNngX5OkQ4bqjAFLJ58sZr2NxP1OD6uHZ3F3z hjQ+dPdF4QvarYE7HpzoPKe3J2KZLTrV0iL3nOenkk42xZDQMkMccAfiMhYmpPG/tFB8 ODeAhRsISYsgWph4aMOVKoqwl5Zg10k2XVXnypRUMcWP0mA47QqiLEOSZQFPwhlXkETl JzvxqthcMXs93qLPJXOcoKPNHHuFhlDm/HDOMLPewCqYAprUBu9uQDLxypF57FnvQFF2 vNIg== X-Gm-Message-State: AOAM533pC3yXb3QFUcSZBiqanCYEwitM8tn92kHxjUkbKRDrY85iPM83 2ltqaRpo2401HeKk4sniUOhrEpL3j9yXdShI X-Google-Smtp-Source: ABdhPJzzGY/ZW6Xdqwr61btAufMB/g3/vLLk4N6BP5UMBWBLRYMEH8X1sHNyWRbBDMNUNKyumSYp2g== X-Received: by 2002:a05:6402:3508:b0:427:b100:b825 with SMTP id b8-20020a056402350800b00427b100b825mr4611304edd.268.1651859790579; Fri, 06 May 2022 10:56:30 -0700 (PDT) Received: from mail-ed1-f44.google.com (mail-ed1-f44.google.com. [209.85.208.44]) by smtp.gmail.com with ESMTPSA id y5-20020a50f1c5000000b0042617ba63afsm2556207edl.57.2022.05.06.10.56.29 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 06 May 2022 10:56:30 -0700 (PDT) Received: by mail-ed1-f44.google.com with SMTP id a21so9564734edb.1 for ; Fri, 06 May 2022 10:56:29 -0700 (PDT) X-Received: by 2002:a05:6402:4313:b0:427:ca44:5d5e with SMTP id m19-20020a056402431300b00427ca445d5emr4761743edc.67.1651859789290; Fri, 06 May 2022 10:56:29 -0700 (PDT) MIME-Version: 1.0 References: <20220506065543.9085-1-etemesicaleb@gmail.com> In-Reply-To: <20220506065543.9085-1-etemesicaleb@gmail.com> From: Pierre-Anthony Lemieux Date: Fri, 6 May 2022 10:56:16 -0700 X-Gmail-Original-Message-ID: Message-ID: To: caleb Subject: Re: [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: FFmpeg development discussions and patches Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: LGTM On Thu, May 5, 2022 at 11:56 PM caleb wrote: > > --- > 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"); > -- > 2.34.0 > _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".