On Sunday, September 18, 2011, Anton Khirnov <[email protected]> wrote: > From: Stefano Sabatini <[email protected]> > > --- > doc/eval.texi | 4 ++++ > libavutil/avutil.h | 2 +- > libavutil/eval.c | 6 ++++++ > tests/ref/fate/eval | 6 ++++++ > 4 files changed, 17 insertions(+), 1 deletions(-) > > diff --git a/doc/eval.texi b/doc/eval.texi > index d8c693f..4a9495c 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 3f92679..7d995c2 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 6d9b8e4..878cf5c 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 ad01891..00e5887 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 > -- > 1.7.6 > > _______________________________________________ > libav-devel mailing list > [email protected] > https://lists.libav.org/mailman/listinfo/libav-devel >
Looks like these eval changes broke on OS X. -- Sean
_______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
