From patchwork Tue Apr 4 14:18:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Izen X-Patchwork-Id: 40982 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4645:b0:e3:3194:9d20 with SMTP id eb5csp3613297pzb; Tue, 4 Apr 2023 07:18:52 -0700 (PDT) X-Google-Smtp-Source: AKy350Zo24V1TXgnWYGRV4j7DpPwc/Nzj3c+bjyh3OcUYwJ5X+DhAEHso/YQ/v9u1ZgwiVTloGtD X-Received: by 2002:aa7:d701:0:b0:4fb:6357:f393 with SMTP id t1-20020aa7d701000000b004fb6357f393mr2783163edq.1.1680617932267; Tue, 04 Apr 2023 07:18:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680617932; cv=none; d=google.com; s=arc-20160816; b=Up24DjbpeETTE8T4WxRzXpOWwI6s2H+e+/EMiLUnnyxNgkQ4u0fmbZkVYJ0+ObPPrE guMVt889jMIpdHD/Iamnfl3L4H9mXfyGM3bq1gC7lXpFb4HNnk1L84HZ0/b5ndEvRu5V z99YFzsTL7WpGoEb+xNkJJbCOcXzjco+nJbjnQ0BdHd0kcm/wTY638toUP8sCyBPA/dr 0ATPLPhL6prBJJE7hhJuTN31O7ty0kEEVAwbTe05kSJlwjzl2MpTeQFYnaAb4hQag1Tm +mjYl/Gup1ocelFn+B9auzHN6uD24upeococgDqhqe6YtrEMUYl7kQ4aehSwD7vIOMPF TfCw== 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:message-id:date:to:from :dkim-signature:delivered-to; bh=4bI4A+IdJGka/rpQoXVtsoTZ34ABZYWMi99wfJ5XlLc=; b=KrBpcDKregggVGntCc4Xu9W3xf883MGxiYBVEKDvMvW/dLc2HDlLuxowR/5KqZ19+7 oQDheHeK1oOir7JDgZMLCwSnjG6UE6JNCD8dDsBxYfrUZsD57BNdr+Z2PlfokzEawezR reYX1zs8UuSZXMs/7JkyCoQKsDtDuyC/eoPgvrInbap3gV0LutqGufLupIIlSjHXxgVH BSvAZ9ev2YdaSA66R3NeRFeQplKfBp8N6NvwMt84BRf/pgbasKSsmM6QZtq148ZilZ7J g3QQIweNDLpM9PuU9basokjYhDgJmcjKesKu9Gmx9OjrdvlnlBATWOQuxtXIs2eo46r6 RsmA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=EltcbLhg; 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 v9-20020aa7d649000000b004af6a815065si948810edr.592.2023.04.04.07.18.51; Tue, 04 Apr 2023 07:18:52 -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=EltcbLhg; 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 8598D68B274; Tue, 4 Apr 2023 17:18:44 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-yw1-f181.google.com (mail-yw1-f181.google.com [209.85.128.181]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EE9DD68ADC2 for ; Tue, 4 Apr 2023 17:18:37 +0300 (EEST) Received: by mail-yw1-f181.google.com with SMTP id 00721157ae682-54606036bb3so450712117b3.6 for ; Tue, 04 Apr 2023 07:18:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1680617916; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=ZZ246HLY7HV//19RYkSSh7g/CAWlHhSVCKJxcls5ay0=; b=EltcbLhgz9rECM7nHeaP/FYG9homCUb/x1s5uKgVe9sjzfK8I4j13pip7/KhqDAZv6 sa8PDo3VZ3WpT4XlLM9Vg8Kd+X139B8YvbISQsBeidKFH78pY81bvB4s1z8kjZmBDRdm TRAs8Ip3M6YFltNaFtJ8RgqElGAzgqD9kyQPxoKvbjPolsKcUn5XTKh77N4aVGG5zSYg PhRkFQ8t/A2j+hE2k8wyrjUbHM+PxNOhR6Opt8y1qt4wi1O97c3Mi9PsZAV9ZzBVmWxU kGoX6OVIFNgWCV2GTVf7c66IJp3xApwk1mlOfB5WzUOTWuJ+Nar3sjbG+uiCpUUnb+VQ Og1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680617916; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=ZZ246HLY7HV//19RYkSSh7g/CAWlHhSVCKJxcls5ay0=; b=rI9homEjy8uSzA/nsELJ6tSo4Du/hvrVX0cX457E4ywrtyeNTWDy6NQcM5wF/BdKXQ dbhmMJR3R/EChs8K5Uhcx8Zi9xR0R8G61miTZcZZdCzbDX+Qbke94VfcBha0rr01DezX 6r3Vzcqgl053OKlNuQVwfw6gHVSduNg4pCSJ6vbKtXgVn0Dtu087PzdQPpETK/qLOMLb tXwxi6mnrHn/n6YrkeUjaPCW36oiRwikRVw0gTIVjq7D4gTTbWjmUAg+4HZV3Wz3hTHQ AOuAF1J3e6fYQNj2HojAGd33iQ/eRdndjQL/Gsjfe20m6KRxlpBDhKgNHigpkOpoVlMw gjcQ== X-Gm-Message-State: AAQBX9fcQI9b0/Bt8+sTWhRZYpztv7uJFNyEh5qUS1tH6TAnC4gi3n3e GBP8m2dfZSA7XwTXRrPLnPaMyXhrd58= X-Received: by 2002:a81:acd:0:b0:544:b85e:ea9d with SMTP id 196-20020a810acd000000b00544b85eea9dmr2435167ywk.1.1680617916295; Tue, 04 Apr 2023 07:18:36 -0700 (PDT) Received: from gauss.local (c-98-224-219-15.hsd1.mi.comcast.net. [98.224.219.15]) by smtp.gmail.com with ESMTPSA id bq10-20020a05690c060a00b00545ac8682e0sm3221694ywb.103.2023.04.04.07.18.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Apr 2023 07:18:35 -0700 (PDT) From: Leo Izen To: ffmpeg-devel@ffmpeg.org Date: Tue, 4 Apr 2023 10:18:31 -0400 Message-Id: <20230404141831.51853-1-leo.izen@gmail.com> X-Mailer: git-send-email 2.40.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/libjxlenc: use reciprocol gamma for GAMMA22 and GAMMA28 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: PQwJcfYtcib0 libjxl rejects JxlColorEncoding->gamma 2.2f or 2.8f and expects 0.45455f or 0.35714f, respectively. Signed-off-by: Leo Izen --- libavcodec/libjxlenc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/libjxlenc.c b/libavcodec/libjxlenc.c index 897452f575..82dfe189d6 100644 --- a/libavcodec/libjxlenc.c +++ b/libavcodec/libjxlenc.c @@ -335,11 +335,11 @@ static int libjxl_encode_frame(AVCodecContext *avctx, AVPacket *pkt, const AVFra break; case AVCOL_TRC_GAMMA22: jxl_color.transfer_function = JXL_TRANSFER_FUNCTION_GAMMA; - jxl_color.gamma = 2.2; + jxl_color.gamma = 0.45455; break; case AVCOL_TRC_GAMMA28: jxl_color.transfer_function = JXL_TRANSFER_FUNCTION_GAMMA; - jxl_color.gamma = 2.8; + jxl_color.gamma = 0.35714; break; default: if (pix_desc->flags & AV_PIX_FMT_FLAG_FLOAT) {