From patchwork Wed May 4 12:36: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: 35582 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a885:b0:7f:4be2:bd17 with SMTP id ca5csp415389pzb; Wed, 4 May 2022 05:37:08 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx+wrKNBjbGbcqRx3eFQQY9TI129BkQyWhqjSf++ZcGPydkLF1Q3B1cKwrekyDAkfKekVLz X-Received: by 2002:a17:906:1be1:b0:6ce:b0a8:17d with SMTP id t1-20020a1709061be100b006ceb0a8017dmr20174136ejg.413.1651667828537; Wed, 04 May 2022 05:37:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1651667828; cv=none; d=google.com; s=arc-20160816; b=DKQ0G9mpEYK07Q26NysPycGP4+UJ3KKA4EaiTxH5yE8iLXDOqJWmHqO57EQJrAfsBp JUq/+KuR+CY6P2MJ8A03cHr7VW0S0IB9sFIMa/7NEgvePeHKPntZhFOPJtrpI/Ep9c2R NCQ1YFB3fGCRsbP2Ypvw9V8juF+geOE02sunNQ8DXCP0JmrCyb5kJfGIdX/Fmc4pasau oF/8nTVo6UAWdmuWeSc12E+4HFV8cKsvC1JN7pdrWUM4REO0tCAuDl81f/Gvx30TL955 27AalRW7M9RhYYJOKwvMpzLxO4Cyjlj5u4i6RFw+KLyP8hV67Cz/tpikkMrBeoST5fBT 9TVA== 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=kVeQWEzcbzNgstgh/NOxsvrfYvkat+ndVRAifVbPzhE=; b=fWmp9tSn5n254Ol4lDilW6o83YezPihI4D0HLSM2+qP65RPSX4bSHtDdoNAyEwjvBe YXHwrBtJ3YdZXkWeP41p3j0beKOZUFDPO2Q0fHw/NH553kIWy4Jzq542RCzLUZu6M3uy JnV6bufyMDnnPUTTrfcoIxYVAEXjqh2VEcBGx0/jCqQu++fycAaN827YlXzbe71PtD9r 61TI5Q3C2k+xS3JkpZXUqI9yCuwV0PD8n6DyWDOluFtvfHrgL4JQGa6rgkqfySH8blMe RM+7yxBkf7mP17k53ZcBy/054ETM6ghoH7PAY/O8Me7IWVzMH7ZlnSA7Vad8Stz7B51r ZCSA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=iuMV0Vmo; 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 u12-20020a170906124c00b006e89c2d0609si15443514eja.68.2022.05.04.05.37.08; Wed, 04 May 2022 05:37: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=iuMV0Vmo; 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 3E4FE68B2F7; Wed, 4 May 2022 15:36:56 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-il1-f180.google.com (mail-il1-f180.google.com [209.85.166.180]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1521D68B2EF for ; Wed, 4 May 2022 15:36:49 +0300 (EEST) Received: by mail-il1-f180.google.com with SMTP id y16so763454ilc.7 for ; Wed, 04 May 2022 05:36:49 -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=tMM71/vl1DOnrftQ8b3MtUn+JWB82eZfffQqOerpTvA=; b=iuMV0Vmo3Yq60PdTgASJiWb/ukIXmH230IejJGyXbIuG5Vi1BsfnG2gxXGB6Ge4CXs FcOW3EPmN2uyr48Kz0FLh488BCmWya4F58urxJnu7SaPieKLDP2m1NcPDYu5ys8FWa6A /dk/x1DgGRwN7mkWuUdlEwAheueqqnWw86TpujRTkV3a05zY0XzJ3EUOWRo+DpbqIeGx hJTghTP76zd4EshCCbLclrQx5dxq+O2DrUzawFZzSxDXLyBYaiZqZL6Hf+BsK+0PEwow ZK5LTxQDNfTCQrP0YaM6tg3ShwZULtXMJbpD4cYwGP5uS2MlOe9gaxfJHLtgYYVpkvGQ oMmg== 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=tMM71/vl1DOnrftQ8b3MtUn+JWB82eZfffQqOerpTvA=; b=dPmP24TSa1WknrhCIYUwwHjSX2WQzFAXpCSxcJyePXFU4LNYSSQP3a6P1qmbifX2// GPs2AhonimWdE1lfvqr/zSuxmd1UYyNcXckkcty6wmCsxiYjeZ3QWSCqqBuG03nVoUi0 KtnvYCTQBKcwbeIcWFcfH0zF8e/GLnd3H7MrV3uCrTDi0+3wUtLws8qd7nzdc0Clr29N U3XMi3EukZnekq6qF5f9qkv9nxwaoaCd8od4M0tIMIffyc/QDcZl4dmxscVLkVK9jcp7 0oy0fccssIdxNaIC4MhqfdZA7K42oyvPxxfA8HUyd7qeJ3YLY29rUwrbMipTN38aseuz x2+Q== X-Gm-Message-State: AOAM533pyDr+4huV2zkirjzJgesscSDmNYa3l0uCLMyb0ptmmT37N656 R8ULKFvBrssLFtllhgqmhkyl77JAHik= X-Received: by 2002:a92:ca0a:0:b0:2cf:4d8e:de17 with SMTP id j10-20020a92ca0a000000b002cf4d8ede17mr998762ils.146.1651667807518; Wed, 04 May 2022 05:36:47 -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 x18-20020a056638027200b0032b3a781758sm4660371jaq.28.2022.05.04.05.36.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 May 2022 05:36:47 -0700 (PDT) From: Leo Izen To: ffmpeg-devel@ffmpeg.org Date: Wed, 4 May 2022 08:36:11 -0400 Message-Id: <20220504123612.174661-2-leo.izen@gmail.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220504123612.174661-1-leo.izen@gmail.com> References: <20220504123612.174661-1-leo.izen@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 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: vqobiFbQJmRn 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..823d24648f 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_pixfmt.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");