generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lavfi/overlay: improve feedback in case of invalid expression

Browse Source 
Based on vf_hue.c code.
This commit is contained in:
Stefano Sabatini 2013-04-12 00:06:52 +02:00
parent fdedfc029b
commit 9da369604e
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libavfilter/vf_overlay.c
View File

@ -167,7 +167,7 @@ static void eval_expr(AVFilterContext *ctx, enum EvalTarget eval_tgt)
} }
} }
static int set_expr(AVExpr **pexpr, const char *expr, void *log_ctx) static int set_expr(AVExpr **pexpr, const char *expr, const char *option, void *log_ctx)
{ {
int ret; int ret;
AVExpr *old = NULL; AVExpr *old = NULL;
@ -178,7 +178,8 @@ static int set_expr(AVExpr **pexpr, const char *expr, void *log_ctx)
NULL, NULL, NULL, NULL, 0, log_ctx); NULL, NULL, NULL, NULL, 0, log_ctx);
if (ret < 0) { if (ret < 0) {
av_log(log_ctx, AV_LOG_ERROR, av_log(log_ctx, AV_LOG_ERROR,
"Error when evaluating the expression '%s'\n", expr); "Error when evaluating the expression '%s' for %s\n",
expr, option);
*pexpr = old; *pexpr = old;
return ret; return ret;
} }
@ -194,11 +195,11 @@ static int process_command(AVFilterContext *ctx, const char *cmd, const char *ar
int ret; int ret;
if (!strcmp(cmd, "x")) if (!strcmp(cmd, "x"))
ret = set_expr(&over->x_pexpr, args, ctx); ret = set_expr(&over->x_pexpr, args, cmd, ctx);
else if (!strcmp(cmd, "y")) else if (!strcmp(cmd, "y"))
ret = set_expr(&over->y_pexpr, args, ctx); ret = set_expr(&over->y_pexpr, args, cmd, ctx);
else if (!strcmp(cmd, "enable")) else if (!strcmp(cmd, "enable"))
ret = set_expr(&over->enable_pexpr, args, ctx); ret = set_expr(&over->enable_pexpr, args, cmd, ctx);
else else
ret = AVERROR(ENOSYS); ret = AVERROR(ENOSYS);
@ -318,9 +319,9 @@ static int config_input_overlay(AVFilterLink *inlink)
over->var_values[VAR_T] = NAN; over->var_values[VAR_T] = NAN;
over->var_values[VAR_POS] = NAN; over->var_values[VAR_POS] = NAN;
if ((ret = set_expr(&over->x_pexpr, over->x_expr, ctx)) < 0 || if ((ret = set_expr(&over->x_pexpr, over->x_expr, "x", ctx)) < 0 ||
(ret = set_expr(&over->y_pexpr, over->y_expr, ctx)) < 0 || (ret = set_expr(&over->y_pexpr, over->y_expr, "y", ctx)) < 0 ||
(ret = set_expr(&over->enable_pexpr, over->enable_expr, ctx)) < 0) (ret = set_expr(&over->enable_pexpr, over->enable_expr, "enable", ctx)) < 0)
return ret; return ret;
over->overlay_is_packed_rgb = over->overlay_is_packed_rgb =