diff options
| author | Stefano Sabatini <stefasab@gmail.com> | 2013-01-23 00:02:36 +0100 |
|---|---|---|
| committer | Stefano Sabatini <stefasab@gmail.com> | 2013-01-24 12:19:01 +0100 |
| commit | 2ed0803c6c994c540bdf0849473e1baaad6af511 (patch) | |
| tree | 13abbc72c1972a8aeb0788d7262bf78f6bb4c1b6 /libavutil | |
| parent | 056664ff25c674e2bb5c448d4cd646a09fc87607 (diff) | |
lavu/eval: extend if/ifnot functions to accept a third parameter
Add support to an if/else construct, simplify logic in expressions.
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/eval.c | 12 | ||||
| -rw-r--r-- | libavutil/version.h | 2 |
2 files changed, 11 insertions, 3 deletions
diff --git a/libavutil/eval.c b/libavutil/eval.c index 6ea7504ff1..22b491fef3 100644 --- a/libavutil/eval.c +++ b/libavutil/eval.c @@ -180,8 +180,10 @@ static double eval_expr(Parser *p, AVExpr *e) 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_not: return e->value * (eval_expr(p, e->param[0]) == 0); - case e_if: return e->value * ( eval_expr(p, e->param[0]) ? eval_expr(p, e->param[1]) : 0); - case e_ifnot: return e->value * (!eval_expr(p, e->param[0]) ? eval_expr(p, e->param[1]) : 0); + case e_if: return e->value * (eval_expr(p, e->param[0]) ? eval_expr(p, e->param[1]) : + e->param[2] ? eval_expr(p, e->param[2]) : 0); + case e_ifnot: return e->value * (!eval_expr(p, e->param[0]) ? eval_expr(p, e->param[1]) : + e->param[2] ? eval_expr(p, e->param[2]) : 0); case e_random:{ int idx= av_clip(eval_expr(p, e->param[0]), 0, VARS-1); uint64_t r= isnan(p->var[idx]) ? 0 : p->var[idx]; @@ -599,6 +601,8 @@ static int verify_expr(AVExpr *e) case e_not: case e_random: return verify_expr(e->param[0]) && !e->param[1]; + case e_if: + case e_ifnot: case e_taylor: return verify_expr(e->param[0]) && verify_expr(e->param[1]) && (!e->param[2] || verify_expr(e->param[2])); @@ -777,8 +781,12 @@ int main(int argc, char **argv) "PI^1.23", "pow(-1,1.23)", "if(1, 2)", + "if(1, 1, 2)", + "if(0, 1, 2)", "ifnot(0, 23)", "ifnot(1, NaN) + if(0, 1)", + "ifnot(1, 1, 2)", + "ifnot(0, 1, 2)", "taylor(1, 1)", "taylor(eq(mod(ld(1),4),1)-eq(mod(ld(1),4),3), PI/2, 1)", "root(sin(ld(0))-1, 2)", diff --git a/libavutil/version.h b/libavutil/version.h index 6fb794357e..8e678fe287 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -76,7 +76,7 @@ #define LIBAVUTIL_VERSION_MAJOR 52 #define LIBAVUTIL_VERSION_MINOR 15 -#define LIBAVUTIL_VERSION_MICRO 101 +#define LIBAVUTIL_VERSION_MICRO 102 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ LIBAVUTIL_VERSION_MINOR, \ |