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 489CF46AA9 for ; Wed, 2 Aug 2023 20:33:59 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 20C8D68C680; Wed, 2 Aug 2023 23:33:47 +0300 (EEST) Received: from mail-ot1-f42.google.com (mail-ot1-f42.google.com [209.85.210.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 86A52689975 for ; Wed, 2 Aug 2023 23:33:40 +0300 (EEST) Received: by mail-ot1-f42.google.com with SMTP id 46e09a7af769-6bca018afe8so53840a34.0 for ; Wed, 02 Aug 2023 13:33:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1691008419; x=1691613219; 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=lSFPAHPACw3m0V1moily4yah1RPnT8d/F9A22gpjNGvmgi0XjvJftW/w7bhzf0uXNc maWS8HBIVBAlEGaX5gR8aTaECjODEc0jpgeVXW2jtN2HrZsYD3Bmxdo+ncrcob5EN1bn tZF6n29xptrPh3Kjk6ZwRB6mh1eTajGdMcR5ryzTnaWshLlmMfOpCc6daU3Da+jOgP+4 v+tk1xjCo6iG0whNQEv+SDnjDOhTsqFjRE6+eLjPgKFzrievtxs3VnrjnYW/Kii74kRz wQe8jyc5qj78daXHbPFJaJLeumJiviWx2/wbLJ3py9iPei2dOT/MrhEhPVsh0LjLxTee Kgiw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691008419; x=1691613219; 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=VIZuBAjJ21sE3O0imXnZLySIdMEdp1UKdr8OceXlYI3AKncoM+/3PNYWvPNFCAdNCK 3MTCAf7R2zAD31tEYMBmcl7fJcrl0TrK2DuO67rISXPTmdGclGytfleVd++0YmIxUIHZ GMtYvy3L+C07GPsMnQgplLAo+TO1R20AUXySBKb3MlxKpWLZhQWH1Dkjq3zP1Jezxh70 ln6RLxmaJe5IVFKsbCXPKTw/GMUgBBvkgKcN+ONH56v8ztegvF9fGocfSXeve5feGcPa pzCq2CjaMirkilOag06+8SmP11wsx88pPlfgALaZcmz2ExorCEV/PVfNLGojx98xpyla HcuQ== X-Gm-Message-State: ABy/qLaJgkPu6q7wvG++mxbYC1rLuTeKvoH7B4tzjFe+PkDHiHKf0JC1 saQoKObQlQkIJGgh+tPxUe6He1xknlA= X-Google-Smtp-Source: APBJJlG7sJ8jHqfFUjhHDrVTK2qPUI3TTVp/siqPWX1ntOnrQk6gYbdmUr2ZisRNLEd4k4WVDlwVoQ== X-Received: by 2002:a05:6830:4602:b0:6b9:db20:4d25 with SMTP id ba2-20020a056830460200b006b9db204d25mr9896979otb.1.1691008418781; Wed, 02 Aug 2023 13:33:38 -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 cf4-20020a056902180400b00c654cc439fesm3930524ybb.52.2023.08.02.13.33.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Aug 2023 13:33:38 -0700 (PDT) From: Leo Izen To: ffmpeg-devel@ffmpeg.org Date: Wed, 2 Aug 2023 16:33:30 -0400 Message-ID: <20230802203334.23640-2-leo.izen@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230802203334.23640-1-leo.izen@gmail.com> References: <20230802203334.23640-1-leo.izen@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v7 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".