virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

avfilter/f_sendcmd: add more useful variables

Browse Source
This commit is contained in:
Paul B Mahol 2020-03-13 17:19:33 +01:00
parent 86e599d9f4
commit 8f222573e9
2 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
doc/filters.texi
View File

@ -23711,6 +23711,15 @@ The count of the input frame for video or audio, starting from 0.
@item T @item T
The time in seconds of the current frame. The time in seconds of the current frame.
@item TS
The start time in seconds of the current command interval.
@item TE
The end time in seconds of the current command interval.
@item TI
The interpolated time of the current command interval, TI = (T - TS) / (TE - TS).
@end table @end table
@end table @end table

14
libavfilter/f_sendcmd.c
View File

@ -43,6 +43,9 @@ static const char *const var_names[] = {
"T", /* frame time in seconds */ "T", /* frame time in seconds */
"POS", /* original position in the file of the frame */ "POS", /* original position in the file of the frame */
"PTS", /* frame pts */ "PTS", /* frame pts */
"TS", /* interval start time in seconds */
"TE", /* interval end time in seconds */
"TI", /* interval interpolated value: TI = (T - TS) / (TE - TS) */
NULL NULL
}; };
@ -51,6 +54,9 @@ enum var_name {
VAR_T, VAR_T,
VAR_POS, VAR_POS,
VAR_PTS, VAR_PTS,
VAR_TS,
VAR_TE,
VAR_TI,
VAR_VARS_NB VAR_VARS_NB
}; };
@ -517,11 +523,17 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *ref)
if (cmd->flags & flags) { if (cmd->flags & flags) {
if (cmd->flags & COMMAND_FLAG_EXPR) { if (cmd->flags & COMMAND_FLAG_EXPR) {
double var_values[VAR_VARS_NB], res; double var_values[VAR_VARS_NB], res;
double start = TS2T(interval->start_ts, AV_TIME_BASE_Q);
double end = TS2T(interval->end_ts, AV_TIME_BASE_Q);
double current = TS2T(ref->pts, inlink->time_base);
var_values[VAR_N] = inlink->frame_count_in; var_values[VAR_N] = inlink->frame_count_in;
var_values[VAR_POS] = ref->pkt_pos == -1 ? NAN : ref->pkt_pos; var_values[VAR_POS] = ref->pkt_pos == -1 ? NAN : ref->pkt_pos;
var_values[VAR_PTS] = TS2D(ref->pts); var_values[VAR_PTS] = TS2D(ref->pts);
var_values[VAR_T] = TS2T(ref->pts, inlink->time_base); var_values[VAR_T] = current;
var_values[VAR_TS] = start;
var_values[VAR_TE] = end;
var_values[VAR_TI] = (current - start) / (end - start);
if ((ret = av_expr_parse_and_eval(&res, cmd->arg, var_names, var_values, if ((ret = av_expr_parse_and_eval(&res, cmd->arg, var_names, var_values,
NULL, NULL, NULL, NULL, NULL, 0, NULL)) < 0) { NULL, NULL, NULL, NULL, NULL, 0, NULL)) < 0) {