highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename ff_eval2() to ff_parse_and_eval_expr().

Browse Source 
The new name better expresses what the function does.

Originally committed as revision 22845 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Stefano Sabatini 2010-04-11 22:32:04 +00:00
parent 4565caf120
commit a367be1e88
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavcodec/eval.c
View File

@ -418,7 +418,7 @@ double ff_eval_expr(AVExpr * e, const double *const_value, void *opaque) {
return eval_expr(&p, e); 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 (**func1)(void *, double), const char **func1_name,
double (**func2)(void *, double, double), const char **func2_name, double (**func2)(void *, double, double), const char **func2_name,
void *opaque, const char **error){ void *opaque, const char **error){
@ -444,13 +444,13 @@ static const char *const_names[]={
}; };
int main(void){ int main(void){
int i; 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 == 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_eval2("80G/80Gi", 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++){ for(i=0; i<1050; i++){
START_TIMER 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); 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_eval2") STOP_TIMER("ff_parse_and_eval_expr")
} }
return 0; return 0;
} }

2
libavcodec/eval.h
View File

@ -43,7 +43,7 @@ typedef struct AVExpr AVExpr;
* @param opaque a pointer which will be passed to all functions from func1 and func2 * @param opaque a pointer which will be passed to all functions from func1 and func2
* @return the value of the expression * @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 (**func1)(void *, double), const char **func1_name,
double (**func2)(void *, double, double), const char **func2_name, double (**func2)(void *, double, double), const char **func2_name,
void *opaque, const char **error); void *opaque, const char **error);

2
libavcodec/opt.c
View File

@ -156,7 +156,7 @@ int av_set_string3(void *obj, const char *name, const char *val, int alloc, cons
buf[i]= val[i]; buf[i]= val[i];
buf[i]=0; 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)) { if(isnan(d)) {
const AVOption *o_named= av_find_opt(obj, buf, o->unit, 0, 0); const AVOption *o_named= av_find_opt(obj, buf, o->unit, 0, 0);
if(o_named && o_named->type == FF_OPT_TYPE_CONST) if(o_named && o_named->type == FF_OPT_TYPE_CONST)