1)Some filters allow cross-referenced expressions e.g. x=y+10. In such cases, filters evaluate expressions multiple times for successful evaluation of all expressions. If the expression for one or more variables contains a RNG, the result may vary across evaluation leading to inconsistent values across the cross-referenced expressions. 2)A related case is circular expressions e.g. x=y+10 and y=x+10 which cannot be succesfully resolved. 3)Certain filter variables may only be applicable in specific eval modes and lead to a failure of evaluation in other modes e.g. pts is only relevant for frame eval mode. At present, there is no reliable means to identify these occurrences and thus the error messages provided are broad or inaccurate. The helper function introduced - av_expr_count_vars - allows developers to identify the use and count of variables in expressions and thus tailor the error message, allow for a graceful fallback and/or decide evaluation order.
Unified · Split
| @@ -735,6 +735,22 @@ end: · 734 unmodified lines | |||
| 735 | return ret; | 735 | return ret; |
| 736 | } | 736 | } |
| 737 | 737 | ||
| 738 | int av_expr_count_vars(AVExpr *e, unsigned *counter, int size) | ||
| 739 | { | ||
| 740 | int i; | ||
| 741 | |||
| 742 | if (!e || !counter || !size) | ||
| 743 | return AVERROR(EINVAL); | ||
| 744 | |||
| 745 | for (i = 0; e->type != e_const && i < 3 && e->param[i]; i++) | ||
| 746 | av_expr_count_vars(e->param[i], counter, size); | ||
| 747 | |||
| 748 | if (e->type == e_const && e->a.const_index < size) | ||
| 749 | counter[e->a.const_index]++; | ||
| 750 | |||
| 751 | return 0; | ||
| 752 | } | ||
| 753 | |||
| 738 | double av_expr_eval(AVExpr *e, const double *const_values, void *opaque) | 754 | double av_expr_eval(AVExpr *e, const double *const_values, void *opaque) |
| 739 | { | 755 | { |
| 740 | Parser p = { 0 }; | 756 | Parser p = { 0 }; |
| @@ -86,6 +86,16 @@ int av_expr_parse(AVExpr **expr, const char *s, · 85 unmodified lines | |||
| 86 | */ | 86 | */ |
| 87 | double av_expr_eval(AVExpr *e, const double *const_values, void *opaque); | 87 | double av_expr_eval(AVExpr *e, const double *const_values, void *opaque); |
| 88 | 88 | ||
| 89 | /** | ||
| 90 | * Track the presence of variables and their number of occurrences in a parsed expression | ||
| 91 | * | ||
| 92 | * @param counter a zero-initialized array where the count of each variable will be stored | ||
| 93 | * @param size size of array | ||
| 94 | * @return 0 on success, a negative value indicates that no expression or array was passed | ||
| 95 | * or size was zero | ||
| 96 | */ | ||
| 97 | int av_expr_count_vars(AVExpr *e, unsigned *counter, int size); | ||
| 98 | |||
| 89 | /** | 99 | /** |
| 90 | * Free a parsed expression previously created with av_expr_parse(). | 100 | * Free a parsed expression previously created with av_expr_parse(). |
| 91 | */ | 101 | */ |
| @@ -79,8 +79,8 @@ · 78 unmodified lines | |||
| 79 | */ | 79 | */ |
| 80 | 80 | ||
| 81 | #define LIBAVUTIL_VERSION_MAJOR 56 | 81 | #define LIBAVUTIL_VERSION_MAJOR 56 |
| 82 | #define LIBAVUTIL_VERSION_MINOR 35 | 82 | #define LIBAVUTIL_VERSION_MINOR 36 |
| 83 | #define LIBAVUTIL_VERSION_MICRO 101 | 83 | #define LIBAVUTIL_VERSION_MICRO 100 |
| 84 | 84 | ||
| 85 | #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ | 85 | #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ |
| 86 | LIBAVUTIL_VERSION_MINOR, \ | 86 | LIBAVUTIL_VERSION_MINOR, \ |