From patchwork Sat Nov 5 15:26:07 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: 39169 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp1085341pzb; Sat, 5 Nov 2022 08:27:30 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6EQ1QZkB1DBbEDuq07A3tV669/Rrese/UhsM79u0U87PLEruKysSjV71AqmfTI6f6tKyTR X-Received: by 2002:a17:907:75f4:b0:7ad:b868:ccf2 with SMTP id jz20-20020a17090775f400b007adb868ccf2mr36528655ejc.733.1667662049929; Sat, 05 Nov 2022 08:27:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667662049; cv=none; d=google.com; s=arc-20160816; b=pXkyRELs9PMDPotsF7HelIUBSoabeUNI0XaEHPE9VqfURKWUnjZPj5NOa0sBaU2cxw AI6waLxJfCJ9mDpmPl7yqLexMQoDPlDIX2vIFGcBd0dq5i40pK2GQpXp6UiKORI/i7od gU+R8KCgL3hrHv6B/DEit7sm9fHj9rzcjzFhwh09Tl2N/1q1ZNSATHs2HLu/hHfjymJS sVvbsTF8PeefF15teY89QIImpIJynbpUQ+0j2XHQ6qD8Vb5ZwDqxd+QAIMTpDzqIJD4Y rbHXDlWbPZBnr0Q/s+DsZ0W5pmHwmWUIjo1lWMOr7vXOIcGesW9BzbolFMk0xUkCEtiE fuag== 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=aZVA+4t5TDnBe1HHndM6n1tVKhPzQv5uYl7LYxznJ0I=; b=eJlKYzStv/gtxhL/7M/6y/7d4Hko5N2YegrW+i0ewlCItU5I1KoGU85/0snOIKkk11 Iq+02/talF4bF4j/6SE5EhZA91Lcza741GtNGJ8zl5O+N4Mj3pb53Kwme2cLUsrIY7e8 /kXoiIMYN5X3hIlZLXsiPgeUfXkD7tcLck8rNvlpKGxcBpSILpGWbiY+vr97keF8WiUr v3r0dn5FLAab+kpFpFRqq99sZr5TMOtdLtQA3pNBFnA7eMDuAEFatILeNXy293lbs5te Sq2P7wd1qIabsXHss3vpBFoqiFO3tmVjmrnoYHKfpbl5caiOEYvdOuRi/QW3BC5pclfX eKnQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@pkh.me header.s=selector1 header.b=fwNmatzg; 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 v14-20020a056402348e00b00456e33b69e1si3840396edc.347.2022.11.05.08.27.29; Sat, 05 Nov 2022 08:27:29 -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=fwNmatzg; 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 98B8068B3A7; Sat, 5 Nov 2022 17:26:39 +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 045F268B25D for ; Sat, 5 Nov 2022 17:26:32 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pkh.me; s=selector1; t=1667661981; 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=8QK0gQRPZTlpe6b5Isfr+UBzXB0eT15rQyfJ+1Oisiw=; b=fwNmatzgIVliRyp6tTnj3nOvCIqQe8rr4wPH2yBUdKbSW1Rrbnics+X2bk1hnngqLXysdx DmOWT88knwsNwu96T2QBvzWBw0YTzPITLcRK1V6NbMtIuKPQG2yVDAzqhBT6JPdspqPDiM 3CiBewPPf3lEXqsyECQ5rvRTK8vdGBY= Received: from localhost (ssq0.pkh.me [local]) by ssq0.pkh.me (OpenSMTPD) with ESMTPA id c959b920; Sat, 5 Nov 2022 15:26:20 +0000 (UTC) From: =?utf-8?b?Q2zDqW1lbnQgQsWTc2No?= To: ffmpeg-devel@ffmpeg.org Date: Sat, 5 Nov 2022 16:26:07 +0100 Message-Id: <20221105152617.1809282-6-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 05/15] avfilter/paletteuse: name target color arg consistently in colormap functions 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: sDKA3Skelqab --- libavfilter/vf_paletteuse.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavfilter/vf_paletteuse.c b/libavfilter/vf_paletteuse.c index fb4016b11c..f43f077454 100644 --- a/libavfilter/vf_paletteuse.c +++ b/libavfilter/vf_paletteuse.c @@ -180,7 +180,7 @@ static av_always_inline int diff(const uint32_t a, const uint32_t b, const int t } } -static av_always_inline uint8_t colormap_nearest_bruteforce(const uint32_t *palette, const uint32_t argb, const int trans_thresh) +static av_always_inline uint8_t colormap_nearest_bruteforce(const uint32_t *palette, const uint32_t target, const int trans_thresh) { int i, pal_id = -1, min_dist = INT_MAX; @@ -188,7 +188,7 @@ static av_always_inline uint8_t colormap_nearest_bruteforce(const uint32_t *pale const uint32_t c = palette[i]; if (c >> 24 >= trans_thresh) { // ignore transparent entry - const int d = diff(palette[i], argb, trans_thresh); + const int d = diff(palette[i], target, trans_thresh); if (d < min_dist) { pal_id = i; min_dist = d; @@ -235,10 +235,10 @@ static void colormap_nearest_node(const struct color_node *map, } } -static av_always_inline uint8_t colormap_nearest_recursive(const struct color_node *node, const uint8_t rgb, const int trans_thresh) +static av_always_inline uint8_t colormap_nearest_recursive(const struct color_node *node, const uint8_t target, const int trans_thresh) { struct nearest_color res = {.dist_sqd = INT_MAX, .node_pos = -1}; - colormap_nearest_node(node, 0, rgb, trans_thresh, &res); + colormap_nearest_node(node, 0, target, trans_thresh, &res); return node[res.node_pos].palette_id; }