From patchwork Wed Sep 27 10:03:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Haas X-Patchwork-Id: 43973 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:2a18:b0:15d:8365:d4b8 with SMTP id e24csp2493675pzh; Wed, 27 Sep 2023 03:07:12 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHK8i7UB/TSFmbAOh452verBuvF6t9VrhetUyhhMGpFKCgWmEL5mamLSrXRCAkOqy+Kj738 X-Received: by 2002:aa7:d8c9:0:b0:532:c72e:26fb with SMTP id k9-20020aa7d8c9000000b00532c72e26fbmr1727111eds.6.1695809232145; Wed, 27 Sep 2023 03:07:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695809232; cv=none; d=google.com; s=arc-20160816; b=YERag06GdZN+wayLLpyQFXv0jtbjsTEU3jzXJNAxp5vjzT3EejL3kEZbA8DpnYg2ar tT37enIcYY2bH6egEhGnb2RV5iekkHE6RjAeuC5NsPKCo9t58utCO9aIyPQIU3DuQnfV VDYGdK/TuPe3GLp5M+qQ0iGtUA+4SWBZdC2SuZjIX/7apCXcEwOFKlLyW9NoDvNCrMXV PRAhjvpYPjjRp1AMi/w/IjQl1E9IBN/y73EU56eqa2wr/0Wc6NqGJx2tMAYPHb5o2oW1 ubOs4TExZfQoxZeVeV4kSq1dGtyya2FWrmzW3yUfEH/3gpxlsapT+BH4zjmWuAUSwyLD 0wNQ== 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=7wZ+iJ7d7AmHIzP+qQ3uQXw6GOK8oC2NStKlETi6mB4=; fh=xmAeKtysnShNOmkhiJmYkS30uw4Fu2hvBJ7qlIwukxQ=; b=Tku1wq1OVLNQcu+Amb1cdklc9KFDFpQOsdDb5mfLyQG1Aqbx7Ax5ISG1ycN04GyysX SNueyYwQUiyRqG4hbUxk1cuGOxvN/8qIPs4hSjwHkf1eYJWtwbr/40lqEtODc3Xx6En7 pwaxs4MJ6qUs7KLhF5Cpmu5ckQIGmXEKtRDvrUhUafpG8NYC3YUKhpOQ0Ic9rTdmarEX kpoT+jozVGOdtx0ca98xxd85WEIGzJJLqy5XE5RzcJzMNn18s1gC50qhir7exUHdwhAq tzKkHHvhpK4D6d2k7DyXlj44R1dEAU2gj6m4YDnraVfHiN37f0dS5bgkDTKDLI3Hy61q 2Ogw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@haasn.xyz header.s=mail header.b=QfFwA8OQ; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id z21-20020aa7d415000000b00534111ca95csi5822911edq.525.2023.09.27.03.07.09; Wed, 27 Sep 2023 03:07:12 -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=@haasn.xyz header.s=mail header.b=QfFwA8OQ; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9FFFD68CAB4; Wed, 27 Sep 2023 13:06:48 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from haasn.dev (haasn.dev [78.46.187.166]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A6A3968CAB1 for ; Wed, 27 Sep 2023 13:06:40 +0300 (EEST) Received: from haasn.dev (unknown [10.30.0.2]) by haasn.dev (Postfix) with ESMTP id 6152B43F09; Wed, 27 Sep 2023 12:06:40 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=haasn.xyz; s=mail; t=1695809200; bh=tEDWSb/WEOvJgvRRNxdOdF/iLbTSRNKcCPxSiH+qYd8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QfFwA8OQVDnJmh3mbZzTSydpqqrIplQc8YR9DjsL4JRGw1GybLg8hFmbq8VFiUmCy 8kJqRCx30H1bDp0+cjEkHSHinKqm4/R7mE6bxSxXWYYJF4L/S2XNUb9xlpi9stI/1Z qfYwx7yu6w3fGpkiPw1loGtHUSxO36hGqwp3vUXM= From: Niklas Haas To: ffmpeg-devel@ffmpeg.org Date: Wed, 27 Sep 2023 12:03:53 +0200 Message-ID: <20230927100630.50510-3-ffmpeg@haasn.xyz> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20230927100630.50510-1-ffmpeg@haasn.xyz> References: <20230927100630.50510-1-ffmpeg@haasn.xyz> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/5] avutil/csp: re-use av_abs_q 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: Niklas Haas Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: d0NRMXBCgkLy From: Niklas Haas --- libavutil/csp.c | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/libavutil/csp.c b/libavutil/csp.c index 7ef822c60bc..6522225a8d6 100644 --- a/libavutil/csp.c +++ b/libavutil/csp.c @@ -100,13 +100,6 @@ const AVColorPrimariesDesc *av_csp_primaries_desc_from_id(enum AVColorPrimaries return p; } -static av_always_inline AVRational abs_sub_q(AVRational r1, AVRational r2) -{ - AVRational diff = av_sub_q(r1, r2); - /* denominator assumed to be positive */ - return av_make_q(abs(diff.num), diff.den); -} - enum AVColorPrimaries av_csp_primaries_id_from_desc(const AVColorPrimariesDesc *prm) { AVRational delta; @@ -116,14 +109,14 @@ enum AVColorPrimaries av_csp_primaries_id_from_desc(const AVColorPrimariesDesc * if (!ref->prim.r.x.num) continue; - delta = abs_sub_q(prm->prim.r.x, ref->prim.r.x); - delta = av_add_q(delta, abs_sub_q(prm->prim.r.y, ref->prim.r.y)); - delta = av_add_q(delta, abs_sub_q(prm->prim.g.x, ref->prim.g.x)); - delta = av_add_q(delta, abs_sub_q(prm->prim.g.y, ref->prim.g.y)); - delta = av_add_q(delta, abs_sub_q(prm->prim.b.x, ref->prim.b.x)); - delta = av_add_q(delta, abs_sub_q(prm->prim.b.y, ref->prim.b.y)); - delta = av_add_q(delta, abs_sub_q(prm->wp.x, ref->wp.x)); - delta = av_add_q(delta, abs_sub_q(prm->wp.y, ref->wp.y)); + delta = av_abs_q(av_sub_q(prm->prim.r.x, ref->prim.r.x)); + delta = av_add_q(delta, av_abs_q(av_sub_q(prm->prim.r.y, ref->prim.r.y))); + delta = av_add_q(delta, av_abs_q(av_sub_q(prm->prim.g.x, ref->prim.g.x))); + delta = av_add_q(delta, av_abs_q(av_sub_q(prm->prim.g.y, ref->prim.g.y))); + delta = av_add_q(delta, av_abs_q(av_sub_q(prm->prim.b.x, ref->prim.b.x))); + delta = av_add_q(delta, av_abs_q(av_sub_q(prm->prim.b.y, ref->prim.b.y))); + delta = av_add_q(delta, av_abs_q(av_sub_q(prm->wp.x, ref->wp.x))); + delta = av_add_q(delta, av_abs_q(av_sub_q(prm->wp.y, ref->wp.y))); if (av_cmp_q(delta, av_make_q(1, 1000)) < 0) return p;