From patchwork Sun Feb 11 17:03:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Izen X-Patchwork-Id: 46183 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9002:b0:19e:cdac:8cce with SMTP id d2csp267945pzc; Sun, 11 Feb 2024 09:03:45 -0800 (PST) X-Google-Smtp-Source: AGHT+IFaPgWiMKDdQNAyzOScb1pTHSra9zdq+roisql1LiF1HNhGyP/5neWwc+e+DtMGbtNX/0zP X-Received: by 2002:ac2:5a5e:0:b0:511:48fa:5c5a with SMTP id r30-20020ac25a5e000000b0051148fa5c5amr2763658lfn.16.1707671025370; Sun, 11 Feb 2024 09:03:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1707671025; cv=none; d=google.com; s=arc-20160816; b=JRmNN1qd2mS8ZHjDrA+nvDRbyJwkPT+moaEw4zCCbJ0qr3KiEw1ZM2Mv28ISi1Y7/h W3lFcs61Snram8fnqM8EtVgRbmkmTDGUM/0MM+miJ0T+Ur0mYMPVzG9d6mzxvsiPvtFN i67dqJnvgaeVf+ZB1FPdGIHvYgWvIn68kMeH1FCpacvtVIFBs/icAiuRP+LViyGawSCM q/cLgYuJWHN+K4hcorhcQyKrwAPYgB6LublYnqRrOKo9CyRVLD4ep3rRbTjz0qdR3aii qWwOuGm3/dE5yO/yLwhkqJv/fMgy5J464pS6y8L7+Hs+ge2HlvjBNNAXk4R0rEussfOP dbtQ== 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=ic9wYSv2GS+WdiZzf1VAPcpqeNMHsLoAK/cbyRONFR8=; fh=ZB0NuCHfzTd9+OuWa4SWSuAfIyW1H1LmCsLiFA0tV6w=; b=usOurY9cvsZX7VER/KwGF+YfL9hsIOfwix2T3+JYphoAjEO0Pw41qFLddjXQ0pf15K 5iMBuEMcsakSPdiOKQfXjKwgo/5S5XDQH9rxl5i7FKa79TmVMKI81AqWKKCCIs09JBf+ N1+uA+sryzuvcqGMWARytX/hCeCrwkHL4VIRs7D94bx4oYoBACxC2DogZvTohYwx2Av1 XsxoldgnDlDe/5YikfM1EUjQCbXRu93g5MEJyUudlI7JIpAlLA1LCzFxpgJJVu6Y5C4y gb02F48mFQbFhpt8p57e2mZ6gmw0hWQutdSQ0fY/VIJvYLgtf681Gt5vHD1ZajvXOR1S rnoA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=RNRCsX6L; 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 X-Forwarded-Encrypted: i=1; AJvYcCVKOTbGipZUF3zRMdQYb924Owja2w5aeUO62rCR2zfg6UlZnw/jxjRTY60ZIDwM+Yfj9JrcFnK1jhHSCk7OOcfxP47TO3Fde4VTk3JsbvEjGE6Y0ioqC4Ng4QRzW8U+GXn3X4QAtQqRYZV66EQC7vC0p9AqDIlpMQWf1hRT0ti5flnNcF7fWFRPVGQdMEk+VBsgiepz5fTm+y8YgMQckDmN3n1KlYe5WqW59XVJOz/FoD0qK8qNNOIB+2UHE5b5ljwvtq/B3RsWmmAIKPhplxoenVtZAtD1XJLLlrz+8aee871IC8Z5xOgMeYY+RAW3uIggBX4fVhcySezV11UHnVMugCMJ4x0gag4EDjvcavr1nSzIZc3zjKguqaG8t+CzrR/i08d4oVJUBsvkfsSp9Dbr4xpUfRYdmQzonULnT/+9RtxmJeipRbEFJ23ILetW4Ft55NO/whD132TSuRJCvMKdo4/3ZBIiDekuhGHNDY2PUPihlx1ozsrtDuZ3UYJqFwZZk4KSWi8tizubziF+5TqScPQeiwJRKcIVMxWGiMv7DMqXJnrWmkA8s1C98vOj5ApNF8ebVpi7YurwPwGGgrK08UhCKXv0tfIhdKDA9GUVmCVIWOcc89Psftmmx30QSfZlF+Qor1we8j5dCCAKnTisZmW5AWEsa7pGJCcBwUBMQ5ccg3PrTEvYE6c8uJsS/5fynFzw/dGvvef7Uo1xLBmLbGkYV+7OQEcx9jpd7jO5tkIN7OlwtPys5pQG+0kUwlPvfr52StjBAqE8Hl24fu6seNM8sTpau7vQAcM/xESZfAqE9G4IjFxyR29kTcBYs4Gx9v0iZRL3TwmRRcuJHkD95iSJlq9XSBtHEanNly3GK5jrIOSnQjjOhxS57Ydzf57bJrQQdTKUYghRWeYaC4twuk9mrAlw7wv99xyCjGyjCsXy6yIIKKuAB2QPRzKzSNHXVx 7Acp1GbMTY5AsjwlMHxBF1q4cpGi/3BO3vuvu8RLi3jOf7xCkJY7MAJ/wMyN030n0ebVCtbxjwOGGh88QU+vq3eMcrripp/mVT/olKprjArTlcVhdVl6heBAm98q6e634bYE337zaJ2oESfYlJ3beqSiU8X5/ACYCmgH6E7A5mb/KHP6rIEuIUipONuyD+7Ow3IGbY+mpCTYkG2PHrjXpiYyqWyuO0nkncqB5CwOQSP1/NjYbSfT+zaRf7LoQYIRDyqPFehU2e8LIHAPyI2NwmPMQX4J2gTPx7vHQH8qKINRlUe8r7ziTb9saoey3VxHg2FzFqA/5WNUftDG1UtlgyqdHOSmd8CyD+YqLbxzm6wZBa1N0TAUCbevUdoW/WXNV3aaBXl+8sF6Mt4woGv3IPr6BYiq8rI+gWLEI4dSvA2+CH1qwPK0qi9agpxuuWbW17I2yikZjEyN3UDuMrVGTkAEGuGEPFYvSiNO9rfYreqgnfxEr/B+0NJ85a9/qfvpq5Gz7ASmD/2PzgLWh1PFv82oumneINNLgDACXiSpJwyq301XNKt6mLu7uYdlLV31ktJlLm8jtkf1nSDCv2e09iZw7DIPlrtrf1zA== Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id p25-20020a170906229900b00a376273ccf3si3068702eja.988.2024.02.11.09.03.43; Sun, 11 Feb 2024 09:03:45 -0800 (PST) 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=20230601 header.b=RNRCsX6L; 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 D8E5168D085; Sun, 11 Feb 2024 19:03:31 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f181.google.com (mail-qk1-f181.google.com [209.85.222.181]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B3B9968CD10 for ; Sun, 11 Feb 2024 19:03:23 +0200 (EET) Received: by mail-qk1-f181.google.com with SMTP id af79cd13be357-7853e4d3cddso46465285a.1 for ; Sun, 11 Feb 2024 09:03:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1707671002; x=1708275802; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=l4p8Wp/Pqyb/PI7mxPmKkYXXxC2CdOJq3pugSfrE75M=; b=RNRCsX6Lh1l4RFZRRNqbEeae4ccaoYOD39Iy8W1aihbav0PBDn5Pee5+q/fAJZ/2rs V2UnS8WTG6zIde1tBLthiyxlyV4XS0WMTIRr+bWSa9gketCBSojex/sUuaPJTAxlnYAR kwbm6oRITRTLNH3wdl1CoHVVbsN6qDpnU4RYS+rtlu24khLUqiltL/GYpjNKoTe2Umss 5fiYfOgtq6x+ZUKZCdrIQskaov5/IPp6oBB5r+d4IZ3DUq4C3fpVk52q8tar982j4qCS aE+nkaGSxAltaLt9DhGYi7e47v6WvbeJkuhTDR+B40GwTom6UUrwI5slatJq5uAHTlaL hDXQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707671002; x=1708275802; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=l4p8Wp/Pqyb/PI7mxPmKkYXXxC2CdOJq3pugSfrE75M=; b=xU1v4g2IGyL624ZnyJ+7T3AEdUamx+njlHlYUCYcb4fPpD8Hs3H89BeU4hJObcaVJl /8+ykDTqYVjFcGnhqJ9prfo4yaK7RSgt7CckzgEXku3rZHAEtLA/o/lerlFNITDrb2b8 zSOmwB1AtiPXymrjaMSK0VI5TIHg/+/kKmz6jQt2QQZCymPrQcUsEvAaYAAxQXaQo1PQ Ctfr3bo1wEAHk03xug1yoqgpPA9oR/EGxJYdKZXKjH+w616BKqkvFkbb5lJSypDz2I0i 5SCo+INJo4koSeBQQpKK3Rkay6G8WiamUxowVxwGGA+dJrr4XFFw0EMXHxT2Nn1w5wV2 9f2A== X-Gm-Message-State: AOJu0YzIQtTUZaYI+v0rAIMpglb61acv8YuoTPo84xaETCJYwXet+Ta1 olhRw+M9VG8r5PzfQ4Gwge2hnGG5QfUq7lzlA5BPxeNHW6lbZUPoPRimacFB X-Received: by 2002:ad4:5d4e:0:b0:68c:cda4:a244 with SMTP id jk14-20020ad45d4e000000b0068ccda4a244mr6439785qvb.1.1707671002074; Sun, 11 Feb 2024 09:03:22 -0800 (PST) Received: from gauss.local (c-68-56-149-176.hsd1.mi.comcast.net. [68.56.149.176]) by smtp.gmail.com with ESMTPSA id oi10-20020a05621443ca00b0068ce676eb4dsm1638103qvb.69.2024.02.11.09.03.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 Feb 2024 09:03:21 -0800 (PST) From: Leo Izen To: ffmpeg-devel@ffmpeg.org Date: Sun, 11 Feb 2024 12:03:19 -0500 Message-ID: <20240211170319.45757-2-leo.izen@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240211170319.45757-1-leo.izen@gmail.com> References: <20240211170319.45757-1-leo.izen@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 1/1] avcodec/libjxlenc: add option to disable xyb encoding 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: NDyy3P6uReBj Add an AVOption to the libjxl encoder wrapper, which exposes the flag uses_original_profile in libjxl. For highly unusual ICC profiles where the target needs to stay in the original space, this can be useful. Signed-off-by: Leo Izen --- libavcodec/libjxlenc.c | 5 ++++- libavcodec/version.h | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/libavcodec/libjxlenc.c b/libavcodec/libjxlenc.c index 5f5f9751dc..3f2c74097d 100644 --- a/libavcodec/libjxlenc.c +++ b/libavcodec/libjxlenc.c @@ -52,6 +52,7 @@ typedef struct LibJxlEncodeContext { int effort; float distance; int modular; + int xyb; uint8_t *buffer; size_t buffer_size; } LibJxlEncodeContext; @@ -303,7 +304,7 @@ static int libjxl_encode_frame(AVCodecContext *avctx, AVPacket *pkt, const AVFra 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; + info.uses_original_profile = ctx->distance == 0.0 || !ctx->xyb; info.orientation = frame->linesize[0] >= 0 ? JXL_ORIENT_IDENTITY : JXL_ORIENT_FLIP_VERTICAL; if (JxlEncoderSetBasicInfo(ctx->encoder, &info) != JXL_ENC_SUCCESS) { @@ -474,6 +475,8 @@ static const AVOption libjxl_encode_options[] = { { "distance", "Maximum Butteraugli distance (quality setting, " "lower = better, zero = lossless, default 1.0)", OFFSET(distance), AV_OPT_TYPE_FLOAT, { .dbl = -1.0 }, -1.0, 15.0, VE }, { "modular", "Force modular mode", OFFSET(modular), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, VE }, + { "xyb", "Use XYB-encoding for lossy images", OFFSET(xyb), + AV_OPT_TYPE_INT, { .i64 = 1 }, 0, 1, VE }, { NULL }, }; diff --git a/libavcodec/version.h b/libavcodec/version.h index f2f14eaed1..ecdbc51c74 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -30,7 +30,7 @@ #include "version_major.h" #define LIBAVCODEC_VERSION_MINOR 39 -#define LIBAVCODEC_VERSION_MICRO 100 +#define LIBAVCODEC_VERSION_MICRO 101 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \