From patchwork Wed May 4 12:40:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Izen X-Patchwork-Id: 35584 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a885:b0:7f:4be2:bd17 with SMTP id ca5csp416960pzb; Wed, 4 May 2022 05:41:08 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxD3MOYtWeqGn+wgdfoY9p9BZK7xJLE3rtjb5+5uQ1jpGpWaIWtMCgp/soiIsjJE1XTRmYZ X-Received: by 2002:a05:6402:cb6:b0:425:f2e0:3644 with SMTP id cn22-20020a0564020cb600b00425f2e03644mr22571680edb.301.1651668068623; Wed, 04 May 2022 05:41:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1651668068; cv=none; d=google.com; s=arc-20160816; b=AixOvz2KZAGssWXFtyeJkrM9KuRWkuLmP4xnNGc8jklRnqovDmYaQRUMVMlTERZgeb 0szub8jWfR1KkYB5y36PXpKL/f6ZxpwasxAsFX+FV2pLlBPn+NDcnZS8dAMO9a7hCenz Wh5UwTLAAajZnSuG3QOHzxAw2IRCRosAxWPThUKX7vdzdySDZoSzWPzanW8TA8//+OnM tW22d5/RjXXjhVRAOSUSyC7hiCYyyoWLhcdhXYkYsSVwzGhc79JlGRWe3SlrmXeFCnIH eTByVoUCdkNrYJAtuMB2YDCyrhmu7dQprM38M89yl1EyI92VeNQVZTu0qjFnCCCxpsZN ocWA== 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:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=/Rcy7TXxcx+pOPZtakkmEcn9O3TvkoBX8N4lvu+a1bM=; b=NraoheCXOI0Rf3M8yU7wryfyyNhfx0EbFTQp8pWJTfTfmfkA9XjpvXtIbVm4V4BPBI QlXJDu3GVY8WadUT9xmMk4kGnKyLUUwozlfTYBxVybIZKBUUaVVxTGS02wxWlHr6f1kq GsOBjspiiR0nkTndkKd+F+k+aeJnYr80GigAYm3WvJ1LAvyya2Z7wXrmetVdkrWmtoW8 eZQoUB/+qJFvk/9zum98qvQeNsrCXSheVlyR2jbxflEVEIQQKxUQ2tEFPn86jbJkg825 aoRi4BcdDsTOPX2QdOPVs3BMbh2Ruad1pzw9KKmQMHr/5tr024uhSKVgmFfr1JvTbUrV Ke0A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=Vs+gx3ff; 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 e5-20020a170906080500b006f37d187707si15086167ejd.41.2022.05.04.05.41.08; Wed, 04 May 2022 05:41:08 -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=Vs+gx3ff; 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 4588668B31C; Wed, 4 May 2022 15:40:58 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-io1-f44.google.com (mail-io1-f44.google.com [209.85.166.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E76BE68B28D for ; Wed, 4 May 2022 15:40:50 +0300 (EEST) Received: by mail-io1-f44.google.com with SMTP id z26so1321294iot.8 for ; Wed, 04 May 2022 05:40:50 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=DBqbmLn64mQNef2pYFqKIeDUv/nRE5Ez4Y5xcoP1p+8=; b=Vs+gx3fffOYwfqqoY6CBisCXY1pCZ1MXgmkyyLH9QxUgHxQjHKuLA42sTTtitc1ZT8 nfdo/LV2z6KszBFKaoW69Y3WG7kv0iF+fDeDhX+sNhQbpcHZ4fDtUPLc3kx1t66qCDyl 75emDjSvFdq8Rpov0F5RBQNnLjXksQt7K2iIYmxG1G9TmeMVWEAr6Tl1aidcPyAa5qTx Rw97+5A81yaiXPaRgzNhVadjJoSTuef4boOZ461h4dtCMYruCFehYDlIcI2LUp2wwaYn DjqDzdJWOaduDO9TR/XpY5CRQ/n/Tq6AMny/aAN8iARb97WfyE/qnryCGBHgDcOdtVGu lZBg== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=DBqbmLn64mQNef2pYFqKIeDUv/nRE5Ez4Y5xcoP1p+8=; b=rpxNnMy0LTeGr/NThEQ0tlnP9Rjeu6Zwny4jFlIYItOViooiJmxmEWgCnL7CQ2SspG +i31fNh7FGIa5iwEibepwgiutolakJ0+VDMYfgN6DZR+OZTU2vT0/2k6m465zLgFVXf7 +D/P9Jezqnvx069d1nHQJCoev9XcX83SR9EhAwV6B+dkb2TtIPvoI6M2Opse3lKEH4rT t9t+kK6LhWE7SHyy7/ut9f+o+e006k17rW62WKgou/r1hVbtJO6NOmo51TK2bjV3uBnH 9wwJM6glvKqwDmPV6hDxkSre+MF0h9D6vTzvyE3hgPyT1mP4JfP3YBFfzzs1C18Jr8Bb 3VIQ== X-Gm-Message-State: AOAM533lZ+qEdrnrZf5gmijjQkQKPx5AaO5mPMzVzJG9hb8A9sNbhueH TK2+os3TxUVLacvyECZG8HeSBaMybWk= X-Received: by 2002:a05:6638:144b:b0:321:589b:a8ea with SMTP id l11-20020a056638144b00b00321589ba8eamr9049182jad.296.1651668049596; Wed, 04 May 2022 05:40:49 -0700 (PDT) Received: from gauss.local (c-68-41-54-207.hsd1.mi.comcast.net. [68.41.54.207]) by smtp.gmail.com with ESMTPSA id j15-20020a92c20f000000b002cde6e352cbsm4114456ilo.21.2022.05.04.05.40.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 May 2022 05:40:49 -0700 (PDT) From: Leo Izen To: ffmpeg-devel@ffmpeg.org Date: Wed, 4 May 2022 08:40:45 -0400 Message-Id: <20220504124046.175331-2-leo.izen@gmail.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220504124046.175331-1-leo.izen@gmail.com> References: <20220504124046.175331-1-leo.izen@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v4 1/2] avcodec/libjxldec: properly tag output colorspace 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 3wgctBORTZhg Whether an ICC profile is present or not, the decoder should now properly tag the colorspace of pixel data received by the decoder. --- libavcodec/libjxldec.c | 91 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 88 insertions(+), 3 deletions(-) diff --git a/libavcodec/libjxldec.c b/libavcodec/libjxldec.c index cd4bca3343..381def8b25 100644 --- a/libavcodec/libjxldec.c +++ b/libavcodec/libjxldec.c @@ -189,16 +189,101 @@ static int libjxl_decode_frame(AVCodecContext *avctx, AVFrame *frame, int *got_f continue; case JXL_DEC_COLOR_ENCODING: av_log(avctx, AV_LOG_DEBUG, "COLOR_ENCODING event emitted\n"); - jret = JxlDecoderGetICCProfileSize(ctx->decoder, &ctx->jxl_pixfmt, JXL_COLOR_PROFILE_TARGET_ORIGINAL, &iccp_len); + jret = JxlDecoderGetICCProfileSize(ctx->decoder, &ctx->jxl_pixfmt, JXL_COLOR_PROFILE_TARGET_DATA, &iccp_len); if (jret == JXL_DEC_SUCCESS && iccp_len > 0) { av_buffer_unref(&ctx->iccp); ctx->iccp = av_buffer_alloc(iccp_len); if (!ctx->iccp) return AVERROR(ENOMEM); - jret = JxlDecoderGetColorAsICCProfile(ctx->decoder, &ctx->jxl_pixfmt, JXL_COLOR_PROFILE_TARGET_ORIGINAL, ctx->iccp->data, iccp_len); - if (jret != JXL_DEC_SUCCESS) + jret = JxlDecoderGetColorAsICCProfile(ctx->decoder, &ctx->jxl_pixfmt, JXL_COLOR_PROFILE_TARGET_DATA, ctx->iccp->data, iccp_len); + if (jret != JXL_DEC_SUCCESS) { + av_log(avctx, AV_LOG_WARNING, "Unable to obtain ICCP from header\n"); av_buffer_unref(&ctx->iccp); + } } + avctx->color_range = frame->color_range = AVCOL_RANGE_JPEG; + if (ctx->iccp) { + /* if the ICCP is present, libjxl outputs sRGB */ + if (ctx->jxl_pixfmt.num_channels >= 3) { + avctx->colorspace = AVCOL_SPC_RGB; + avctx->color_primaries = AVCOL_PRI_BT709; + } + /* linear sRGB if float values, standard sRGB if int values */ + avctx->color_trc = ctx->jxl_pixfmt.data_type == JXL_TYPE_FLOAT + || ctx->jxl_pixfmt.data_type == JXL_TYPE_FLOAT16 + ? AVCOL_TRC_LINEAR : AVCOL_TRC_IEC61966_2_1; + } else { + JxlColorEncoding jxl_encoding; + jret = JxlDecoderGetColorAsEncodedProfile(ctx->decoder, &ctx->jxl_pixfmt, JXL_COLOR_PROFILE_TARGET_DATA, &jxl_encoding); + if (jret != JXL_DEC_SUCCESS) { + av_log(avctx, AV_LOG_WARNING, "Unable to obtain color encoding from header\n"); + continue; + } + + if (ctx->jxl_pixfmt.num_channels >= 3) { + avctx->colorspace = AVCOL_SPC_RGB; + switch (jxl_encoding.primaries) { + case JXL_PRIMARIES_SRGB: + avctx->color_primaries = AVCOL_PRI_BT709; + break; + case JXL_PRIMARIES_2100: + /* BT2020 and BT2100 use the same primaries */ + avctx->color_primaries = AVCOL_PRI_BT2020; + break; + case JXL_PRIMARIES_P3: + /* DCI P3 uses DCI, Display P3 uses D65 */ + if (jxl_encoding.white_point == JXL_WHITE_POINT_DCI) + avctx->color_primaries = AVCOL_PRI_SMPTE431; + else + avctx->color_primaries = AVCOL_PRI_SMPTE432; + break; + case JXL_PRIMARIES_CUSTOM: + av_log(avctx, AV_LOG_WARNING, "Custom primaries are unsupported without an ICC profile\n"); + avctx->color_primaries = AVCOL_PRI_UNSPECIFIED; + break; + default: + av_log(avctx, AV_LOG_WARNING, "Unknown JXL color primaries: %d\n", jxl_encoding.primaries); + avctx->color_primaries = AVCOL_PRI_UNSPECIFIED; + } + } + + switch (jxl_encoding.transfer_function) { + case JXL_TRANSFER_FUNCTION_709: + avctx->color_trc = AVCOL_TRC_BT709; + break; + case JXL_TRANSFER_FUNCTION_LINEAR: + avctx->color_trc = AVCOL_TRC_LINEAR; + break; + case JXL_TRANSFER_FUNCTION_SRGB: + avctx->color_trc = AVCOL_TRC_IEC61966_2_1; + break; + case JXL_TRANSFER_FUNCTION_PQ: + avctx->color_trc = AVCOL_TRC_SMPTE2084; + break; + case JXL_TRANSFER_FUNCTION_DCI: + avctx->color_trc = AVCOL_TRC_SMPTE428; + break; + case JXL_TRANSFER_FUNCTION_HLG: + avctx->color_trc = AVCOL_TRC_ARIB_STD_B67; + break; + case JXL_TRANSFER_FUNCTION_GAMMA: + if (jxl_encoding.gamma == 2.2) { + avctx->color_trc = AVCOL_TRC_GAMMA22; + } else if (jxl_encoding.gamma == 2.8) { + avctx->color_trc = AVCOL_TRC_GAMMA28; + } else { + av_log(avctx, AV_LOG_WARNING, "Unsupported gamma transfer: %f\n", jxl_encoding.gamma); + avctx->color_trc = AVCOL_TRC_UNSPECIFIED; + } + break; + default: + av_log(avctx, AV_LOG_WARNING, "Unknown transfer function: %d\n", jxl_encoding.transfer_function); + avctx->color_trc = AVCOL_TRC_UNSPECIFIED; + } + } + frame->color_trc = avctx->color_trc; + frame->color_primaries = avctx->color_primaries; + frame->colorspace = avctx->colorspace; continue; case JXL_DEC_NEED_IMAGE_OUT_BUFFER: av_log(avctx, AV_LOG_DEBUG, "NEED_IMAGE_OUT_BUFFER event emitted\n");