From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 6633B49472 for ; Sun, 11 Feb 2024 17:03:41 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 96DBD68D081; Sun, 11 Feb 2024 19:03:31 +0200 (EET) 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-Google-Smtp-Source: AGHT+IFGobPLZof0wZ8pZHq2qWM7E4UNStTeMpVVHXiq19lBVwM+qHlK6Wj/BLZlN58aMjcjap/ftw== 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: 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, \ -- 2.43.0 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".