virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

avfilter/vf_zoompan: fix pts handling

Browse Source 
Now output pts have some sense.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
This commit is contained in:
Paul B Mahol
2016-01-24 19:57:56 +01:00
parent 8a34344379
commit f42eae96b2
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
doc/filters.texi
View File

@@ -12582,6 +12582,9 @@ single input image.
@item s @item s
Set the output image size, default is 'hd720'. Set the output image size, default is 'hd720'.
@item fps
Set the output frame rate, default is '25'.
@end table @end table
Each expression can contain the following constants: Each expression can contain the following constants:

7
libavfilter/vf_zoompan.c
View File

@@ -92,6 +92,7 @@ typedef struct ZPcontext {
int nb_frames; int nb_frames;
int current_frame; int current_frame;
int finished; int finished;
AVRational framerate;
} ZPContext; } ZPContext;
#define OFFSET(x) offsetof(ZPContext, x) #define OFFSET(x) offsetof(ZPContext, x)
@@ -103,6 +104,7 @@ static const AVOption zoompan_options[] = {
{ "y", "set the y expression", OFFSET(y_expr_str), AV_OPT_TYPE_STRING, {.str="0"}, .flags = FLAGS }, { "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 }, { "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 }, { "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 } { NULL }
}; };
@@ -123,6 +125,8 @@ static int config_output(AVFilterLink *outlink)
outlink->w = s->w; outlink->w = s->w;
outlink->h = s->h; 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); s->desc = av_pix_fmt_desc_get(outlink->format);
return 0; return 0;
@@ -133,8 +137,7 @@ static int output_single_frame(AVFilterContext *ctx, AVFrame *in, double *var_va
{ {
ZPContext *s = ctx->priv; ZPContext *s = ctx->priv;
AVFilterLink *outlink = ctx->outputs[0]; 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; int k, x, y, w, h, ret = 0;
uint8_t *input[4]; uint8_t *input[4];
int px[4], py[4]; int px[4], py[4];