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 6CA3A48EE2 for ; Mon, 29 Jan 2024 22:51:04 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 80DA368D280; Tue, 30 Jan 2024 00:51:01 +0200 (EET) Received: from mail-vs1-f43.google.com (mail-vs1-f43.google.com [209.85.217.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CFFA668D233 for ; Tue, 30 Jan 2024 00:50:54 +0200 (EET) Received: by mail-vs1-f43.google.com with SMTP id ada2fe7eead31-46b1ea908c8so87198137.0 for ; Mon, 29 Jan 2024 14:50:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1706568653; x=1707173453; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=ZRbRzaQYFByX4Eo9AN8mxvLgxuw+MJ+FsEf4A0GO3fA=; b=aSZwtixiUqy8iSw+QcEDTT8dF8ZDdBOzFwNTUZm2J1tXDqUkvmICRmmcvEwgg/koBq s4Fp4ZzX2L/P8Rm1XgAKc0tNd+mc5Z7oLUI5Zp8jMhb9zHl8yztI8VyfdvpwPXBK9E4I Z3dM9/z0iqyQadukir1eqO5DjAWQe54G7vgfwwBsQaor5jffDXi+gTx6bKd5+Qq/Ut+D gUrKFyoraooP64w9y2iye5rcn9DXU3Wqwq9O/nz+91xA5HOMrZ63l1+olZwehAkqeLpr tz+tQqBldkF9HsNHaeFgtyrGBjrhwNv9VxtQH5Na9qClDg6SJKQdm01Br1HnzlltzW+b OFwA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706568653; x=1707173453; 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=ZRbRzaQYFByX4Eo9AN8mxvLgxuw+MJ+FsEf4A0GO3fA=; b=V8VGXVpE8neOS36ChpjBw+N8VHQAdOZjSOLICyw9k/5qJwbuhxumxhXGH3HaW3JCtd 78hh+19HYTaRpAYYtAwjbD9OoCfhyFUDtFcyuKKDHZKSu6sTKroN31vWi6sZWcMFJtzg l4oIDPiVh36dZqRkJL3r+pXNxBFSrHglaouD9i+TceClejyqIzOvX5cD47Nbf1SZJU9e V5rmktzCu0gxouz21hbC6CC7hm2+JXkhmhWuLNr446oII2H2IlEdxEcPXQZLXZmwfbwI x95GqBq7Mw1rVowJGL8cHweusBxZUSrCwVp5n5sacTm9N/iW2CWcgiH717qftKEk/4kC 335Q== X-Gm-Message-State: AOJu0Yxyhs3T7P2h2L+ftCqvv84vdo9c4QGsaOAdj+tP/VwapEPmvtaJ hSb8+CTD1yLN8hfdOot6McOObsVElk/OlLn1ivbNgTQsA/g7ZjM1ONq35qbE X-Google-Smtp-Source: AGHT+IHjkdxN58nGQSdnzFnfH86P/Zjp5Z/JOkzRQSCxwV/nZLdq7mCZecJYjgzpFRZ9uYEW322CUA== X-Received: by 2002:a67:fd52:0:b0:46b:1494:ceb3 with SMTP id g18-20020a67fd52000000b0046b1494ceb3mr4592087vsr.0.1706568652795; Mon, 29 Jan 2024 14:50:52 -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 oi4-20020a05621443c400b0068c53c8b50csm946992qvb.4.2024.01.29.14.50.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Jan 2024 14:50:52 -0800 (PST) From: Leo Izen To: ffmpeg-devel@ffmpeg.org Date: Mon, 29 Jan 2024 17:50:50 -0500 Message-ID: <20240129225050.18436-1-leo.izen@gmail.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] 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 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavcodec/libjxlenc.c b/libavcodec/libjxlenc.c index 67be8a01ca..5541fc2bb3 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; @@ -302,7 +303,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; if (JxlEncoderSetBasicInfo(ctx->encoder, &info) != JXL_ENC_SUCCESS) { av_log(avctx, AV_LOG_ERROR, "Failed to set JxlBasicInfo\n"); @@ -466,6 +467,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 }, }; -- 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".