From 13564fc24d8248a1f9a987ce1bbd483c72609438 Mon Sep 17 00:00:00 2001 From: Paul B Mahol Date: Sun, 29 Jan 2017 10:26:16 +0100 Subject: [PATCH] avutil/eval: add atan2 function Signed-off-by: Paul B Mahol --- doc/utils.texi | 3 +++ libavutil/eval.c | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/doc/utils.texi b/doc/utils.texi index 30a962ac0e..1734439459 100644 --- a/doc/utils.texi +++ b/doc/utils.texi @@ -776,6 +776,9 @@ Compute arcsine of @var{x}. @item atan(x) Compute arctangent of @var{x}. +@item atan2(x, y) +Compute principal value of the arc tangent of @var{y}/@var{x}. + @item between(x, min, max) Return 1 if @var{x} is greater than or equal to @var{min} and lesser than or equal to @var{max}, 0 otherwise. diff --git a/libavutil/eval.c b/libavutil/eval.c index 2d49154c37..7e866155db 100644 --- a/libavutil/eval.c +++ b/libavutil/eval.c @@ -155,7 +155,7 @@ struct AVExpr { e_pow, e_mul, e_div, e_add, e_last, e_st, e_while, e_taylor, e_root, e_floor, e_ceil, e_trunc, e_sqrt, e_not, e_random, e_hypot, e_gcd, - e_if, e_ifnot, e_print, e_bitand, e_bitor, e_between, e_clip + e_if, e_ifnot, e_print, e_bitand, e_bitor, e_between, e_clip, e_atan2 } type; double value; // is sign in other types union { @@ -306,6 +306,7 @@ static double eval_expr(Parser *p, AVExpr *e) case e_last:return e->value * d2; case e_st : return e->value * (p->var[av_clip(d, 0, VARS-1)]= d2); case e_hypot:return e->value * hypot(d, d2); + case e_atan2:return e->value * atan2(d, d2); case e_bitand: return isnan(d) || isnan(d2) ? NAN : e->value * ((long int)d & (long int)d2); case e_bitor: return isnan(d) || isnan(d2) ? NAN : e->value * ((long int)d | (long int)d2); } @@ -452,6 +453,7 @@ static int parse_primary(AVExpr **e, Parser *p) else if (strmatch(next, "bitor" )) d->type = e_bitor; else if (strmatch(next, "between"))d->type = e_between; else if (strmatch(next, "clip" )) d->type = e_clip; + else if (strmatch(next, "atan2" )) d->type = e_atan2; else { for (i=0; p->func1_names && p->func1_names[i]; i++) { if (strmatch(next, p->func1_names[i])) {