[FFmpeg-cvslog] avutil/eval: add linear interpolation helper

Paul B Mahol git at videolan.org
Sat Aug 19 13:45:09 EEST 2017


ffmpeg | branch: master | Paul B Mahol <onemda at gmail.com> | Fri Aug 18 09:15:33 2017 +0200| [1146133df8117c96cc6681a062df6df825fcae2d] | committer: Paul B Mahol

avutil/eval: add linear interpolation helper

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1146133df8117c96cc6681a062df6df825fcae2d
---

 doc/utils.texi   |  3 +++
 libavutil/eval.c | 10 +++++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/doc/utils.texi b/doc/utils.texi
index d65bdf0b0e..e635118565 100644
--- a/doc/utils.texi
+++ b/doc/utils.texi
@@ -864,6 +864,9 @@ Load the value of the internal variable with number
 @var{var}, which was previously stored with st(@var{var}, @var{expr}).
 The function returns the loaded value.
 
+ at item lerp(x, y, z)
+Return linear interpolation between @var{x} and @var{y} by amount of @var{z}.
+
 @item log(x)
 Compute natural logarithm of @var{x}.
 
diff --git a/libavutil/eval.c b/libavutil/eval.c
index 638259adef..b5f4ea2409 100644
--- a/libavutil/eval.c
+++ b/libavutil/eval.c
@@ -155,7 +155,7 @@ struct AVExpr {
         e_pow, e_mul, e_div, e_add,
         e_last, e_st, e_while, e_taylor, e_root, e_floor, e_ceil, e_trunc, e_round,
         e_sqrt, e_not, e_random, e_hypot, e_gcd,
-        e_if, e_ifnot, e_print, e_bitand, e_bitor, e_between, e_clip, e_atan2
+        e_if, e_ifnot, e_print, e_bitand, e_bitor, e_between, e_clip, e_atan2, e_lerp,
     } type;
     double value; // is sign in other types
     union {
@@ -208,6 +208,12 @@ static double eval_expr(Parser *p, AVExpr *e)
             return e->value * (d >= eval_expr(p, e->param[1]) &&
                                d <= eval_expr(p, e->param[2]));
         }
+        case e_lerp: {
+            double v0 = eval_expr(p, e->param[0]);
+            double v1 = eval_expr(p, e->param[1]);
+            double f  = eval_expr(p, e->param[2]);
+            return v0 + (v1 - v0) * f;
+        }
         case e_print: {
             double x = eval_expr(p, e->param[0]);
             int level = e->param[1] ? av_clip(eval_expr(p, e->param[1]), INT_MIN, INT_MAX) : AV_LOG_INFO;
@@ -456,6 +462,7 @@ static int parse_primary(AVExpr **e, Parser *p)
     else if (strmatch(next, "between"))d->type = e_between;
     else if (strmatch(next, "clip"  )) d->type = e_clip;
     else if (strmatch(next, "atan2" )) d->type = e_atan2;
+    else if (strmatch(next, "lerp"  )) d->type = e_lerp;
     else {
         for (i=0; p->func1_names && p->func1_names[i]; i++) {
             if (strmatch(next, p->func1_names[i])) {
@@ -654,6 +661,7 @@ static int verify_expr(AVExpr *e)
                    && (!e->param[2] || verify_expr(e->param[2]));
         case e_between:
         case e_clip:
+        case e_lerp:
             return verify_expr(e->param[0]) &&
                    verify_expr(e->param[1]) &&
                    verify_expr(e->param[2]);



More information about the ffmpeg-cvslog mailing list