From patchwork Mon May 9 13:43:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Izen X-Patchwork-Id: 35700 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a885:b0:7f:4be2:bd17 with SMTP id ca5csp2942876pzb; Mon, 9 May 2022 06:44:36 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwEiI3MxziEJyrVgUAHTCXNQAfYi+yaBeP54kz27+lTLE2AIi1siLSLbyD84jA4uFrohovh X-Received: by 2002:a17:906:6546:b0:6f5:fc1:e8c0 with SMTP id u6-20020a170906654600b006f50fc1e8c0mr15490685ejn.554.1652103876191; Mon, 09 May 2022 06:44:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1652103876; cv=none; d=google.com; s=arc-20160816; b=wmvXiqIPmzVM6/KJ8eglqPEM5kNhV/Zc9oAE2d3qMFCa5IVAHFddJD2MZtSPGQOGjz DAEKUz3r4YDXoGp+H/wbXEOgSJWKLgj6Z2MithN6JG7yjXQdhll0nj6XboX6rJ8yKqDc 3YrkUxhgv4bsC9UJtAjzzCLs5Uy8WaQeQzelZz6vJB5poh5ha2ChYfZA7Kt7v7XrPNGX fZIEvQ8UDIuNIc5M85rT5CpQ9MVbihi9bMh2ix4QYrTEmaaWK8MNzstd7O3zANadiivK c/0sAkdcGj/MW5h8JsGA+ZeU/jQuQ3Oi19NHwfmbkRHXoKLf2gDwXn1XDzGsXiFJpW8B zLJg== 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=O/j8MTPkYw3ixUPQL4gUpcSr1oF0oo9i0J+D431OfsM=; b=y9xEAiTOSVcOIqP1hVxu08kPdNksra/Ns/quNTLds1XaAcrouOHeHigj8QcHITydq4 8v6dTq2UHMBcUWo5Nb8keR2Twv3wJUnIQ/Gr9atKDYnbmWyZ7xTYCnYxgegBey7Wydbi A566YmUTu+Mx78oEAO0dgYpugjjHSdmbMyH/BqAB3SMIWajaoOu+WxU8Kw55Fr5Dt6iH G5sMimy7Oe+bxO1YXCVygih5BX+zynu3p7v80tyKoLvoj3l3zFupxH0Ca+ugi4ABYZH6 15L2UIjQD4d03NGjEvQ0Ft9uSBfQkec+3n7f2WdNLOzu2/eyI4MpOEx+3fl2cj5RzJRL ZBbA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=XM+2oksC; 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 h10-20020a05640250ca00b00425d8c74949si14985057edb.417.2022.05.09.06.44.35; Mon, 09 May 2022 06:44:36 -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=XM+2oksC; 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 7EB9C68B3CA; Mon, 9 May 2022 16:44:21 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-io1-f52.google.com (mail-io1-f52.google.com [209.85.166.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6B7CA68B3B5 for ; Mon, 9 May 2022 16:44:15 +0300 (EEST) Received: by mail-io1-f52.google.com with SMTP id r27so15329833iot.1 for ; Mon, 09 May 2022 06:44:15 -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=F99bcs+s+87OLo73egEeJGe3P2JILSiIbS8yphrR53g=; b=XM+2oksC8zt12XZCcQyOmdln2BCpIg58dDX/+MEAXz/20nGSrwbq2BJ8LslvEIoz4a XWrI3TyQcA3bLVZKw7HFu3qgOOoLLJCyvsk72teLYnEzjFSBYO3e6yB5aKbOj1P3RjAV hb7uyODNuIRVCre/skIwAKVXTANkbNq3HK/EC5Q2+Q0W/wKeA9QqhRwK0zQEgmsZvR4k VAhqwfruTxjzzC4pmJtldHUg+0NKmHms+7vrdEJrFSJbDbIqh5cKCtDZdN75qehnfOuH b0JijB/crSkydBlVxg7gPmNxhatJdIeq4/LhfYFleh75TiXNqwqQfBrLPkvVzrMs919l ov4g== 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=F99bcs+s+87OLo73egEeJGe3P2JILSiIbS8yphrR53g=; b=JwcRoB1hlmMyG+vWhCd0TJFsvwofODsmVRzYrN3q8s+QwbJzQPG5pPB1h4gu0cgwiD rvRzHpd5xl+FgoJoA6QcFVlNSRusGcWihsucjzUPRiPgW7dZQUPCdi50dWgjNWVZ88NE uqDA6r20MTyGOLa5WT3GSfKkU3g0w3apKB346qsqkmhrcs1uqjh/iwtPQAaz7E8LF+Gn 5MHAeyc/oEBxuAjhdy9lffiidpr+LMaHQYJNwUJ85GJceBK1F7BPYdelKRy0ZJBARv0c 3oi9FRgDOmqmxxYhLLOBXu1dI0DWS1d9WF6FGcQ3Mk5R/x6zgLMC+yMdSM8+r/sBFRor N9JQ== X-Gm-Message-State: AOAM532T7KIFJcuNtrqzu1/WqtBcKT8FEzeDFFw1+gFplNNb0UJqZULP P0uz04OXyLS8MGTZo5Y1n5rfdopC/mk= X-Received: by 2002:a05:6638:24cf:b0:32b:6bd0:7f82 with SMTP id y15-20020a05663824cf00b0032b6bd07f82mr7879785jat.80.1652103853788; Mon, 09 May 2022 06:44:13 -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 r8-20020a92ce88000000b002cde6e35300sm3098448ilo.74.2022.05.09.06.44.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 May 2022 06:44:13 -0700 (PDT) From: Leo Izen To: ffmpeg-devel@ffmpeg.org Date: Mon, 9 May 2022 09:43:54 -0400 Message-Id: <20220509134355.83745-2-leo.izen@gmail.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220509134355.83745-1-leo.izen@gmail.com> References: <20220509134355.83745-1-leo.izen@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v6 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: uMOU2BBuk7Lb 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 | 113 ++++++++++++++++++++++++++++++++++++++--- 1 file changed, 105 insertions(+), 8 deletions(-) diff --git a/libavcodec/libjxldec.c b/libavcodec/libjxldec.c index cd4bca3343..813ee279fe 100644 --- a/libavcodec/libjxldec.c +++ b/libavcodec/libjxldec.c @@ -135,6 +135,7 @@ static int libjxl_decode_frame(AVCodecContext *avctx, AVFrame *frame, int *got_f uint8_t *buf = avpkt->data; size_t remaining = avpkt->size, iccp_len; JxlDecoderStatus jret; + JxlColorEncoding jxl_encoding; int ret; *got_frame = 0; @@ -189,16 +190,112 @@ 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); - 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 = JxlDecoderGetColorAsEncodedProfile(ctx->decoder, NULL, JXL_COLOR_PROFILE_TARGET_ORIGINAL, &jxl_encoding); + if (jret == JXL_DEC_SUCCESS) + jret = JxlDecoderSetPreferredColorProfile(ctx->decoder, &jxl_encoding); + if (jret == JXL_DEC_SUCCESS) + jret = JxlDecoderGetColorAsEncodedProfile(ctx->decoder, &ctx->jxl_pixfmt, JXL_COLOR_PROFILE_TARGET_DATA, &jxl_encoding); + + avctx->color_range = frame->color_range = AVCOL_RANGE_JPEG; + + if (jret == JXL_DEC_SUCCESS) { + 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 if (jxl_encoding.white_point == JXL_WHITE_POINT_D65) { + avctx->color_primaries = AVCOL_PRI_SMPTE432; + } else { + av_log(avctx, AV_LOG_WARNING, "Unsupported JXL white point: %d\n", jxl_encoding.white_point); + jret = JXL_DEC_ERROR; + } + break; + case JXL_PRIMARIES_CUSTOM: + av_log(avctx, AV_LOG_WARNING, "Custom primaries are unsupported without an ICC profile\n"); + jret = JXL_DEC_ERROR; + break; + default: + av_log(avctx, AV_LOG_WARNING, "Unknown JXL color primaries: %d\n", jxl_encoding.primaries); + jret = JXL_DEC_ERROR; + } + } + + 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); + jret = JXL_DEC_ERROR; + } + break; + default: + av_log(avctx, AV_LOG_WARNING, "Unknown transfer function: %d\n", jxl_encoding.transfer_function); + jret = JXL_DEC_ERROR; + } + } + + /* fall back on ICCP if enum values fail */ + if (jret != JXL_DEC_SUCCESS) { + 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_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); + } + } } + + 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; + } + + 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");