diff options
| author | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2011-05-03 23:31:14 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2011-09-19 12:38:14 +0200 |
| commit | 9bc393908a6b522c93034b87b8f9f21cb13d7d69 (patch) | |
| tree | bfd619d0411ebcecc66c07b9eab6ad1979cd204b | |
| parent | 3e033da84782e12ed529e6a88dd53b6a72199e8e (diff) | |
eval: add sqrt function for computing the square root
| -rw-r--r-- | doc/eval.texi | 4 | ||||
| -rw-r--r-- | libavutil/avutil.h | 2 | ||||
| -rw-r--r-- | libavutil/eval.c | 6 | ||||
| -rw-r--r-- | tests/ref/fate/eval | 6 |
4 files changed, 17 insertions, 1 deletions
diff --git a/doc/eval.texi b/doc/eval.texi index d8c693f304..4a9495cf30 100644 --- a/doc/eval.texi +++ b/doc/eval.texi @@ -72,6 +72,10 @@ integer. For example, "floor(-1.5)" is "-2.0". @item trunc(expr) Round the value of expression @var{expr} towards zero to the nearest integer. For example, "trunc(-1.5)" is "-1.0". + +@item sqrt(expr) +Compute the square root of @var{expr}. This is equivalent to +"(@var{expr})^.5". @end table Note that: diff --git a/libavutil/avutil.h b/libavutil/avutil.h index 3f9267908a..7d995c25c6 100644 --- a/libavutil/avutil.h +++ b/libavutil/avutil.h @@ -41,7 +41,7 @@ #define LIBAVUTIL_VERSION_MAJOR 51 #define LIBAVUTIL_VERSION_MINOR 10 -#define LIBAVUTIL_VERSION_MICRO 0 +#define LIBAVUTIL_VERSION_MICRO 1 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ LIBAVUTIL_VERSION_MINOR, \ diff --git a/libavutil/eval.c b/libavutil/eval.c index 6d9b8e4208..878cf5c643 100644 --- a/libavutil/eval.c +++ b/libavutil/eval.c @@ -123,6 +123,7 @@ struct AVExpr { e_mod, e_max, e_min, e_eq, e_gt, e_gte, e_pow, e_mul, e_div, e_add, e_last, e_st, e_while, e_floor, e_ceil, e_trunc, + e_sqrt, } type; double value; // is sign in other types union { @@ -149,6 +150,7 @@ static double eval_expr(Parser *p, AVExpr *e) case e_floor: return e->value * floor(eval_expr(p, e->param[0])); case e_ceil : return e->value * ceil (eval_expr(p, e->param[0])); case e_trunc: return e->value * trunc(eval_expr(p, e->param[0])); + case e_sqrt: return e->value * sqrt (eval_expr(p, e->param[0])); case e_while: { double d = NAN; while (eval_expr(p, e->param[0])) @@ -283,6 +285,7 @@ static int parse_primary(AVExpr **e, Parser *p) else if (strmatch(next, "floor" )) d->type = e_floor; else if (strmatch(next, "ceil" )) d->type = e_ceil; else if (strmatch(next, "trunc" )) d->type = e_trunc; + else if (strmatch(next, "sqrt" )) d->type = e_sqrt; else { for (i=0; p->func1_names && p->func1_names[i]; i++) { if (strmatch(next, p->func1_names[i])) { @@ -450,6 +453,7 @@ static int verify_expr(AVExpr *e) case e_floor: case e_ceil: case e_trunc: + case e_sqrt: return verify_expr(e->param[0]); default: return verify_expr(e->param[0]) && verify_expr(e->param[1]); } @@ -600,6 +604,8 @@ int main(int argc, char **argv) "trunc(-123.123)", "ceil(123.123)", "ceil(-123.123)", + "sqrt(1764)", + "sqrt(-1)", NULL }; diff --git a/tests/ref/fate/eval b/tests/ref/fate/eval index ad01891d9c..00e5887a9a 100644 --- a/tests/ref/fate/eval +++ b/tests/ref/fate/eval @@ -133,5 +133,11 @@ Evaluating 'ceil(123.123)' Evaluating 'ceil(-123.123)' 'ceil(-123.123)' -> -123.000000 +Evaluating 'sqrt(1764)' +'sqrt(1764)' -> 42.000000 + +Evaluating 'sqrt(-1)' +'sqrt(-1)' -> -nan + 12.700000 == 12.7 0.931323 == 0.931322575 |