[FFmpeg-cvslog] avfilter/vf_tile: add init_padding option
Paul B Mahol
git at videolan.org
Fri Dec 1 11:57:54 EET 2017
ffmpeg | branch: master | Paul B Mahol <onemda at gmail.com> | Fri Nov 17 21:33:37 2017 +0100| [2cfc8b172ce767928a6394e066cb0b2789efd395] | committer: Paul B Mahol
avfilter/vf_tile: add init_padding option
Signed-off-by: Paul B Mahol <onemda at gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2cfc8b172ce767928a6394e066cb0b2789efd395
---
doc/filters.texi | 5 +++++
libavfilter/vf_tile.c | 12 +++++++++++-
2 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/doc/filters.texi b/doc/filters.texi
index 4a4efc70c8..ec37b9dcb8 100644
--- a/doc/filters.texi
+++ b/doc/filters.texi
@@ -14637,6 +14637,11 @@ is "black".
@item overlap
Set the number of frames to overlap when tiling several successive frames together.
The value must be between @code{0} and @var{nb_frames - 1}.
+
+ at item init_padding
+Set the number of frames to initially be empty before displaying first output frame.
+This controls how soon will one get first output frame.
+The value must be between @code{0} and @var{nb_frames - 1}.
@end table
@subsection Examples
diff --git a/libavfilter/vf_tile.c b/libavfilter/vf_tile.c
index 7717ce12e7..439689a14d 100644
--- a/libavfilter/vf_tile.c
+++ b/libavfilter/vf_tile.c
@@ -38,6 +38,7 @@ typedef struct TileContext {
unsigned margin;
unsigned padding;
unsigned overlap;
+ unsigned init_padding;
unsigned current;
unsigned nb_frames;
FFDrawContext draw;
@@ -62,6 +63,8 @@ static const AVOption tile_options[] = {
{ "color", "set the color of the unused area", OFFSET(rgba_color), AV_OPT_TYPE_COLOR, {.str = "black"}, .flags = FLAGS },
{ "overlap", "set how many frames to overlap for each render", OFFSET(overlap),
AV_OPT_TYPE_INT, {.i64 = 0}, 0, INT_MAX, FLAGS },
+ { "init_padding", " set how many frames to initially pad", OFFSET(init_padding),
+ AV_OPT_TYPE_INT, {.i64 = 0}, 0, INT_MAX, FLAGS },
{ NULL }
};
@@ -99,6 +102,12 @@ static av_cold int init(AVFilterContext *ctx)
tile->overlap = tile->nb_frames - 1;
}
+ if (tile->init_padding >= tile->nb_frames) {
+ av_log(ctx, AV_LOG_WARNING, "init_padding must be less than %d\n", tile->nb_frames);
+ } else {
+ tile->current = tile->init_padding;
+ }
+
return 0;
}
@@ -201,11 +210,12 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *picref)
tile->out_ref->height = outlink->h;
/* fill surface once for margin/padding */
- if (tile->margin || tile->padding)
+ if (tile->margin || tile->padding || tile->init_padding)
ff_fill_rectangle(&tile->draw, &tile->blank,
tile->out_ref->data,
tile->out_ref->linesize,
0, 0, outlink->w, outlink->h);
+ tile->init_padding = 0;
}
if (tile->prev_out_ref) {
More information about the ffmpeg-cvslog
mailing list