From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id CA2434004C for ; Tue, 19 Aug 2025 14:12:57 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 2C62968D506; Tue, 19 Aug 2025 17:12:53 +0300 (EEST) Received: from mail-qv1-f74.google.com (mail-qv1-f74.google.com [209.85.219.74]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 2063068BB78 for ; Tue, 19 Aug 2025 17:12:46 +0300 (EEST) Received: by mail-qv1-f74.google.com with SMTP id 6a1803df08f44-70a8b32a6e3so107931966d6.1 for ; Tue, 19 Aug 2025 07:12:46 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755612765; x=1756217565; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=6su9VCir3384YYMOS00XzRvc8ZkOU7plAD70gRIHZiM=; b=A+3uwQ9tuyevHB8fOS07ENow2Bl4XmioLMYvPr6L56Sk/3mBlI3SqDbO6d8Er3Lh+c mLb0bVQIk8K4CQq3SS3RZ24Syc6sjBgfut4UEw+JpZzWDheB8YX2/FnyIN9kDMlE6S8F 2B7XcO2jkH5Xy0Xw1J4irY0LVqx2E7WGjjN1wbfPlPOkgqEeu+uiTpkN1/iVc3AhcGEK nVTWsioEJklXbYwT8BWTQBf4h4kVDASYtknIBT2aeSIGMcM2Lr/CPJWXJkA13mdYwDX0 +b3zRJI9hTC0GwKsuzdZgoxxUJV+EfwrJwJGFVXa0mekKSAq3uo8Go7MIPiLaR4cVjBD vNvQ== X-Gm-Message-State: AOJu0YxqL505QKadASSWcws+XmNYaWjVutYNfmFZQZpCPYac3kBQgEGa wOFf+VHPWEPZC5yqXuLuoAa1yy1wl2VQTAnl2upRPYZ2bA0gFbx4SXNQMkq9CBg9pAGvTmKIWtd VYLpwIRQ9QF1hQd9GlT7VjvfYx4rYQxFtC2D+5QKUmskHzpe4aOGOmrlzj+vSZaHdyJ+OmFeFqV X0D9+cvgSyd5kLEzmyMgKDMgx7aGCQpnsjQ4QW0kdty2s= X-Google-Smtp-Source: AGHT+IFm5q7LaJLKAs53oD5lafEFQrA4UKK9OQklfWZhA3gvh48ERGevgkoCUO2KYRji7DD+xEAlZ0OvpC5P X-Received: from qkph16.prod.google.com ([2002:a05:620a:2850:b0:7e8:37d8:558e]) (user=asdunne job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6214:2a4b:b0:707:284b:53fe with SMTP id 6a1803df08f44-70c2d3a62c5mr27161946d6.13.1755612763494; Tue, 19 Aug 2025 07:12:43 -0700 (PDT) Date: Tue, 19 Aug 2025 14:12:41 +0000 In-Reply-To: <347832> Mime-Version: 1.0 References: <347832> X-Mailer: git-send-email 2.51.0.rc1.167.g924127e9c0-goog Message-ID: <20250819141241.655845-1-asdunne@google.com> To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH] vf_colorspace: Add an option to clamp trc LUT output 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: , From: Drew Dunne via ffmpeg-devel Reply-To: FFmpeg development discussions and patches Cc: Drew Dunne 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 a new flag to the vf_colorspace filter which provides the user an option to clamp the linear and delinear transfer characteristics LUT values to the [0, 1] represented range. This helps constrain the potential value range when converting between colorspaces. Signed-off-by: Drew Dunne --- doc/filters.texi | 3 +++ libavfilter/vf_colorspace.c | 14 ++++++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/doc/filters.texi b/doc/filters.texi index 908c98a3cf..cb09d73f62 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -10403,6 +10403,9 @@ von Kries whitepoint adaptation identity whitepoint adaptation (i.e. no whitepoint adaptation) @end table +@item clamptrc +Clamps the linear and delinear transfer characteristics LUT values to the [0, 1] represented range. + @item iall Override all input properties at once. Same accepted values as @ref{all}. diff --git a/libavfilter/vf_colorspace.c b/libavfilter/vf_colorspace.c index e1f4725f63..15b4858b24 100644 --- a/libavfilter/vf_colorspace.c +++ b/libavfilter/vf_colorspace.c @@ -123,6 +123,7 @@ typedef struct ColorSpaceContext { int fast_mode; enum DitherMode dither; enum WhitepointAdaptation wp_adapt; + int clamp_trc; int16_t *rgb[3]; ptrdiff_t rgb_stride; @@ -215,7 +216,9 @@ static int fill_gamma_table(ColorSpaceContext *s) } else { d = out_alpha * pow(v, out_gamma) - (out_alpha - 1.0); } - s->delin_lut[n] = av_clip_int16(lrint(d * 28672.0)); + long d_rounded = lrint(d * 28672.0); + s->delin_lut[n] = s->clamp_trc ? av_clip64(d_rounded, 0, 28672) + : av_clip_int16(d_rounded); // linearize if (v <= -in_beta * in_delta) { @@ -225,7 +228,9 @@ static int fill_gamma_table(ColorSpaceContext *s) } else { l = pow((v + in_alpha - 1.0) * in_ialpha, in_igamma); } - s->lin_lut[n] = av_clip_int16(lrint(l * 28672.0)); + long l_rounded = lrint(l * 28672.0); + s->lin_lut[n] = s->clamp_trc ? av_clip64(l_rounded, 0, 28672) + : av_clip_int16(l_rounded); } return 0; @@ -1000,6 +1005,11 @@ static const AVOption colorspace_options[] = { ENUM("vonkries", WP_ADAPT_VON_KRIES, "wpadapt"), ENUM("identity", WP_ADAPT_IDENTITY, "wpadapt"), + { "clamptrc", + "Clamps the linear and delinear LUT output values to the range [0, 1].", + OFFSET(clamp_trc), AV_OPT_TYPE_BOOL, { .i64 = 0 }, + 0, 1, FLAGS }, + { "iall", "Set all input color properties together", OFFSET(user_iall), AV_OPT_TYPE_INT, { .i64 = CS_UNSPECIFIED }, CS_UNSPECIFIED, CS_NB - 1, FLAGS, .unit = "all" }, -- 2.51.0.rc1.167.g924127e9c0-goog _______________________________________________ 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".