comparison eval.c @ 11804:3dc6ee95d63a libavcodec

Cosmetics: reindent and break some overly long line.
author stefano
date Tue, 01 Jun 2010 08:07:17 +0000
parents f443ef5ec4e2
children 0448680fa221
comparison
equal deleted inserted replaced
11803:f443ef5ec4e2 11804:3dc6ee95d63a
440 440
441 int ff_parse_expr(AVExpr **expr, const char *s, 441 int ff_parse_expr(AVExpr **expr, const char *s,
442 const char * const *const_names, 442 const char * const *const_names,
443 const char * const *func1_names, double (* const *funcs1)(void *, double), 443 const char * const *func1_names, double (* const *funcs1)(void *, double),
444 const char * const *func2_names, double (* const *funcs2)(void *, double, double), 444 const char * const *func2_names, double (* const *funcs2)(void *, double, double),
445 int log_offset, void *log_ctx) 445 int log_offset, void *log_ctx)
446 { 446 {
447 Parser p; 447 Parser p;
448 AVExpr *e = NULL; 448 AVExpr *e = NULL;
449 char *w = av_malloc(strlen(s) + 1); 449 char *w = av_malloc(strlen(s) + 1);
450 char *wp = w; 450 char *wp = w;
492 492
493 int ff_parse_and_eval_expr(double *d, const char *s, 493 int ff_parse_and_eval_expr(double *d, const char *s,
494 const char * const *const_names, const double *const_values, 494 const char * const *const_names, const double *const_values,
495 const char * const *func1_names, double (* const *funcs1)(void *, double), 495 const char * const *func1_names, double (* const *funcs1)(void *, double),
496 const char * const *func2_names, double (* const *funcs2)(void *, double, double), 496 const char * const *func2_names, double (* const *funcs2)(void *, double, double),
497 void *opaque, int log_offset, void *log_ctx) 497 void *opaque, int log_offset, void *log_ctx)
498 { 498 {
499 AVExpr *e = NULL; 499 AVExpr *e = NULL;
500 int ret = ff_parse_expr(&e, s, const_names, func1_names, funcs1, func2_names, funcs2, log_offset, log_ctx); 500 int ret = ff_parse_expr(&e, s, const_names, func1_names, funcs1, func2_names, funcs2, log_offset, log_ctx);
501 501
502 if (ret < 0) { 502 if (ret < 0) {
513 static double const_values[] = { 513 static double const_values[] = {
514 M_PI, 514 M_PI,
515 M_E, 515 M_E,
516 0 516 0
517 }; 517 };
518
518 static const char *const_names[] = { 519 static const char *const_names[] = {
519 "PI", 520 "PI",
520 "E", 521 "E",
521 0 522 0
522 }; 523 };
524
523 int main(void) 525 int main(void)
524 { 526 {
525 int i; 527 int i;
526 double d; 528 double d;
527 ff_parse_and_eval_expr(&d, "1+(5-2)^(3-1)+1/2+sin(PI)-max(-2.2,-3.1)", const_names, const_values, NULL, NULL, NULL, NULL, NULL, 0, NULL); 529 ff_parse_and_eval_expr(&d, "1+(5-2)^(3-1)+1/2+sin(PI)-max(-2.2,-3.1)",
530 const_names, const_values,
531 NULL, NULL, NULL, NULL, NULL, 0, NULL);
528 printf("%f == 12.7\n", d); 532 printf("%f == 12.7\n", d);
529 ff_parse_and_eval_expr(&d, "80G/80Gi", const_names, const_values, NULL, NULL, NULL, NULL, NULL, NULL); 533 ff_parse_and_eval_expr(&d, "80G/80Gi",
534 const_names, const_values,
535 NULL, NULL, NULL, NULL, NULL, NULL);
530 printf("%f == 0.931322575\n", d); 536 printf("%f == 0.931322575\n", d);
531 537
532 for (i=0; i<1050; i++) { 538 for (i=0; i<1050; i++) {
533 START_TIMER 539 START_TIMER
534 ff_parse_and_eval_expr(&d, "1+(5-2)^(3-1)+1/2+sin(PI)-max(-2.2,-3.1)", const_names, const_values, NULL, NULL, NULL, NULL, NULL, 0, NULL); 540 ff_parse_and_eval_expr(&d, "1+(5-2)^(3-1)+1/2+sin(PI)-max(-2.2,-3.1)",
541 const_names, const_values,
542 NULL, NULL, NULL, NULL, NULL, 0, NULL);
535 STOP_TIMER("ff_parse_and_eval_expr") 543 STOP_TIMER("ff_parse_and_eval_expr")
536 } 544 }
537 return 0; 545 return 0;
538 } 546 }
539 #endif 547 #endif