[FFmpeg-cvslog] r22845 - in trunk/libavcodec: eval.c eval.h opt.c

[stefano]

Author: stefano
Date: Mon Apr 12 00:32:04 2010
New Revision: 22845

Log:
Rename ff_eval2() to ff_parse_and_eval_expr().

The new name better expresses what the function does.

Modified:
   trunk/libavcodec/eval.c
   trunk/libavcodec/eval.h
   trunk/libavcodec/opt.c

Modified: trunk/libavcodec/eval.c
==============================================================================
--- trunk/libavcodec/eval.c	Mon Apr 12 00:32:01 2010	(r22844)
+++ trunk/libavcodec/eval.c	Mon Apr 12 00:32:04 2010	(r22845)
@@ -418,7 +418,7 @@ double ff_eval_expr(AVExpr * e, const do
     return eval_expr(&p, e);
 }
 
-double ff_eval2(const char *s, const double *const_value, const char * const *const_name,
+double ff_parse_and_eval_expr(const char *s, const double *const_value, const char * const *const_name,
                double (**func1)(void *, double), const char **func1_name,
                double (**func2)(void *, double, double), const char **func2_name,
                void *opaque, const char **error){
@@ -444,13 +444,13 @@ static const char *const_names[]={
 };
 int main(void){
     int i;
-    printf("%f == 12.7\n", ff_eval2("1+(5-2)^(3-1)+1/2+sin(PI)-max(-2.2,-3.1)", const_values, const_names, NULL, NULL, NULL, NULL, NULL, NULL));
-    printf("%f == 0.931322575\n", ff_eval2("80G/80Gi", const_values, const_names, NULL, NULL, NULL, NULL, NULL, NULL));
+    printf("%f == 12.7\n", ff_parse_and_eval_expr("1+(5-2)^(3-1)+1/2+sin(PI)-max(-2.2,-3.1)", const_values, const_names, NULL, NULL, NULL, NULL, NULL, NULL));
+    printf("%f == 0.931322575\n", ff_parse_and_eval_expr("80G/80Gi", const_values, const_names, NULL, NULL, NULL, NULL, NULL, NULL));
 
     for(i=0; i<1050; i++){
         START_TIMER
-            ff_eval2("1+(5-2)^(3-1)+1/2+sin(PI)-max(-2.2,-3.1)", const_values, const_names, NULL, NULL, NULL, NULL, NULL, NULL);
-        STOP_TIMER("ff_eval2")
+            ff_parse_and_eval_expr("1+(5-2)^(3-1)+1/2+sin(PI)-max(-2.2,-3.1)", const_values, const_names, NULL, NULL, NULL, NULL, NULL, NULL);
+        STOP_TIMER("ff_parse_and_eval_expr")
     }
     return 0;
 }

Modified: trunk/libavcodec/eval.h
==============================================================================
--- trunk/libavcodec/eval.h	Mon Apr 12 00:32:01 2010	(r22844)
+++ trunk/libavcodec/eval.h	Mon Apr 12 00:32:04 2010	(r22845)
@@ -43,7 +43,7 @@ typedef struct AVExpr AVExpr;
  * @param opaque a pointer which will be passed to all functions from func1 and func2
  * @return the value of the expression
  */
-double ff_eval2(const char *s, const double *const_value, const char * const *const_name,
+double ff_parse_and_eval_expr(const char *s, const double *const_value, const char * const *const_name,
                double (**func1)(void *, double), const char **func1_name,
                double (**func2)(void *, double, double), const char **func2_name,
                void *opaque, const char **error);

Modified: trunk/libavcodec/opt.c
==============================================================================
--- trunk/libavcodec/opt.c	Mon Apr 12 00:32:01 2010	(r22844)
+++ trunk/libavcodec/opt.c	Mon Apr 12 00:32:04 2010	(r22845)
@@ -156,7 +156,7 @@ int av_set_string3(void *obj, const char
                 buf[i]= val[i];
             buf[i]=0;
 
-            d = ff_eval2(buf, const_values, const_names, NULL, NULL, NULL, NULL, NULL, &error);
+            d = ff_parse_and_eval_expr(buf, const_values, const_names, NULL, NULL, NULL, NULL, NULL, &error);
             if(isnan(d)) {
                 const AVOption *o_named= av_find_opt(obj, buf, o->unit, 0, 0);
                 if(o_named && o_named->type == FF_OPT_TYPE_CONST)