From patchwork Thu Mar 30 18:01:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 40927 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4645:b0:e3:3194:9d20 with SMTP id eb5csp120557pzb; Thu, 30 Mar 2023 11:02:15 -0700 (PDT) X-Google-Smtp-Source: AKy350b/Fv04QpuE51TY+wh/M5ArtgpVZOKzYM/5zhoHAe5N1Q/VY8oenYVzYj2wmJwcudMpXA8A X-Received: by 2002:a17:906:3c53:b0:932:c56a:c19b with SMTP id i19-20020a1709063c5300b00932c56ac19bmr23620095ejg.22.1680199335081; Thu, 30 Mar 2023 11:02:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680199335; cv=none; d=google.com; s=arc-20160816; b=FNs+ONSZafoVo7C11KkFS/M04ICOz3mbZZHW1eRRpAf2MM3/6uEbvosROSRg+e+Uvl gS6JBY+cEURbPDxG8TePp98QgfZvMVRLbkpHPyg8I2FMBxkhNqnpFaJRlgD9FyxHgmWx cLJY4Qw2HJoFFSC4tuyN/1YCb/X1I3EqZyld0vuKaZUVLvpumBZCTA6ArA/34RU3DHR1 RhGb++0WqKKu77JeDaMGj+ZsPGX9i0SEe55qS88sKkfmfJvXrjxQg1wAawF/CPSKzXzg f0eubD4ATcvK0kxOKhAzQCOfX1+KrDe0ZTXvvyJnafsGoYbSzUkDPEVyGz8w2GrvjD7k Xtpw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:delivered-to; bh=Je28wUvn06oc2/E7QUYHagX6i3SarK277azkThBWDyo=; b=wkfJ3be6z3cSdj0dRYqc9AzWgwuDjuSPvhii4EEKYIJZjlfG4bWvjZLXEKUS/eje7w dvc/VPzc3ZM4VNrTiYWUYFa2IrszQ84Obe6BOwUChPnJ8LU4E2uHI/UTmUvXvM1WIXdp 2xK0S0cCZVe0Dyho+/H8Zd9zbT+VofY6CDIG+P/FCO9YQ+D2/NbEFtFkFNXN3zSXl60n N370r//k38k71s0wndgx4tUVJKoohKalj+Sb+MVNE9LCmeMB2Lf+V6BS0NsSaBMUyC7B LDg0N/ZWR43uv7mZx93gXTqKEbNZkNl+bjl6zjUpSgWVzgD7k2L2FNSI5zux50FaNq/V +Xxw== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id ue3-20020a170907c68300b0093b17cc60d2si214541ejc.36.2023.03.30.11.02.05; Thu, 30 Mar 2023 11:02:15 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6801268C412; Thu, 30 Mar 2023 21:01:25 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay4-d.mail.gandi.net (relay4-d.mail.gandi.net [217.70.183.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 21CEE68C3C1 for ; Thu, 30 Mar 2023 21:01:19 +0300 (EEST) Received: (Authenticated sender: michael@niedermayer.cc) by mail.gandi.net (Postfix) with ESMTPSA id 3E203E0002 for ; Thu, 30 Mar 2023 18:01:18 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Thu, 30 Mar 2023 20:01:00 +0200 Message-Id: <20230330180106.11275-5-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230330180106.11275-1-michael@niedermayer.cc> References: <20230330180106.11275-1-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH 05/11] avcodec/j2kenc: simplify pixel format setup 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: U22c1oYkkIzk Signed-off-by: Michael Niedermayer --- libavcodec/j2kenc.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/libavcodec/j2kenc.c b/libavcodec/j2kenc.c index 75bac3c2d84..c3a7a264dc0 100644 --- a/libavcodec/j2kenc.c +++ b/libavcodec/j2kenc.c @@ -1716,6 +1716,7 @@ static av_cold int j2kenc_init(AVCodecContext *avctx) Jpeg2000EncoderContext *s = avctx->priv_data; Jpeg2000CodingStyle *codsty = &s->codsty; Jpeg2000QuantStyle *qntsty = &s->qntsty; + const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(avctx->pix_fmt); s->avctx = avctx; av_log(s->avctx, AV_LOG_DEBUG, "init\n"); @@ -1758,20 +1759,13 @@ static av_cold int j2kenc_init(AVCodecContext *avctx) s->width = avctx->width; s->height = avctx->height; + s->ncomponents = desc->nb_components; for (i = 0; i < 3; i++) { - if (avctx->pix_fmt == AV_PIX_FMT_GRAY16 || avctx->pix_fmt == AV_PIX_FMT_RGB48) - s->cbps[i] = 16; - else - s->cbps[i] = 8; + s->cbps[i] = desc->comp[i].depth; } - if (avctx->pix_fmt == AV_PIX_FMT_RGB24 || avctx->pix_fmt == AV_PIX_FMT_RGB48){ - s->ncomponents = 3; - } else if (avctx->pix_fmt == AV_PIX_FMT_GRAY8 || avctx->pix_fmt == AV_PIX_FMT_PAL8 || avctx->pix_fmt == AV_PIX_FMT_GRAY16){ - s->ncomponents = 1; - } else{ // planar YUV + if ((desc->flags & AV_PIX_FMT_FLAG_PLANAR) && s->ncomponents > 1) { s->planar = 1; - s->ncomponents = 3; ret = av_pix_fmt_get_chroma_sub_sample(avctx->pix_fmt, s->chroma_shift, s->chroma_shift + 1); if (ret)