From patchwork Sat Nov 5 15:26:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?Q2zDqW1lbnQgQsWTc2No?= X-Patchwork-Id: 39177 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a05:6a11:561f:b0:33d:fc04:f431 with SMTP id rr31csp1406445pxb; Sat, 5 Nov 2022 08:28:55 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5+qn+472lFZ4CA0JTNBJtnhauhIHOD5krwnKLGwrOA48i2OEQbnm6EX1wDebbQ6SCt0eyv X-Received: by 2002:a05:6402:f24:b0:461:7c77:98c4 with SMTP id i36-20020a0564020f2400b004617c7798c4mr39788526eda.80.1667662135412; Sat, 05 Nov 2022 08:28:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667662135; cv=none; d=google.com; s=arc-20160816; b=Hktg3KsL3NztWX9F9BnhDZc06CLkSawNswdHGnHvxqODbXi3ZAZBypcY1KNsfC7mSn dgEeSkKK1c5YbLI/2GbZtiunoFzcj4zxc+oE5NDgrL9lxvUXAkZSB3Zs2P0xXIDI9Dmj JlpId9OUQAk01w7RHwafml1l96XBm6Zst+82wUQU55OL9m/NIPAIjZP8JYnb1STC/c/B jpNlP0Ots9NW6mWPA0h5IrGf61FzL+l5HGn1+OyOE9cFXk5CwrzPryqOVH9H5JFdzQXY fq4waWakSPZK+7MIfTDjhWlJs0CtvbBqCrbsba2mEA0d3K+uSbDAY79z+PjUonlocZK2 qQ2w== 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=7Ig9Fhm7cMuiC8OE10hgE9xuX17x9MJMdxyAvrWEvDc=; b=jyigd+/DRfHkDZdlu/1QqOy5A3h10XjcZaVd4ovaQRg+eU835m2anz+dErUjzzwMSY uknOnOYBNTfxLr9ngjK6ez/1TlXiTQG2fJYMexWXPu+4LHfho03MG/m3MsT6DUtwyYQw 1MBXFKFCwsbwjjzArrtvxOoSoGOedNXlxb76QyddWVsggX+ryomtUWnKAjuHACTKF6/m rarjUKxqj+s/brBeqoFGykXOYYjcW6jFxj2jnJJOUb5kEj1HTCslOKGXCgFfc0YEDU3i xdZMu7pla3o3x9Ghz8D1I4nT61Mt0uYydHEAam6KcrPEGn0q476mD5hG7r2/xVoiHgYS EAKQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@pkh.me header.s=selector1 header.b=BNaGSENi; 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=NONE dis=NONE) header.from=pkh.me Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id tc7-20020a1709078d0700b00779c6c57dbfsi2463092ejc.556.2022.11.05.08.28.55; Sat, 05 Nov 2022 08:28:55 -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=@pkh.me header.s=selector1 header.b=BNaGSENi; 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=NONE dis=NONE) header.from=pkh.me Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 021DC68B925; Sat, 5 Nov 2022 17:26:51 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from ssq0.pkh.me (laubervilliers-656-1-228-164.w92-154.abo.wanadoo.fr [92.154.28.164]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2CDB668B49D for ; Sat, 5 Nov 2022 17:26:38 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pkh.me; s=selector1; t=1667661982; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Xzq+/W+OdRJgfYr6HKIN0fpOk11RD2qajjnTW9l8EXo=; b=BNaGSENilyaqpQbeD1KS/a5Wchjyjdz5iL7glsV6dy3EWUrRU+HmkQgKq2YvVdn5+hpj+t c/p5XBjHkmWhSbK1WcxjR/Ok1Mwzhw5aHlYfzsK9mra8h80UJGGc6AM8xUOEtJITtFlooU JG1VrF7JGGE3rqlub61T8aVWNTbpzpQ= Received: from localhost (ssq0.pkh.me [local]) by ssq0.pkh.me (OpenSMTPD) with ESMTPA id be936ecb; Sat, 5 Nov 2022 15:26:22 +0000 (UTC) From: =?utf-8?b?Q2zDqW1lbnQgQsWTc2No?= To: ffmpeg-devel@ffmpeg.org Date: Sat, 5 Nov 2022 16:26:11 +0100 Message-Id: <20221105152617.1809282-10-u@pkh.me> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20221105152617.1809282-1-u@pkh.me> References: <20221105152617.1809282-1-u@pkh.me> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 09/15] avfilter/palettegen: average color in linear space 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: =?utf-8?b?Q2zDqW1lbnQgQsWTc2No?= Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: EEbiptLD1s+M Content-Length: 2837 sRGB colors are gamma encoded, averaging them naively is incorrect. --- libavfilter/vf_palettegen.c | 18 ++++++++++-------- tests/ref/fate/filter-palettegen-1 | 2 +- tests/ref/fate/filter-palettegen-2 | 2 +- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/libavfilter/vf_palettegen.c b/libavfilter/vf_palettegen.c index d335ef91e6..00bc323d17 100644 --- a/libavfilter/vf_palettegen.c +++ b/libavfilter/vf_palettegen.c @@ -30,6 +30,7 @@ #include "libavutil/intreadwrite.h" #include "avfilter.h" #include "internal.h" +#include "palette.h" /* Reference a color and how much it's used */ struct color_ref { @@ -186,21 +187,22 @@ static int get_next_box_id_to_split(PaletteGenContext *s) static uint32_t get_avg_color(struct color_ref * const *refs, const struct range_box *box) { - int i; + int i, r, g, b; const int n = box->len; - uint64_t r = 0, g = 0, b = 0, div = 0; + uint64_t div = 0; + double rf = 0.0, gf = 0.0, bf = 0.0; for (i = 0; i < n; i++) { const struct color_ref *ref = refs[box->start + i]; - r += (ref->color >> 16 & 0xff) * ref->count; - g += (ref->color >> 8 & 0xff) * ref->count; - b += (ref->color & 0xff) * ref->count; + rf += ff_srgb_u8_to_linear_f32(ref->color >> 16 & 0xff) * ref->count; + gf += ff_srgb_u8_to_linear_f32(ref->color >> 8 & 0xff) * ref->count; + bf += ff_srgb_u8_to_linear_f32(ref->color & 0xff) * ref->count; div += ref->count; } - r = r / div; - g = g / div; - b = b / div; + r = ff_linear_f32_to_srgb_u8(rf / div); + g = ff_linear_f32_to_srgb_u8(gf / div); + b = ff_linear_f32_to_srgb_u8(bf / div); return 0xffU<<24 | r<<16 | g<<8 | b; } diff --git a/tests/ref/fate/filter-palettegen-1 b/tests/ref/fate/filter-palettegen-1 index bebfd24e19..df3b714ebb 100644 --- a/tests/ref/fate/filter-palettegen-1 +++ b/tests/ref/fate/filter-palettegen-1 @@ -3,4 +3,4 @@ #codec_id 0: rawvideo #dimensions 0: 16x16 #sar 0: 1/1 -0, 0, 0, 1, 1024, 0x3395ef5a +0, 0, 0, 1, 1024, 0x69ec37aa diff --git a/tests/ref/fate/filter-palettegen-2 b/tests/ref/fate/filter-palettegen-2 index 9abec0fe8e..08320a8359 100644 --- a/tests/ref/fate/filter-palettegen-2 +++ b/tests/ref/fate/filter-palettegen-2 @@ -3,4 +3,4 @@ #codec_id 0: rawvideo #dimensions 0: 16x16 #sar 0: 1/1 -0, 0, 0, 1, 1024, 0x23e072c8 +0, 0, 0, 1, 1024, 0x76078b2e