[FFmpeg-cvslog] r25666 - in trunk: doc/eval.texi libavutil/avutil.h libavutil/eval.c

[stefano]

Author: stefano
Date: Wed Nov  3 20:44:00 2010
New Revision: 25666

Log:
Implement isnan() function evaluation.

Modified:
   trunk/doc/eval.texi
   trunk/libavutil/avutil.h
   trunk/libavutil/eval.c

Modified: trunk/doc/eval.texi
==============================================================================
--- trunk/doc/eval.texi	Wed Nov  3 20:43:55 2010	(r25665)
+++ trunk/doc/eval.texi	Wed Nov  3 20:44:00 2010	(r25666)
@@ -34,6 +34,9 @@ The following functions are available:
 @item abs(x)
 @item squish(x)
 @item gauss(x)
+ at item isnan(x)
+Return 1.0 if @var{x} is NAN, 0.0 otherwise.
+
 @item mod(x, y)
 @item max(x, y)
 @item min(x, y)

Modified: trunk/libavutil/avutil.h
==============================================================================
--- trunk/libavutil/avutil.h	Wed Nov  3 20:43:55 2010	(r25665)
+++ trunk/libavutil/avutil.h	Wed Nov  3 20:44:00 2010	(r25666)
@@ -41,7 +41,7 @@
 
 #define LIBAVUTIL_VERSION_MAJOR 50
 #define LIBAVUTIL_VERSION_MINOR 32
-#define LIBAVUTIL_VERSION_MICRO  5
+#define LIBAVUTIL_VERSION_MICRO  6
 
 #define LIBAVUTIL_VERSION_INT   AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
                                                LIBAVUTIL_VERSION_MINOR, \

Modified: trunk/libavutil/eval.c
==============================================================================
--- trunk/libavutil/eval.c	Wed Nov  3 20:43:55 2010	(r25665)
+++ trunk/libavutil/eval.c	Wed Nov  3 20:44:00 2010	(r25666)
@@ -118,7 +118,7 @@ static int strmatch(const char *s, const
 struct AVExpr {
     enum {
         e_value, e_const, e_func0, e_func1, e_func2,
-        e_squish, e_gauss, e_ld,
+        e_squish, e_gauss, e_ld, e_isnan,
         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,
@@ -144,6 +144,7 @@ static double eval_expr(Parser *p, AVExp
         case e_squish: return 1/(1+exp(4*eval_expr(p, e->param[0])));
         case e_gauss: { double d = eval_expr(p, e->param[0]); return exp(-d*d/2)/sqrt(2*M_PI); }
         case e_ld:     return e->value * p->var[av_clip(eval_expr(p, e->param[0]), 0, VARS-1)];
+        case e_isnan:  return e->value * !!isnan(eval_expr(p, e->param[0]));
         case e_while: {
             double d = NAN;
             while (eval_expr(p, e->param[0]))
@@ -272,6 +273,7 @@ static int parse_primary(AVExpr **e, Par
     else if (strmatch(next, "lte"   )) { AVExpr *tmp = d->param[1]; d->param[1] = d->param[0]; d->param[0] = tmp; d->type = e_gt; }
     else if (strmatch(next, "lt"    )) { AVExpr *tmp = d->param[1]; d->param[1] = d->param[0]; d->param[0] = tmp; d->type = e_gte; }
     else if (strmatch(next, "ld"    )) d->type = e_ld;
+    else if (strmatch(next, "isnan" )) d->type = e_isnan;
     else if (strmatch(next, "st"    )) d->type = e_st;
     else if (strmatch(next, "while" )) d->type = e_while;
     else {
@@ -436,7 +438,8 @@ static int verify_expr(AVExpr *e)
         case e_func1:
         case e_squish:
         case e_ld:
-        case e_gauss: return verify_expr(e->param[0]);
+        case e_gauss:
+        case e_isnan: return verify_expr(e->param[0]);
         default: return verify_expr(e->param[0]) && verify_expr(e->param[1]);
     }
 }
@@ -574,6 +577,8 @@ int main(void)
         "st(1, 1); st(2, 2); st(0, 1); while(lte(ld(0),10), st(3, ld(1)+ld(2)); st(1, ld(2)); st(2, ld(3)); st(0, ld(0)+1)); ld(3)",
         "while(0, 10)",
         "st(0, 1); while(lte(ld(0),100), st(1, ld(1)+ld(0)); st(0, ld(0)+1))",
+        "isnan(1)",
+        "isnan(NAN)",
         NULL
     };