From 0eb56fe30b46a1d18f59358eec86c4eed62524c3 Mon Sep 17 00:00:00 2001 From: Calvin Walton Date: Fri, 21 Jun 2019 09:08:03 -0400 Subject: [PATCH] vf_drawtext: Add pkt_pos, pkt_duration, pkt_size as variables Info at https://trac.ffmpeg.org/ticket/7947 Changes to vf_drawtext.c written by Calvin Walton Changes to filters.texi written by greg Luce with lots of help from Moritz Barsnick and Gyan --- doc/filters.texi | 12 ++++++++++++ libavfilter/version.h | 2 +- libavfilter/vf_drawtext.c | 9 +++++++++ 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/doc/filters.texi b/doc/filters.texi index 2d9af46a6b..9236569847 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -8966,6 +8966,18 @@ to each other, so you can for example specify @code{y=x/dar}. @item pict_type A one character description of the current frame's picture type. + +@item pkt_pos +The current packet's position in the datastream +(in bytes from the head of the source file). + +A value of -1 indicates this info is not available. + +@item pkt_duration +The current packet's duration. + +@item pkt_size +The current packet's size (in bytes). @end table @anchor{drawtext_expansion} diff --git a/libavfilter/version.h b/libavfilter/version.h index 91a5a1604e..c0a4b969f1 100644 --- a/libavfilter/version.h +++ b/libavfilter/version.h @@ -31,7 +31,7 @@ #define LIBAVFILTER_VERSION_MAJOR 7 #define LIBAVFILTER_VERSION_MINOR 55 -#define LIBAVFILTER_VERSION_MICRO 100 +#define LIBAVFILTER_VERSION_MICRO 101 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ LIBAVFILTER_VERSION_MINOR, \ diff --git a/libavfilter/vf_drawtext.c b/libavfilter/vf_drawtext.c index 01cd7fa122..8f4badbdb5 100644 --- a/libavfilter/vf_drawtext.c +++ b/libavfilter/vf_drawtext.c @@ -88,6 +88,9 @@ static const char *const var_names[] = { "x", "y", "pict_type", + "pkt_pos", + "pkt_duration", + "pkt_size", NULL }; @@ -125,6 +128,9 @@ enum var_name { VAR_X, VAR_Y, VAR_PICT_TYPE, + VAR_PKT_POS, + VAR_PKT_DURATION, + VAR_PKT_SIZE, VAR_VARS_NB }; @@ -1516,6 +1522,9 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame) NAN : frame->pts * av_q2d(inlink->time_base); s->var_values[VAR_PICT_TYPE] = frame->pict_type; + s->var_values[VAR_PKT_POS] = frame->pkt_pos; + s->var_values[VAR_PKT_DURATION] = frame->pkt_duration * av_q2d(inlink->time_base); + s->var_values[VAR_PKT_SIZE] = frame->pkt_size; s->metadata = frame->metadata; draw_text(ctx, frame, frame->width, frame->height); -- 2.22.0.windows.1