From patchwork Sat Nov 5 15:26:12 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: 39171 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp1085491pzb; Sat, 5 Nov 2022 08:27:47 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5pxwltJVyjlSpqrVw1EeZ/bkrgyyXS0UV1eiNf1rGY2n5cdjJnXI0Nnpkb2RhBdllVxELn X-Received: by 2002:a17:906:8a47:b0:7a3:86dd:d33b with SMTP id gx7-20020a1709068a4700b007a386ddd33bmr40074076ejc.67.1667662067407; Sat, 05 Nov 2022 08:27:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667662067; cv=none; d=google.com; s=arc-20160816; b=MkuqslJkT0s3Pf+uv0KoW9fvaeJ56AigznljQBFPV9oNIgqo9tHSVqP46M7aeeC91Z kxzBY7vlpbTS+DIL6EMjmDnxOvrKjIjhEzsOFFLmCyv6amtFQa4AAs2ZXNpcTNFNQ1rv eA7tyGUBfR+eS1yVUK3RPrQOqs9z8Yph40a8HgIDM/S2WenBy2shnT4V2dVsQlJDnDGs 4DuSnHXtRGc6f+wo0R1FaVK51gX0LDvlePJj/Fy1ZgamxKR8IpXVYUQGZcfm6NkDJ6mk ZldD59PFPZ29ccczDVtu8/eqcISZvjRbVU4bqWqNgCVIDyD+oVk5UfTZ+g/0+ySxqfI4 Qd6w== 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=Je5S4FHw0mmdxJ0L2EIt08ozNmDoSzsSyDCU7qUawsQ=; b=mz3pIXvtLxmg8YW6yWJ9hUd3cMmwtgkYBYbb26g0AMfqp0Hc2plIZmU2rl0owa3MJw yRyvLAUNvhLS/t956YujYTaot6GZcO4e8KxgrCbErgHSziZi4ym1b7tceQ326b42UrJG K2pIGhMs9NlTiD/piYnJgtv79UkGRskUVxf+4q/2JjAW9+HHERFewuPT3qkcGSNjDfF4 XYqU1HIxerxylDCOcpe08Ln7u4RZoEJxr1q3p5U8UBTjLZ+8cPyoSN+4UiuO5GAUY/C5 QA9y2zBnMEvXoU4grMk+zWPec9GznZ12/cuUPx664VKJ0wwmP7FKsdggnzeqZN39tkWd kHOg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@pkh.me header.s=selector1 header.b=l66VAmlT; 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 o7-20020a17090608c700b00730aa841c5bsi1878381eje.964.2022.11.05.08.27.46; Sat, 05 Nov 2022 08:27:47 -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=l66VAmlT; 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 AB55F68B3E7; Sat, 5 Nov 2022 17:26:43 +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 24EC768B3E0 for ; Sat, 5 Nov 2022 17:26:41 +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=1JLpbEYvTNppxpJXLXniUM699Kk7plGGItR7SCcxX60=; b=l66VAmlTEll3UXrlsrfQKuPax0NVVAvwDgcNCcauHz/cK6AAYVKMNok+knpf+y2jOQLOcL 5+CxwNrx1sjvf2APvIG5pzRudNqq53VLDUi5LOsqclh/CSERrSFI2l9ZquheinMvUgJUU8 TOTA4u0qqIaRCcmmG2cehQuKn6Do+j4= Received: from localhost (ssq0.pkh.me [local]) by ssq0.pkh.me (OpenSMTPD) with ESMTPA id 4e4ed742; 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:12 +0100 Message-Id: <20221105152617.1809282-11-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 10/15] avfilter/palettegen: move box variance computation in a dedicated function 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: SgQdnNL77TWz --- libavfilter/vf_palettegen.c | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/libavfilter/vf_palettegen.c b/libavfilter/vf_palettegen.c index 00bc323d17..2b412cdb55 100644 --- a/libavfilter/vf_palettegen.c +++ b/libavfilter/vf_palettegen.c @@ -144,12 +144,23 @@ static av_always_inline int diff(const uint32_t a, const uint32_t b) return dr*dr + dg*dg + db*db; } +static void compute_box_variance(PaletteGenContext *s, struct range_box *box) +{ + int64_t variance = 0; + + for (int i = 0; i < box->len; i++) { + const struct color_ref *ref = s->refs[box->start + i]; + variance += diff(ref->color, box->color) * ref->count; + } + box->variance = variance; +} + /** * Find the next box to split: pick the one with the highest variance */ static int get_next_box_id_to_split(PaletteGenContext *s) { - int box_id, i, best_box_id = -1; + int box_id, best_box_id = -1; int64_t max_variance = -1; if (s->nb_boxes == s->max_colors - s->reserve_transparent) @@ -159,16 +170,8 @@ static int get_next_box_id_to_split(PaletteGenContext *s) struct range_box *box = &s->boxes[box_id]; if (s->boxes[box_id].len >= 2) { - - if (box->variance == -1) { - int64_t variance = 0; - - for (i = 0; i < box->len; i++) { - const struct color_ref *ref = s->refs[box->start + i]; - variance += diff(ref->color, box->color) * ref->count; - } - box->variance = variance; - } + if (box->variance == -1) + compute_box_variance(s, box); if (box->variance > max_variance) { best_box_id = box_id; max_variance = box->variance;