From 7727be79d1eeb24501459c49329ccad90161f459 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Mon, 18 Mar 2013 22:32:39 +0100 Subject: [PATCH 1/3] vf_fps: move initializing pts from config_props to init. It should not be reinitialized if the link properties change. --- libavfilter/vf_fps.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavfilter/vf_fps.c b/libavfilter/vf_fps.c index eb201fa898..7f5175248c 100644 --- a/libavfilter/vf_fps.c +++ b/libavfilter/vf_fps.c @@ -77,6 +77,8 @@ static av_cold int init(AVFilterContext *ctx) if (!(s->fifo = av_fifo_alloc(2*sizeof(AVFrame*)))) return AVERROR(ENOMEM); + s->pts = AV_NOPTS_VALUE; + av_log(ctx, AV_LOG_VERBOSE, "fps=%d/%d\n", s->framerate.num, s->framerate.den); return 0; } @@ -110,7 +112,6 @@ static int config_props(AVFilterLink* link) link->time_base = (AVRational){ s->framerate.den, s->framerate.num }; link->w = link->src->inputs[0]->w; link->h = link->src->inputs[0]->h; - s->pts = AV_NOPTS_VALUE; return 0; } From 90d9a2a04c3fb49f077209cdd72dcac862f37211 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Mon, 18 Mar 2013 22:07:10 +0100 Subject: [PATCH 2/3] vf_drawtext: do not reset the frame number in config_input. Frame number should be incremented normally even if the link properties change. --- libavfilter/vf_drawtext.c | 1 - 1 file changed, 1 deletion(-) diff --git a/libavfilter/vf_drawtext.c b/libavfilter/vf_drawtext.c index ab867be4eb..2989bd5034 100644 --- a/libavfilter/vf_drawtext.c +++ b/libavfilter/vf_drawtext.c @@ -569,7 +569,6 @@ static int config_input(AVFilterLink *inlink) s->var_values[VAR_X] = 0; s->var_values[VAR_Y] = 0; - s->var_values[VAR_N] = 0; s->var_values[VAR_T] = NAN; av_lfg_init(&s->prng, av_get_random_seed()); From 4c205f42c86ccefa093c59434669af34ad14a52b Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Mon, 18 Mar 2013 21:31:54 +0100 Subject: [PATCH 3/3] vf_drawbox: make config_props work properly when called multiple times. Do not overwrite the variables set through AVOptions. --- libavfilter/vf_drawbox.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libavfilter/vf_drawbox.c b/libavfilter/vf_drawbox.c index ab4537a40e..773aa01548 100644 --- a/libavfilter/vf_drawbox.c +++ b/libavfilter/vf_drawbox.c @@ -38,7 +38,7 @@ enum { Y, U, V, A }; typedef struct { const AVClass *class; - int x, y, w, h; + int x, y, w_opt, h_opt, w, h; char *color_str; unsigned char yuv_color[4]; int vsub, hsub; ///< chroma subsampling @@ -82,8 +82,8 @@ static int config_input(AVFilterLink *inlink) s->hsub = desc->log2_chroma_w; s->vsub = desc->log2_chroma_h; - if (s->w == 0) s->w = inlink->w; - if (s->h == 0) s->h = inlink->h; + s->w = (s->w_opt > 0) ? s->w_opt : inlink->w; + s->h = (s->h_opt > 0) ? s->h_opt : inlink->h; av_log(inlink->dst, AV_LOG_VERBOSE, "x:%d y:%d w:%d h:%d color:0x%02X%02X%02X%02X\n", s->w, s->y, s->w, s->h, @@ -125,8 +125,8 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame) static const AVOption options[] = { { "x", "Horizontal position of the left box edge", OFFSET(x), AV_OPT_TYPE_INT, { .i64 = 0 }, INT_MIN, INT_MAX, FLAGS }, { "y", "Vertical position of the top box edge", OFFSET(y), AV_OPT_TYPE_INT, { .i64 = 0 }, INT_MIN, INT_MAX, FLAGS }, - { "width", "Width of the box", OFFSET(w), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, FLAGS }, - { "height", "Height of the box", OFFSET(h), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, FLAGS }, + { "width", "Width of the box", OFFSET(w_opt), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, FLAGS }, + { "height", "Height of the box", OFFSET(h_opt), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, FLAGS }, { "color", "Color of the box", OFFSET(color_str), AV_OPT_TYPE_STRING, { .str = "black" }, .flags = FLAGS }, { NULL }, };