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

avfilter/f_drawgraph: add rate/r option

This commit is contained in:
Paul B Mahol 2020-01-14 09:52:02 +01:00
parent 9e01f171f3
commit d9a52b0bbf
2 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
doc/filters.texi
View File

@ -9321,6 +9321,9 @@ Set size of graph video. For the syntax of this option, check the
@ref{video size syntax,,"Video size" section in the ffmpeg-utils manual,ffmpeg-utils}. @ref{video size syntax,,"Video size" section in the ffmpeg-utils manual,ffmpeg-utils}.
The default value is @code{900x256}. The default value is @code{900x256}.
@item rate, r
Set the output frame rate. Default value is @code{25}.
The foreground color expressions can use the following variables: The foreground color expressions can use the following variables:
@table @option @table @option
@item MIN @item MIN

23
libavfilter/f_drawgraph.c
View File

@ -40,6 +40,7 @@ typedef struct DrawGraphContext {
int mode; int mode;
int slide; int slide;
int w, h; int w, h;
AVRational frame_rate;
AVFrame *out; AVFrame *out;
int x; int x;
@ -48,6 +49,7 @@ typedef struct DrawGraphContext {
float *values[4]; float *values[4];
int values_size[4]; int values_size[4];
int nb_values; int nb_values;
int64_t prev_pts;
} DrawGraphContext; } DrawGraphContext;
#define OFFSET(x) offsetof(DrawGraphContext, x) #define OFFSET(x) offsetof(DrawGraphContext, x)
@ -77,6 +79,8 @@ static const AVOption drawgraph_options[] = {
{"picture", "display graph in single frame", OFFSET(slide), AV_OPT_TYPE_CONST, {.i64=4}, 0, 0, FLAGS, "slide"}, {"picture", "display graph in single frame", OFFSET(slide), AV_OPT_TYPE_CONST, {.i64=4}, 0, 0, FLAGS, "slide"},
{ "size", "set graph size", OFFSET(w), AV_OPT_TYPE_IMAGE_SIZE, {.str="900x256"}, 0, 0, FLAGS }, { "size", "set graph size", OFFSET(w), AV_OPT_TYPE_IMAGE_SIZE, {.str="900x256"}, 0, 0, FLAGS },
{ "s", "set graph size", OFFSET(w), AV_OPT_TYPE_IMAGE_SIZE, {.str="900x256"}, 0, 0, FLAGS }, { "s", "set graph size", OFFSET(w), AV_OPT_TYPE_IMAGE_SIZE, {.str="900x256"}, 0, 0, FLAGS },
{ "rate", "set video rate", OFFSET(frame_rate), AV_OPT_TYPE_VIDEO_RATE, {.str="25"}, 0, INT_MAX, FLAGS },
{ "r", "set video rate", OFFSET(frame_rate), AV_OPT_TYPE_VIDEO_RATE, {.str="25"}, 0, INT_MAX, FLAGS },
{ NULL } { NULL }
}; };
@ -159,6 +163,8 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
AVDictionary *metadata; AVDictionary *metadata;
AVDictionaryEntry *e; AVDictionaryEntry *e;
AVFrame *out = s->out; AVFrame *out = s->out;
AVFrame *clone = NULL;
int64_t in_pts, out_pts;
int i; int i;
if (s->slide == 4 && s->nb_values >= s->values_size[0] / sizeof(float)) { if (s->slide == 4 && s->nb_values >= s->values_size[0] / sizeof(float)) {
@ -309,12 +315,24 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
s->nb_values++; s->nb_values++;
s->x++; s->x++;
in_pts = in->pts;
av_frame_free(&in); av_frame_free(&in);
if (s->slide == 4) if (s->slide == 4)
return 0; return 0;
return ff_filter_frame(outlink, av_frame_clone(s->out)); out_pts = av_rescale_q(in_pts, inlink->time_base, outlink->time_base);
if (out_pts == s->prev_pts)
return 0;
clone = av_frame_clone(s->out);
if (!clone)
return AVERROR(ENOMEM);
clone->pts = s->prev_pts = out_pts;
return ff_filter_frame(outlink, clone);
} }
static int request_frame(AVFilterLink *outlink) static int request_frame(AVFilterLink *outlink)
@ -406,6 +424,9 @@ static int config_output(AVFilterLink *outlink)
outlink->w = s->w; outlink->w = s->w;
outlink->h = s->h; outlink->h = s->h;
outlink->sample_aspect_ratio = (AVRational){1,1}; outlink->sample_aspect_ratio = (AVRational){1,1};
outlink->frame_rate = s->frame_rate;
outlink->time_base = av_inv_q(outlink->frame_rate);
s->prev_pts = AV_NOPTS_VALUE;
return 0; return 0;
} }