Commit a8fb8f61 authored by Michael Niedermayer's avatar Michael Niedermayer

avfilter/vf_qp: split expression parsing out of loop

Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 625bd463
...@@ -50,26 +50,31 @@ static int config_input(AVFilterLink *inlink) ...@@ -50,26 +50,31 @@ static int config_input(AVFilterLink *inlink)
AVFilterContext *ctx = inlink->dst; AVFilterContext *ctx = inlink->dst;
QPContext *s = ctx->priv; QPContext *s = ctx->priv;
int i; int i;
int ret;
AVExpr *e = NULL;
static const char *var_names[] = { "known", "qp", NULL };
if (!s->qp_expr_str) if (!s->qp_expr_str)
return 0; return 0;
ret = av_expr_parse(&e, s->qp_expr_str, var_names, NULL, NULL, NULL, NULL, 0, ctx);
if (ret < 0)
return ret;
s->h = (inlink->h + 15) >> 4; s->h = (inlink->h + 15) >> 4;
s->qstride = (inlink->w + 15) >> 4; s->qstride = (inlink->w + 15) >> 4;
for (i = -129; i < 128; i++) { for (i = -129; i < 128; i++) {
double var_values[] = { i != -129, i, 0 }; double var_values[] = { i != -129, i, 0};
static const char *var_names[] = { "known", "qp", NULL }; double temp_val = av_expr_eval(e, var_values, NULL);
double temp_val;
int ret;
ret = av_expr_parse_and_eval(&temp_val, s->qp_expr_str, if (isnan(temp_val)) {
var_names, var_values, av_expr_free(e);
NULL, NULL, NULL, NULL, 0, 0, ctx); return AVERROR(EINVAL);
if (ret < 0) }
return ret;
s->lut[i + 129] = lrintf(temp_val); s->lut[i + 129] = lrintf(temp_val);
} }
av_expr_free(e);
return 0; return 0;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment