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 8403F4550B for ; Tue, 1 Aug 2023 13:31:09 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 41C2768C4A5; Tue, 1 Aug 2023 16:31:06 +0300 (EEST) Received: from mail-yb1-f172.google.com (mail-yb1-f172.google.com [209.85.219.172]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0BE4C688371 for ; Tue, 1 Aug 2023 16:30:59 +0300 (EEST) Received: by mail-yb1-f172.google.com with SMTP id 3f1490d57ef6-d1faecbb794so417931276.1 for ; Tue, 01 Aug 2023 06:30:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1690896658; x=1691501458; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ggKbLNu8SI4CcalFD5iIyy3T41pmTrx3El/vncsspus=; b=gsGEgBjc3eAR3LTEtXD7H82QsEPzJTvfDN06hT+Ovzq0gsf7piiwPSUL5fLvwexvQD Z2/uBXOTlAD7NlvrIjxHDk3XmrM6egFfYkc0iPtRCUT9BGh8frI8SSgMIk3cTdsWDpKS V/eYT0StWIezM71llEDvB6/bQes9tIvMg/t08U+g++enPgIUUxSFmpgnwvc2i7T2/bdP udL1H8g5gV9Iy6PzuxYXZsUMZqybsrIo0yByke8rjLi3VAT4E5lCRJgqkylCfaz4W7rU P/Df7AmLO07g/VbTmBbih8RhsRf3+sa71LrBBn9hN9ecOAscL5uT7fHGdVL+jlT2BgJw 8Spg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690896658; x=1691501458; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ggKbLNu8SI4CcalFD5iIyy3T41pmTrx3El/vncsspus=; b=kNsak0EC2OyyvtZisF7sRpjtwCmI50nH4YDD+GKBdYAfzvAkv22HK+TjXhQFap6CJq Tb681BLkeiiEgeTP5Aw6CBoR5klzjbnhOlxxlYfnPKOWckkazxee2CyrrkxOFhmkfi9I IzxrfYseSOkO6STPiEP10q/m6TBTpi+aTlqrddSInb+9u2J5Yz54u40hw4Gub5PBwUYm t8jXwXZtIZ8W/H+Vrhae7YMxsjuBzPxKeOFLatuLRH5dCgVCz6tsGY0pVk/bCIAp4JBp hqZNwTP8Q5qjBTCJaUJ+Gv925/RgZ7A0szzw3I05+9HO5xDVUwGruwoAE3Tnj2MuD6+8 PEpQ== X-Gm-Message-State: ABy/qLa2QPa4IOo0u/xtz9jzHymE/poJwID3PqXTedYuToxg0MBCuYxY MYva70VvbyoLvYuE66YYu6v1m+YMXAs= X-Google-Smtp-Source: APBJJlFesFj+KW9eI+3mqSnXU8NW+iZNQws5Aih6R9CW+GBt5cLWwW+CQKyiJPoncnkCCIoMt0n1Lg== X-Received: by 2002:a25:b0a7:0:b0:d0c:8ca5:e93f with SMTP id f39-20020a25b0a7000000b00d0c8ca5e93fmr4604940ybj.6.1690896657923; Tue, 01 Aug 2023 06:30:57 -0700 (PDT) Received: from gauss.local (c-68-56-149-176.hsd1.mi.comcast.net. [68.56.149.176]) by smtp.gmail.com with ESMTPSA id x84-20020a0dd557000000b005463e45458bsm3738130ywd.123.2023.08.01.06.30.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Aug 2023 06:30:57 -0700 (PDT) From: Leo Izen To: ffmpeg-devel@ffmpeg.org Date: Tue, 1 Aug 2023 09:30:51 -0400 Message-ID: <20230801133055.256537-2-leo.izen@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230801133055.256537-1-leo.izen@gmail.com> References: <20230801133055.256537-1-leo.izen@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v6 1/5] avcodec/libjxldec: fix errors when decoding grayscale after rgb 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: Leo Izen 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: Fixes an error that's caused by decoding a grayscale JXL image after an RGB image is decoded, with the same decoder instance. Signed-off-by: Leo Izen --- libavcodec/libjxldec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/libjxldec.c b/libavcodec/libjxldec.c index e45ac02c07..9be1d9295a 100644 --- a/libavcodec/libjxldec.c +++ b/libavcodec/libjxldec.c @@ -298,7 +298,7 @@ static int libjxl_color_encoding_event(AVCodecContext *avctx, AVFrame *frame) } avctx->color_range = frame->color_range = AVCOL_RANGE_JPEG; - if (ctx->jxl_pixfmt.num_channels >= 3) + if (ctx->basic_info.num_color_channels > 1) avctx->colorspace = AVCOL_SPC_RGB; avctx->color_primaries = AVCOL_PRI_UNSPECIFIED; avctx->color_trc = AVCOL_TRC_UNSPECIFIED; @@ -334,7 +334,7 @@ static int libjxl_color_encoding_event(AVCodecContext *avctx, AVFrame *frame) } /* all colors will be in-gamut so we want accurate colors */ jxl_color.rendering_intent = JXL_RENDERING_INTENT_RELATIVE; - jxl_color.color_space = avctx->colorspace == AVCOL_SPC_RGB ? JXL_COLOR_SPACE_RGB : JXL_COLOR_SPACE_GRAY; + jxl_color.color_space = ctx->basic_info.num_color_channels > 1 ? JXL_COLOR_SPACE_RGB : JXL_COLOR_SPACE_GRAY; jret = JxlDecoderSetPreferredColorProfile(ctx->decoder, &jxl_color); if (jret != JXL_DEC_SUCCESS) { av_log(avctx, AV_LOG_WARNING, "Unable to set fallback color encoding\n"); -- 2.41.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".