avfilter/vf_zoompan: fix pts handling

Now output pts have some sense.

Paul B Mahol committed 10 years ago

Commit f42eae91 parent 8a343442 files · +8 −2Browse files

Unified · Split

2 files

@@ -12582,6 +12582,9 @@ single input image. · 12581 unmodified lines
12582		12582
12583	@item s	12583	@item s
12584	Set the output image size, default is 'hd720'.	12584	Set the output image size, default is 'hd720'.
		12585
		12586	@item fps
		12587	Set the output frame rate, default is '25'.
12585	@end table	12588	@end table
12586		12589
12587	Each expression can contain the following constants:	12590	Each expression can contain the following constants:

     int nb_frames;
     int current_frame;
     int finished;
+    AVRational framerate;
 } ZPContext;
 #define OFFSET(x) offsetof(ZPContext, x)
     { "y", "set the y expression", OFFSET(y_expr_str), AV_OPT_TYPE_STRING, {.str="0"}, .flags = FLAGS },
     { "d", "set the duration expression", OFFSET(duration_expr_str), AV_OPT_TYPE_STRING, {.str="90"}, .flags = FLAGS },
     { "s", "set the output image size", OFFSET(w), AV_OPT_TYPE_IMAGE_SIZE, {.str="hd720"}, .flags = FLAGS },
+    { "fps", "set the output framerate", OFFSET(framerate), AV_OPT_TYPE_VIDEO_RATE, { .str = "25" }, .flags = FLAGS },
     { NULL }
 };
     outlink->w = s->w;
     outlink->h = s->h;
+    outlink->time_base = av_inv_q(s->framerate);
+    outlink->frame_rate = s->framerate;
     s->desc = av_pix_fmt_desc_get(outlink->format);
     return 0;
 {
     ZPContext *s = ctx->priv;
     AVFilterLink *outlink = ctx->outputs[0];
-    int64_t pts = av_rescale_q(in->pts, ctx->inputs[0]->time_base,
+    int64_t pts = s->frame_count;
-                               outlink->time_base) + s->frame_count;
     int k, x, y, w, h, ret = 0;
     uint8_t *input[4];
     int px[4], py[4];

Keyboard shortcuts