Output input frames as soon as possible, don't wait to have two frames.
---
libavfilter/vf_fps.c | 59 ++++++++++++++++++++++++++++++++------------------
1 file changed, 38 insertions(+), 21 deletions(-)
diff --git a/libavfilter/vf_fps.c b/libavfilter/vf_fps.c
index 18cd51a..09e0165 100644
--- a/libavfilter/vf_fps.c
+++ b/libavfilter/vf_fps.c
@@ -123,6 +123,20 @@ static int config_props(AVFilterLink* link)
return 0;
}
+static void draw_frame(AVFilterContext *ctx, AVFilterBufferRef *buf)
+{
+ AVFilterLink *outlink = ctx->outputs[0], *inlink = ctx->inputs[0];
+ FPSContext *s = ctx->priv;
+
+ buf->pts = av_rescale_q(s->first_pts, inlink->time_base,
outlink->time_base)
+ + s->frames_out;
+
+ ff_start_frame(outlink, buf);
+ ff_draw_slice(outlink, 0, outlink->h, 1);
+ ff_end_frame(outlink);
+ s->frames_out++;
+}
+
static int request_frame(AVFilterLink *outlink)
{
AVFilterContext *ctx = outlink->src;
@@ -140,13 +154,10 @@ static int request_frame(AVFilterLink *outlink)
AVFilterBufferRef *buf;
av_fifo_generic_read(s->fifo, &buf, sizeof(buf), NULL);
- buf->pts = av_rescale_q(s->first_pts, ctx->inputs[0]->time_base,
- outlink->time_base) + s->frames_out;
- ff_start_frame(outlink, buf);
- ff_draw_slice(outlink, 0, outlink->h, 1);
- ff_end_frame(outlink);
- s->frames_out++;
+ /* skip the first frame in the fifo, it was already output */
+ if (i) draw_frame(ctx, buf);
+ else avfilter_unref_buffer(buf);
}
return 0;
}
@@ -154,14 +165,25 @@ static int request_frame(AVFilterLink *outlink)
return ret;
}
-static int write_to_fifo(AVFifoBuffer *fifo, AVFilterBufferRef *buf)
+static int write_to_fifo(AVFilterContext *ctx, AVFilterLink *inlink,
+ AVFilterBufferRef *buf, int draw)
{
+ FPSContext *s = ctx->priv;
+ AVFifoBuffer *fifo = s->fifo;
int ret;
if (!av_fifo_space(fifo) &&
(ret = av_fifo_realloc2(fifo, 2*av_fifo_size(fifo))))
return ret;
+ /*
+ * if the fifo is empty, draw an output frame immediately.
+ * it would have been emitted later anyway, so avoid pointless
+ * delay
+ */
+ if (draw)
+ draw_frame(ctx, avfilter_ref_buffer(buf, AV_PERM_READ));
+
av_fifo_generic_write(fifo, &buf, sizeof(buf), NULL);
return 0;
}
@@ -179,7 +201,7 @@ static void end_frame(AVFilterLink *inlink)
/* discard frames until we get the first timestamp */
if (s->pts == AV_NOPTS_VALUE) {
if (buf->pts != AV_NOPTS_VALUE) {
- write_to_fifo(s->fifo, buf);
+ write_to_fifo(ctx, inlink, buf, 1);
s->first_pts = s->pts = buf->pts;
} else {
av_log(ctx, AV_LOG_WARNING, "Discarding initial frame(s) with no "
@@ -192,7 +214,7 @@ static void end_frame(AVFilterLink *inlink)
/* now wait for the next timestamp */
if (buf->pts == AV_NOPTS_VALUE) {
- write_to_fifo(s->fifo, buf);
+ write_to_fifo(ctx, inlink, buf, 0);
return;
}
@@ -210,36 +232,31 @@ static void end_frame(AVFilterLink *inlink)
av_fifo_generic_read(s->fifo, &tmp, sizeof(tmp), NULL);
flush_fifo(s->fifo);
- write_to_fifo(s->fifo, tmp);
+ write_to_fifo(ctx, inlink, tmp, 0);
avfilter_unref_buffer(buf);
return;
}
- /* can output >= 1 frames */
- for (i = 0; i < delta; i++) {
+ /* can output >= 1 frames; the first frame has already been output,
+ * so just handle > 1 here */
+ for (i = 1; i < delta; i++) {
AVFilterBufferRef *buf_out;
av_fifo_generic_read(s->fifo, &buf_out, sizeof(buf_out), NULL);
/* duplicate the frame if needed */
if (!av_fifo_size(s->fifo) && i < delta - 1) {
av_log(ctx, AV_LOG_DEBUG, "Duplicating frame.\n");
- write_to_fifo(s->fifo, avfilter_ref_buffer(buf_out, AV_PERM_READ));
+ write_to_fifo(ctx, inlink, avfilter_ref_buffer(buf_out,
AV_PERM_READ), 0);
s->dup++;
}
- buf_out->pts = av_rescale_q(s->first_pts, inlink->time_base,
- outlink->time_base) + s->frames_out;
-
- ff_start_frame(outlink, buf_out);
- ff_draw_slice(outlink, 0, outlink->h, 1);
- ff_end_frame(outlink);
- s->frames_out++;
+ draw_frame(ctx, buf_out);
}
flush_fifo(s->fifo);
- write_to_fifo(s->fifo, buf);
s->pts = s->first_pts + av_rescale_q(s->frames_out, outlink->time_base,
inlink->time_base);
+ write_to_fifo(ctx, inlink, buf, 1);
}
static void null_start_frame(AVFilterLink *link, AVFilterBufferRef *buf)
--
1.7.10
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
