From patchwork Tue May 3 16:56:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Izen X-Patchwork-Id: 35580 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a885:b0:7f:4be2:bd17 with SMTP id ca5csp518641pzb; Tue, 3 May 2022 09:57:51 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzegCgj/TeKmli8EipR1K8RUasPO6RyMB12PD+7Jo5R4nzZhTkVkR5SzmZwFL0VwEvBQUwv X-Received: by 2002:a05:6402:2204:b0:426:34f1:1d2d with SMTP id cq4-20020a056402220400b0042634f11d2dmr18820369edb.335.1651597071375; Tue, 03 May 2022 09:57:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1651597071; cv=none; d=google.com; s=arc-20160816; b=bpWlIwqf2CxRqVgtha0MnWZ9XsHcnU85TnaGQ/6dOmtZ2D3QE/j9wjYvkSJ2FCcI7l fVpfUGvUYSNMsNmB2UMV0zDltzPaILripF/RYvIERmK6Dot84YF3XwFf/JaQP/XL8TP/ wiU0xSFjM22OI0iqph4xuuD/VC1+mNqexP4fPANhCnbSFqcNvpQCA7jWZQtpxcs0zhD+ G/4cJ1duR+xdFv39fBCVdm9cwlJH2TwI3WY7BRjx9PwRuPClhYmwEpLaP3uC34OlFR90 iEeuyt3cP1hEG4Yzze/L0dSKZgEDH9H+4PWKbiSxeJkcL14Iwh5DG/1NBSG0sCl7MilL auBA== 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=RO+Miow/RMzg8W906v+KcHQhNzlmuYV9PcUMuKzVC84=; b=EHbeiuXtJRGVGkGK7WpJUTlMk+NaP0yxMksyRk1vtRScwW8KvHDKVhweJgU9/u+uKJ yWEk//XCICWCEmalRvFO9OO+ujwFCXFmPPKLbMxMxdgplvNK/y7b8O1OXEuV5mPcsbLO ZaG/Z8c/eSMb/yMhzNF0GeXMX/ibNmYDKOPQTwDK/6tJyJUL40Rx6embvbNJrEeYozmT UHIcQGZPf7LWqBVeyjVXjqEc6jtDD3vU4MPgtsRHcm1VkDYfT5ULEHBRt18WBb3ioTP1 V7ap0th9nlAbwlGJPXSqZ9kz5mLjSFiv8d3gYG5WNjozmRM0Q5xNim54iJSyzaUjgg+R FIaQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=EgrsqE4N; 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 n19-20020a1709065e1300b006f39657d6c2si14210169eju.783.2022.05.03.09.57.31; Tue, 03 May 2022 09:57:51 -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=EgrsqE4N; 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 7577C68B322; Tue, 3 May 2022 19:57:09 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-il1-f176.google.com (mail-il1-f176.google.com [209.85.166.176]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8EB4768AC91 for ; Tue, 3 May 2022 19:57:02 +0300 (EEST) Received: by mail-il1-f176.google.com with SMTP id t4so10120279ilo.12 for ; Tue, 03 May 2022 09:57:02 -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=lDo3pzAMhpJjTfOXbToFBi6t+9MTpKwoXdTsD9XieIs=; b=EgrsqE4NgPkkPCYtMPLvT04fzPlvEeX/7v3yG4pKMo1MsY0oEj4YbW4zzL5XrxgiIl hVx7b9ATSkHaGswsxOPUBZyfz0v/0QcAT3y5tNbDLuTM2nYOZ7p7AfnkG4TWyC/Jl/Rn 7nQ/5nKwEZPWfLmQVNBUnnnOh6kcKz0yMuHgRJDH64wLqB5oRckdiBujoM0NfpDLnlv7 vb1Kjok7ehxLnLS77agzBu/u7NcH75oAyjUR9fDUejtwlMgJpjnCu3KzDi3Qvd6bm90u VmGTj2xbOtNlrWSOiVAvtcohRmnD9aO7d1cUATNyc5ItTQyak0O4n14vz9eb/e77BpSt 8Vbw== 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=lDo3pzAMhpJjTfOXbToFBi6t+9MTpKwoXdTsD9XieIs=; b=HQ9fnDDhUsoG/Ayas1hDUf+Dr7kDIn3TjageTtJyr7JnduEqtJlwz2Dma+lbhd5MtY qvGSn+Ofx1eZquEk9gqDXad/Mm+LommcqTH146BFvsu9YGyY9r89T0bcx8qvH4HWSJSg 5/Z6yjnlP5tnG721Olhe8IWWCAeKzq26daCHVantrF5unfOc735srLIUlAX0yCEqGjZU QDcj0Czr1JPoEuwxmYglEJTFWN4lS5AdrtrlVDeZnZXr/mu5zi4GabO6MbBBxayZJAYX Tmx2OlwnUREZuRkW4Yv7e/1hI2W5Ymo7XjdAIyqzJ8cQhv82X5UoWTKPD/+RdYTIfN3/ hBHg== X-Gm-Message-State: AOAM5328dLowJRx4S6a6it20zC6Z6stuJ94SsF5afx5OnIujY/k3FPa2 hB+jstgvWZuqeah++B3UMLbX+c9VJLU= X-Received: by 2002:a05:6e02:1bef:b0:2cc:5948:f432 with SMTP id y15-20020a056e021bef00b002cc5948f432mr6863827ilv.183.1651597020759; Tue, 03 May 2022 09:57:00 -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 y16-20020a056e020f5000b002cde6e352d9sm3578815ilj.35.2022.05.03.09.57.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 May 2022 09:57:00 -0700 (PDT) From: Leo Izen To: ffmpeg-devel@ffmpeg.org Date: Tue, 3 May 2022 12:56:37 -0400 Message-Id: <20220503165638.138718-2-leo.izen@gmail.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220503165638.138718-1-leo.izen@gmail.com> References: <20220503165638.138718-1-leo.izen@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 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: UFhkMO+EJ0Ct 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 | 84 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 81 insertions(+), 3 deletions(-) diff --git a/libavcodec/libjxldec.c b/libavcodec/libjxldec.c index cd4bca3343..e6a46288a6 100644 --- a/libavcodec/libjxldec.c +++ b/libavcodec/libjxldec.c @@ -189,16 +189,94 @@ 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: + avctx->color_primaries = AVCOL_PRI_BT2020; + break; + case JXL_PRIMARIES_P3: + avctx->color_primaries = AVCOL_PRI_SMPTE431; + break; + case JXL_PRIMARIES_CUSTOM: + av_log(avctx, AV_LOG_WARNING, "Custom primaries are unsupported\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: + 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");