From patchwork Thu Jun 2 02:14:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Izen X-Patchwork-Id: 36043 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6914:b0:82:6b11:2509 with SMTP id q20csp3774835pzj; Wed, 1 Jun 2022 19:14:37 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzdoQYDa0sMZjCWW6aJTof9S6buwRJ8wvJ0M8CSxS0FYrNbfrOKpiVT86LpfNS8LaRBrXHU X-Received: by 2002:a05:6402:518f:b0:42b:4404:63d4 with SMTP id q15-20020a056402518f00b0042b440463d4mr2869777edd.177.1654136076902; Wed, 01 Jun 2022 19:14:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654136076; cv=none; d=google.com; s=arc-20160816; b=U+I64wlrdQFETAJH158siXofWHbUTWv8xnYlSxnZPBtvMsVqw48y3HbnHIx/RkAh/i rSdO2HK0zD8wiD4+42geaQufP5lkDbBUFCy09rkyTonhjkA39PN8Oe4qtBvG3HtYlzkJ 1z8jeel8MaFX6MPe+OavCgmh28vmLuUcx4BcdcxmREA3C3NUUqR+7qMmTMDxJ2ZiCYhk HNlACC2kk/Gk3ZJ6CnP6trKRP1ScNjQv++4EQ4O7sE8qefid2XogqQQXPiWTHxAmKuUF xJjpXBwAmNMirtJlg0d8/uSQkUUdmadqeKG7smphFPcQNV64+v/JwGue/54Z3OMBN0AR Q3bA== 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=p8LScYiyiVxBWDYLd+e1cMPGnah7/nu45KRhRnkw6mk=; b=x6x+RwWRX+jX2vcVxnI3tnVMx+woSup4an/5nHW/NK3qPYHZfJGfnbMSNnCxJ5xjGZ 8N8cAxPuRbF5BDNAFC5IKA0hu2BSmEnSgSQK4MoSOhxV3OrNeMAPDQ8yFa199R3wVety CLznDDFCjXMO6GP+GpKT0V5IcEKODW75I0MhCC/oyN6VWU3CqqhXDWi1HyGPkwOSpSN7 drJ6T9P3RN0VbYwIGIScswIPK6/xzOb3fWsYI+iLl8K3NagD/VkKI9twuw2FFXTvqdB7 9c1u8fC5A4J5N3pN1TJqF3fkv/cNBfRyRAZhoj4tZyqzPenTYdsAEJsNVKgVZ/SAapl2 bCIg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b="pmLlN/xZ"; 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 i8-20020a50fd08000000b0041e0cd418dasi3134317eds.115.2022.06.01.19.14.36; Wed, 01 Jun 2022 19:14: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="pmLlN/xZ"; 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 8861B68B7DB; Thu, 2 Jun 2022 05:14:23 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f177.google.com (mail-qk1-f177.google.com [209.85.222.177]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 99CA368B64C for ; Thu, 2 Jun 2022 05:14:16 +0300 (EEST) Received: by mail-qk1-f177.google.com with SMTP id o68so2740508qkf.13 for ; Wed, 01 Jun 2022 19:14:16 -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=buvwL8o3Q3elqV+k+FL8VLUeQeVejrthw4VEIAYPlGA=; b=pmLlN/xZX/ZwG9lX/BjWjrCU3/Z0EhLj1I1dSczrnbQihyA3mBPJp37U31yvQyIeq0 R+SnlA7/PyIguJ+tX7QpemiTrn9nSakQ8gEzcqtnDBDjpBgE7ks2iJjY9uWwY+O0SbAH HbLNXXMeyP6UaLyAtjFCjG14DVfZI1JfPfzLr4VjPECGloyRBM5Vh7EtWgd6sRfA+p6R s4OTJur3/bL7upQBNBTXNGs0wg2OFy2sIQlvcT9WJ7cI1ZT22AKzoS+T5JtZqMWWiZCS xPrwA+aEt7p+mDz+Q6B6V7Kq3ocJsCGlVc3KhLAA5rjDnT9ikpmAID3pWb97JRv9KNC1 tw6g== 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=buvwL8o3Q3elqV+k+FL8VLUeQeVejrthw4VEIAYPlGA=; b=XibW+Zsfwt0bEirno5g5fMzOxiuC7Ws26KTP939HNJDpZSzCYu0z3UU07HSG4ZDzEi RweZ+DnUQ5XiMOaxABwUZjMTHt6nii8eGEDS5ds8UEI30wgX1ORm8r3NzMiL9sBtT6Ho Xqp+VIFgkwbpO/lJZVHS6q3NF/4RSkSHDT5d116aB/ZX08gq/o+KivBLEPbFBzXK6DJF ka1tG/przDtpRJ8iRiTxf+CKK27m6OT2NEhrIXuaj3076WAOXvhJ5W7p2W5Lg879FyUH /KTB4Z6+I0YlriHnpTHrLpLrO53vMpmh7/DVfpb7J4cznxMklzUkal7nsYg9sJChHQnY it7g== X-Gm-Message-State: AOAM530NGlT8UnQDHhUXCUGc7ULY69RhuDK2gC+o/lIIvppsTA+z4Tw0 qhEqH0FtqDMnAB1MvrcKqCyUe8js3aBDLg== X-Received: by 2002:a05:620a:4402:b0:6a6:7220:8a0d with SMTP id v2-20020a05620a440200b006a672208a0dmr1758144qkp.265.1654136054645; Wed, 01 Jun 2022 19:14:14 -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 ey19-20020a05622a4c1300b002f39b99f69esm2093738qtb.56.2022.06.01.19.14.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jun 2022 19:14:14 -0700 (PDT) From: Leo Izen To: ffmpeg-devel@ffmpeg.org Date: Wed, 1 Jun 2022 22:14:11 -0400 Message-Id: <20220602021412.58306-2-leo.izen@gmail.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220602021412.58306-1-leo.izen@gmail.com> References: <20220602021412.58306-1-leo.izen@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v8 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: K0AnX4WhbKJI 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 | 142 ++++++++++++++++++++++++++++++++++++++--- 1 file changed, 133 insertions(+), 9 deletions(-) diff --git a/libavcodec/libjxldec.c b/libavcodec/libjxldec.c index cd4bca3343..d2e0616124 100644 --- a/libavcodec/libjxldec.c +++ b/libavcodec/libjxldec.c @@ -27,6 +27,7 @@ #include "libavutil/avassert.h" #include "libavutil/buffer.h" #include "libavutil/common.h" +#include "libavutil/csp.h" #include "libavutil/error.h" #include "libavutil/mem.h" #include "libavutil/pixdesc.h" @@ -92,7 +93,7 @@ static av_cold int libjxl_decode_init(AVCodecContext *avctx) return libjxl_init_jxl_decoder(avctx); } -static enum AVPixelFormat libjxl_get_pix_fmt(AVCodecContext *avctx, JxlBasicInfo *basic_info, JxlPixelFormat *format) +static enum AVPixelFormat libjxl_get_pix_fmt(void *avctx, const JxlBasicInfo *basic_info, JxlPixelFormat *format) { format->endianness = JXL_NATIVE_ENDIAN; format->num_channels = basic_info->num_color_channels + (basic_info->alpha_bits > 0); @@ -129,12 +130,71 @@ static enum AVPixelFormat libjxl_get_pix_fmt(AVCodecContext *avctx, JxlBasicInfo return AV_PIX_FMT_NONE; } +static enum AVColorPrimaries libjxl_get_primaries(void *avctx, const JxlColorEncoding *jxl_color) +{ + AVColorPrimariesDesc desc; + enum AVColorPrimaries prim; + + /* libjxl populates these double values even if it uses an enum space */ + desc.prim.r.x = av_d2q(jxl_color->primaries_red_xy[0], 300000); + desc.prim.r.y = av_d2q(jxl_color->primaries_red_xy[1], 300000); + desc.prim.g.x = av_d2q(jxl_color->primaries_green_xy[0], 300000); + desc.prim.g.y = av_d2q(jxl_color->primaries_green_xy[1], 300000); + desc.prim.b.x = av_d2q(jxl_color->primaries_blue_xy[0], 300000); + desc.prim.b.y = av_d2q(jxl_color->primaries_blue_xy[1], 300000); + desc.wp.x = av_d2q(jxl_color->white_point_xy[0], 300000); + desc.wp.y = av_d2q(jxl_color->white_point_xy[1], 300000); + + prim = av_csp_primaries_id_from_desc(&desc); + if (prim == AVCOL_PRI_UNSPECIFIED) { + /* try D65 with the same primaries */ + /* BT.709 uses D65 white point */ + const AVWhitepointCoefficients *d65 = &av_csp_primaries_desc_from_id(AVCOL_PRI_BT709)->wp; + desc.wp = *d65; + av_log(avctx, AV_LOG_WARNING, "Changing unknown white point to D65\n"); + prim = av_csp_primaries_id_from_desc(&desc); + } + + return prim; +} + +static enum AVColorTransferCharacteristic libjxl_get_trc(void *avctx, const JxlColorEncoding *jxl_color) +{ + switch (jxl_color->transfer_function) { + case JXL_TRANSFER_FUNCTION_709: + return AVCOL_TRC_BT709; + case JXL_TRANSFER_FUNCTION_LINEAR: + return AVCOL_TRC_LINEAR; + case JXL_TRANSFER_FUNCTION_SRGB: + return AVCOL_TRC_IEC61966_2_1; + case JXL_TRANSFER_FUNCTION_PQ: + return AVCOL_TRC_SMPTE2084; + case JXL_TRANSFER_FUNCTION_DCI: + return AVCOL_TRC_SMPTE428; + case JXL_TRANSFER_FUNCTION_HLG: + return AVCOL_TRC_ARIB_STD_B67; + case JXL_TRANSFER_FUNCTION_GAMMA: + if (jxl_color->gamma > 2.199 && jxl_color->gamma < 2.201) + return AVCOL_TRC_GAMMA22; + else if (jxl_color->gamma > 2.799 && jxl_color->gamma < 2.801) + return AVCOL_TRC_GAMMA28; + else + av_log(avctx, AV_LOG_WARNING, "Unsupported gamma transfer: %f\n", jxl_color->gamma); + break; + default: + av_log(avctx, AV_LOG_WARNING, "Unknown transfer function: %d\n", jxl_color->transfer_function); + } + + return AVCOL_TRC_UNSPECIFIED; +} + static int libjxl_decode_frame(AVCodecContext *avctx, AVFrame *frame, int *got_frame, AVPacket *avpkt) { LibJxlDecodeContext *ctx = avctx->priv_data; uint8_t *buf = avpkt->data; size_t remaining = avpkt->size, iccp_len; JxlDecoderStatus jret; + JxlColorEncoding jxl_color; int ret; *got_frame = 0; @@ -189,16 +249,80 @@ 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); + jret = JxlDecoderGetColorAsEncodedProfile(ctx->decoder, NULL, JXL_COLOR_PROFILE_TARGET_ORIGINAL, &jxl_color); + if (jret == JXL_DEC_SUCCESS) { + /* enum values describe the colors of this image */ + jret = JxlDecoderSetPreferredColorProfile(ctx->decoder, &jxl_color); + if (jret == JXL_DEC_SUCCESS) + jret = JxlDecoderGetColorAsEncodedProfile(ctx->decoder, &ctx->jxl_pixfmt, JXL_COLOR_PROFILE_TARGET_DATA, &jxl_color); + } else { + /* an ICC Profile is present in the stream */ + if (ctx->basic_info.uses_original_profile) { + av_log(avctx, AV_LOG_VERBOSE, "Using embedded ICC Profile\n"); + /* an ICC profile is present, and we can meaningfully get it, + * because the pixel data is not XYB-encoded */ + 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); + } + } + } + /* when libjxl adds JxlDecoderSetICCProfile() properly handle the XYB case as well */ + } + + avctx->color_range = frame->color_range = AVCOL_RANGE_JPEG; + if (ctx->jxl_pixfmt.num_channels >= 3) + avctx->colorspace = AVCOL_SPC_RGB; + avctx->color_primaries = AVCOL_PRI_UNSPECIFIED; + avctx->color_trc = AVCOL_TRC_UNSPECIFIED; + + if (!ctx->iccp) { + /* checking enum values */ + if (jret == JXL_DEC_SUCCESS) { + if (avctx->colorspace == AVCOL_SPC_RGB) + avctx->color_primaries = libjxl_get_primaries(avctx, &jxl_color); + avctx->color_trc = libjxl_get_trc(avctx, &jxl_color); + } + /* fall back on wide gamut if enum values fail */ + if (avctx->color_primaries == AVCOL_PRI_UNSPECIFIED) { + if (avctx->colorspace == AVCOL_SPC_RGB) { + av_log(avctx, AV_LOG_WARNING, "Falling back on wide gamut output\n"); + jxl_color.primaries = JXL_PRIMARIES_2100; + avctx->color_primaries = AVCOL_PRI_BT2020; + } + /* libjxl requires this set even for grayscale */ + jxl_color.white_point = JXL_WHITE_POINT_D65; + } + if (avctx->color_trc == AVCOL_TRC_UNSPECIFIED) { + if (ctx->jxl_pixfmt.data_type == JXL_TYPE_FLOAT + || ctx->jxl_pixfmt.data_type == JXL_TYPE_FLOAT16) { + av_log(avctx, AV_LOG_WARNING, "Falling back on Linear Light transfer\n"); + jxl_color.transfer_function = JXL_TRANSFER_FUNCTION_LINEAR; + avctx->color_trc = AVCOL_TRC_LINEAR; + } else { + av_log(avctx, AV_LOG_WARNING, "Falling back on iec61966-2-1/sRGB transfer\n"); + jxl_color.transfer_function = JXL_TRANSFER_FUNCTION_SRGB; + avctx->color_trc = AVCOL_TRC_IEC61966_2_1; + } + } + /* 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; + jret = JxlDecoderSetPreferredColorProfile(ctx->decoder, &jxl_color); if (jret != JXL_DEC_SUCCESS) - av_buffer_unref(&ctx->iccp); + av_log(avctx, AV_LOG_WARNING, "Unable to set fallback color encoding\n"); } + + 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"); From patchwork Thu Jun 2 02:14:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Izen X-Patchwork-Id: 36044 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6914:b0:82:6b11:2509 with SMTP id q20csp3774912pzj; Wed, 1 Jun 2022 19:14:46 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyoKIgy/lf1mmSyUoaSGRRDvQufxjC/LJs+PSjWFG11AAsFaB6XbK05zJtRtjCDeKF9oT+K X-Received: by 2002:a17:906:c155:b0:708:21b1:dcf6 with SMTP id dp21-20020a170906c15500b0070821b1dcf6mr2197582ejc.661.1654136085833; Wed, 01 Jun 2022 19:14:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654136085; cv=none; d=google.com; s=arc-20160816; b=DS68USXa/lHX/p1w/d2V+6AXvsuiE1H1Yh9SlMpj/qp9KT9cI3wK7MtnF52Q9kYd4B PhLVphW+DxsamyK9V6h2iH8WFJXomR0fXgLWgTbEjG6lUiOsi/5O9H3pgk/bIogZL5I6 ICrMgyDNo8qdYUnYEzTJtItl76otUcRHTa3dZsCY6L+8lMuzTvPgSfZclt1PQG3sW7+3 9hVrOWXytk+E1lcNaKs66Dy9r/AWDK6xZgwTheZ88tTbkuw1z90igW4kc+VboBOWV5Pi 8R8I4rtXK4qVF9zF6tLujn30nBogrLIBX0/a3/4u3nfCFBIsfV8x2GT/7QEcuBuaAaAp t/xQ== 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=hBl5d1ABmOyHmTpEacbGVAkZ6xQiSX8SuSdTEwboUvY=; b=wvbRf/8CWShUqu7l8Bwk1YHqm9kta7IRYPvZE5R8iBImkX/752+V8jXaGL8QvSjfs/ 8laeXkUOLdMZWepDPVkBrsAen9CVXX2mN05OxbN9ZYKk/oDMecrhioCo49/ngvIUMpaw s7/x+ix+ZD0x8lZGVgnI/2VR7fYDv4czFZafVoEYzzX3f5z9wd3C/HQx2E2a+Dgn5ZLd YWYGLxec0SJdSjoEwTqynVTS1ITsloriPnniCT+j0bbhPppCCkL4IFsy/xHjeiD0KThD qRagQjs21PpzSyW7rfZB2eiAKRVe96PTQLiGf9fz2q0p7HM/TNEUgbVx4xR90kvD3gBZ 0FiQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=DmHQSjFH; 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 nc31-20020a1709071c1f00b006fedeb20701si3944844ejc.977.2022.06.01.19.14.45; Wed, 01 Jun 2022 19:14:45 -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=DmHQSjFH; 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 A562768B7DE; Thu, 2 Jun 2022 05:14:24 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f48.google.com (mail-qv1-f48.google.com [209.85.219.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C8D8068B64C for ; Thu, 2 Jun 2022 05:14:16 +0300 (EEST) Received: by mail-qv1-f48.google.com with SMTP id j3so2780520qvn.0 for ; Wed, 01 Jun 2022 19:14:16 -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=yFflkuoP9vfvqtD5vF4mvEwtjHJ5KaqfFSX286sbpDE=; b=DmHQSjFH8l63mlsY3BpLNJkBSUVhvs3SMx/Sra85mypeGk9jF1tH5W6rwqprUHgKci y5QrJHalf8OhtNzROCEn1zlFMleivYNai7bO7Nv6uNHlPrdpsc2m1ltWldSqFYLn7JmP TKaWPHbrr/ag9n1C6T/lFLUA/T4kZ29XTkuX7Qq7n6aYnkAvgqiIX7InQU1Qx122vOb+ JaAdcPy8EWyTlEsOaaZ0k0TNU7xa356O/kjH8ZzvIunRlOyCWTAdb9ibeSIhDbonw3yP eYo+F0bxeIZox57j0D475zEL5F6Loh5j1lq9q+2LG9HDh4sYcLCC8DINbNpmlAYfOnip d5Ng== 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=yFflkuoP9vfvqtD5vF4mvEwtjHJ5KaqfFSX286sbpDE=; b=0oalhpTVveJ9lxg0oGNT9YIVc/OqJFsR9IQorzxqQC7mdtYUAzW7h7O9Y1+hNnlQ5V 2FjFRc4M6uTaCkT52Opi1S8PPO9U+y4xrbyi+bS9LOdex/JO/51/ONjLm+aCuNUV5JuI AYL0W1f/ecNPdolhThdL4rEwVlEb+RdOplYTFEDNBnmtvBsnZLgHkr+ZYRaA0SrYT9oF uK605mjDcLj2a5JhN2qyBC8rUxV8v7iRBI+sN7W0MlYJ8D6OeNNKBH01XAEOwOyLOoUY DjKzEbKJr2R/KUxiMZthhPhXyez390S4fvksLmKWj5cIw9ZE+r0qslXXCsYLVmUWYycw o7Ew== X-Gm-Message-State: AOAM5305tqVCfagf4+fSNQ19zQEKikCofBemMkX/fiRal+RcfvckbOmQ OBSf/q8Yf5zSdVcUtQvtgecm5pB9PxmCMg== X-Received: by 2002:a0c:c349:0:b0:464:565f:c810 with SMTP id j9-20020a0cc349000000b00464565fc810mr13411478qvi.126.1654136055132; Wed, 01 Jun 2022 19:14:15 -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 ey19-20020a05622a4c1300b002f39b99f69esm2093738qtb.56.2022.06.01.19.14.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jun 2022 19:14:14 -0700 (PDT) From: Leo Izen To: ffmpeg-devel@ffmpeg.org Date: Wed, 1 Jun 2022 22:14:12 -0400 Message-Id: <20220602021412.58306-3-leo.izen@gmail.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220602021412.58306-1-leo.izen@gmail.com> References: <20220602021412.58306-1-leo.izen@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v8 2/2] avcodec/libjxlenc: properly read input 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: Vl4nKpimtROe Whether an ICC profile is present or not, the libjxl encoder wrapper should now properly read colorspace tags and forward them to libjxl appropriately, rather than just assume sRGB as before. It will also print warnings when colorimetric assumptions are made about the input data. --- libavcodec/libjxlenc.c | 153 +++++++++++++++++++++++++++++++++-------- 1 file changed, 123 insertions(+), 30 deletions(-) diff --git a/libavcodec/libjxlenc.c b/libavcodec/libjxlenc.c index 8bebec6aeb..1c09b69345 100644 --- a/libavcodec/libjxlenc.c +++ b/libavcodec/libjxlenc.c @@ -27,6 +27,7 @@ #include #include "libavutil/avutil.h" +#include "libavutil/csp.h" #include "libavutil/error.h" #include "libavutil/frame.h" #include "libavutil/libm.h" @@ -117,7 +118,7 @@ static int libjxl_init_jxl_encoder(AVCodecContext *avctx) return AVERROR_EXTERNAL; } - /* check for negative zero, our default */ + /* check for negative, our default */ if (ctx->distance < 0.0) { /* use ffmpeg.c -q option if passed */ if (avctx->flags & AV_CODEC_FLAG_QSCALE) @@ -133,7 +134,7 @@ static int libjxl_init_jxl_encoder(AVCodecContext *avctx) */ if (ctx->distance > 0.0 && ctx->distance < 0.01) ctx->distance = 0.01; - if (JxlEncoderOptionsSetDistance(ctx->options, ctx->distance) != JXL_ENC_SUCCESS) { + if (JxlEncoderSetFrameDistance(ctx->options, ctx->distance) != JXL_ENC_SUCCESS) { av_log(avctx, AV_LOG_ERROR, "Failed to set distance: %f\n", ctx->distance); return AVERROR_EXTERNAL; } @@ -185,6 +186,52 @@ static av_cold int libjxl_encode_init(AVCodecContext *avctx) return 0; } +/** + * Populate a JxlColorEncoding with the given enum AVColorPrimaries. + * @return < 0 upon failure, >= 0 upon success + */ +static int libjxl_populate_primaries(JxlColorEncoding *jxl_color, enum AVColorPrimaries prm) +{ + const AVColorPrimariesDesc *desc; + + switch (prm) { + case AVCOL_PRI_BT709: + jxl_color->primaries = JXL_PRIMARIES_SRGB; + jxl_color->white_point = JXL_WHITE_POINT_D65; + return 0; + case AVCOL_PRI_BT2020: + jxl_color->primaries = JXL_PRIMARIES_2100; + jxl_color->white_point = JXL_WHITE_POINT_D65; + return 0; + case AVCOL_PRI_SMPTE431: + jxl_color->primaries = JXL_PRIMARIES_P3; + jxl_color->white_point = JXL_WHITE_POINT_DCI; + return 0; + case AVCOL_PRI_SMPTE432: + jxl_color->primaries = JXL_PRIMARIES_P3; + jxl_color->white_point = JXL_WHITE_POINT_D65; + return 0; + } + + desc = av_csp_primaries_desc_from_id(prm); + if (!desc) + return AVERROR(EINVAL); + + jxl_color->primaries = JXL_PRIMARIES_CUSTOM; + jxl_color->white_point = JXL_WHITE_POINT_CUSTOM; + + jxl_color->primaries_red_xy[0] = av_q2d(desc->prim.r.x); + jxl_color->primaries_red_xy[1] = av_q2d(desc->prim.r.y); + jxl_color->primaries_green_xy[0] = av_q2d(desc->prim.g.x); + jxl_color->primaries_green_xy[1] = av_q2d(desc->prim.g.y); + jxl_color->primaries_blue_xy[0] = av_q2d(desc->prim.b.x); + jxl_color->primaries_blue_xy[1] = av_q2d(desc->prim.b.y); + jxl_color->white_point_xy[0] = av_q2d(desc->wp.x); + jxl_color->white_point_xy[1] = av_q2d(desc->wp.y); + + return 1; +} + /** * Encode an entire frame. Currently animation, is not supported by * this encoder, so this will always reinitialize a new still image @@ -223,49 +270,95 @@ static int libjxl_encode_frame(AVCodecContext *avctx, AVPacket *pkt, const AVFra info.exponent_bits_per_sample = info.bits_per_sample > 16 ? 8 : 5; info.alpha_exponent_bits = info.alpha_bits ? info.exponent_bits_per_sample : 0; jxl_fmt.data_type = info.bits_per_sample > 16 ? JXL_TYPE_FLOAT : JXL_TYPE_FLOAT16; - JxlColorEncodingSetToLinearSRGB(&jxl_color, info.num_color_channels == 1); } else { info.exponent_bits_per_sample = 0; info.alpha_exponent_bits = 0; jxl_fmt.data_type = info.bits_per_sample <= 8 ? JXL_TYPE_UINT8 : JXL_TYPE_UINT16; - JxlColorEncodingSetToSRGB(&jxl_color, info.num_color_channels == 1); } - if (info.bits_per_sample > 16 - || info.xsize > (1 << 18) || info.ysize > (1 << 18) - || (info.xsize << 4) * (info.ysize << 4) > (1 << 20)) { - /* - * must upgrade codestream to level 10, from level 5 - * the encoder will not do this automatically - */ - if (JxlEncoderSetCodestreamLevel(ctx->encoder, 10) != JXL_ENC_SUCCESS) { - av_log(avctx, AV_LOG_ERROR, "Could not upgrade JXL Codestream level.\n"); - return AVERROR_EXTERNAL; - } - } + /* JPEG XL format itself does not support limited range */ + if (avctx->color_range == AVCOL_RANGE_MPEG || + avctx->color_range == AVCOL_RANGE_UNSPECIFIED && frame->color_range == AVCOL_RANGE_MPEG) + av_log(avctx, AV_LOG_ERROR, "This encoder does not support limited (tv) range, colors will be wrong!\n"); + else if (avctx->color_range != AVCOL_RANGE_JPEG && frame->color_range != AVCOL_RANGE_JPEG) + av_log(avctx, AV_LOG_WARNING, "Unknown color range, assuming full (pc)\n"); /* bitexact lossless requires there to be no XYB transform */ info.uses_original_profile = ctx->distance == 0.0; - sd = av_frame_get_side_data(frame, AV_FRAME_DATA_ICC_PROFILE); - if (sd && sd->size && JxlEncoderSetICCProfile(ctx->encoder, sd->data, sd->size) != JXL_ENC_SUCCESS) { - av_log(avctx, AV_LOG_WARNING, "Could not set ICC Profile\n"); - } else if (info.uses_original_profile) { - /* - * the color encoding is not used if uses_original_profile is false - * this just works around a bug in libjxl 0.7.0 and lower - */ - if (JxlEncoderSetColorEncoding(ctx->encoder, &jxl_color) != JXL_ENC_SUCCESS) { - av_log(avctx, AV_LOG_ERROR, "Failed to set JxlColorEncoding\n"); - return AVERROR_EXTERNAL; - } - } - if (JxlEncoderSetBasicInfo(ctx->encoder, &info) != JXL_ENC_SUCCESS) { av_log(avctx, AV_LOG_ERROR, "Failed to set JxlBasicInfo\n"); return AVERROR_EXTERNAL; } + /* rendering intent doesn't matter here + * but libjxl will whine if we don't set it */ + jxl_color.rendering_intent = JXL_RENDERING_INTENT_RELATIVE; + + switch (avctx->color_trc && avctx->color_trc != AVCOL_TRC_UNSPECIFIED + ? avctx->color_trc : frame->color_trc) { + case AVCOL_TRC_BT709: + jxl_color.transfer_function = JXL_TRANSFER_FUNCTION_709; + break; + case AVCOL_TRC_LINEAR: + jxl_color.transfer_function = JXL_TRANSFER_FUNCTION_LINEAR; + break; + case AVCOL_TRC_IEC61966_2_1: + jxl_color.transfer_function = JXL_TRANSFER_FUNCTION_SRGB; + break; + case AVCOL_TRC_SMPTE428: + jxl_color.transfer_function = JXL_TRANSFER_FUNCTION_DCI; + break; + case AVCOL_TRC_SMPTE2084: + jxl_color.transfer_function = JXL_TRANSFER_FUNCTION_PQ; + break; + case AVCOL_TRC_ARIB_STD_B67: + jxl_color.transfer_function = JXL_TRANSFER_FUNCTION_HLG; + break; + case AVCOL_TRC_GAMMA22: + jxl_color.transfer_function = JXL_TRANSFER_FUNCTION_GAMMA; + jxl_color.gamma = 2.2; + break; + case AVCOL_TRC_GAMMA28: + jxl_color.transfer_function = JXL_TRANSFER_FUNCTION_GAMMA; + jxl_color.gamma = 2.8; + break; + default: + if (pix_desc->flags & AV_PIX_FMT_FLAG_FLOAT) { + av_log(avctx, AV_LOG_WARNING, "Unknown transfer function, assuming Linear Light\n"); + jxl_color.transfer_function = JXL_TRANSFER_FUNCTION_LINEAR; + } else { + av_log(avctx, AV_LOG_WARNING, "Unknown transfer function, assuming IEC61966-2-1/sRGB\n"); + jxl_color.transfer_function = JXL_TRANSFER_FUNCTION_SRGB; + } + } + + /* This should be implied to be honest + * but a libjxl bug makes it fail otherwise */ + if (info.num_color_channels == 1) + jxl_color.color_space = JXL_COLOR_SPACE_GRAY; + else + jxl_color.color_space = JXL_COLOR_SPACE_RGB; + + ret = libjxl_populate_primaries(&jxl_color, + avctx->color_primaries && avctx->color_primaries != AVCOL_PRI_UNSPECIFIED + ? avctx->color_primaries : frame->color_primaries); + if (ret < 0) + return ret; + + sd = av_frame_get_side_data(frame, AV_FRAME_DATA_ICC_PROFILE); + if (sd && sd->size && JxlEncoderSetICCProfile(ctx->encoder, sd->data, sd->size) != JXL_ENC_SUCCESS) + av_log(avctx, AV_LOG_WARNING, "Could not set ICC Profile\n"); + if (JxlEncoderSetColorEncoding(ctx->encoder, &jxl_color) != JXL_ENC_SUCCESS) + av_log(avctx, AV_LOG_WARNING, "Failed to set JxlColorEncoding\n"); + + /* depending on basic info, level 10 might + * be required instead of level 5 */ + if (JxlEncoderGetRequiredCodestreamLevel(ctx->encoder) > 5) { + if (JxlEncoderSetCodestreamLevel(ctx->encoder, 10) != JXL_ENC_SUCCESS) + av_log(avctx, AV_LOG_WARNING, "Could not increase codestream level\n"); + } + jxl_fmt.endianness = JXL_NATIVE_ENDIAN; jxl_fmt.align = frame->linesize[0];