From: Niklas Haas <g...@haasn.dev> --- 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-requ...@ffmpeg.org with subject "unsubscribe".