From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id D6C8D453FE for ; Wed, 27 Sep 2023 10:07:06 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 73DB668CADA; Wed, 27 Sep 2023 13:06:48 +0300 (EEST) 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 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: 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; -- 2.42.0 _______________________________________________ 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".