RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avfilter/metadata: add intuitive labels for metadata values

This commit is contained in:
Gyan Doshi 2021-05-14 15:50:30 +05:30
parent bc40cd6214
commit f53414a038
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/filters.texi
View File

@ -25296,10 +25296,10 @@ The expression is evaluated through the eval API and can contain the following
constants: constants:
@table @option @table @option
@item VALUE1 @item VALUE1, FRAMEVAL
Float representation of @code{value} from metadata key. Float representation of @code{value} from metadata key.
@item VALUE2 @item VALUE2, USERVAL
Float representation of @code{value} as supplied by user in @code{value} option. Float representation of @code{value} as supplied by user in @code{value} option.
@end table @end table

8
libavfilter/f_metadata.c
View File

@ -61,12 +61,16 @@ enum MetadataFunction {
static const char *const var_names[] = { static const char *const var_names[] = {
"VALUE1", "VALUE1",
"VALUE2", "VALUE2",
"FRAMEVAL",
"USERVAL",
NULL NULL
}; };
enum var_name { enum var_name {
VAR_VALUE1, VAR_VALUE1,
VAR_VALUE2, VAR_VALUE2,
VAR_FRAMEVAL,
VAR_USERVAL,
VAR_VARS_NB VAR_VARS_NB
}; };
@ -172,8 +176,8 @@ static int parse_expr(MetadataContext *s, const char *value1, const char *value2
if (sscanf(value1, "%lf", &f1) + sscanf(value2, "%lf", &f2) != 2) if (sscanf(value1, "%lf", &f1) + sscanf(value2, "%lf", &f2) != 2)
return 0; return 0;
s->var_values[VAR_VALUE1] = f1; s->var_values[VAR_VALUE1] = s->var_values[VAR_FRAMEVAL] = f1;
s->var_values[VAR_VALUE2] = f2; s->var_values[VAR_VALUE2] = s->var_values[VAR_USERVAL] = f2;
return av_expr_eval(s->expr, s->var_values, NULL); return av_expr_eval(s->expr, s->var_values, NULL);
} }