Commit 520c0736 authored by Paul B Mahol's avatar Paul B Mahol

avfilter/vf_shuffleframes: allow also dropping frames

Signed-off-by: 's avatarPaul B Mahol <onemda@gmail.com>
parent d1f3e475
...@@ -12285,7 +12285,7 @@ Set the size of the box used to represent one palette color entry. Default is ...@@ -12285,7 +12285,7 @@ Set the size of the box used to represent one palette color entry. Default is
@section shuffleframes @section shuffleframes
Reorder and/or duplicate video frames. Reorder and/or duplicate and/or drop video frames.
It accepts the following parameters: It accepts the following parameters:
...@@ -12294,6 +12294,7 @@ It accepts the following parameters: ...@@ -12294,6 +12294,7 @@ It accepts the following parameters:
Set the destination indexes of input frames. Set the destination indexes of input frames.
This is space or '|' separated list of indexes that maps input frames to output This is space or '|' separated list of indexes that maps input frames to output
frames. Number of indexes also sets maximal value that each index may have. frames. Number of indexes also sets maximal value that each index may have.
'-1' index have special meaning and that is to drop frame.
@end table @end table
The first frame has the index 0. The default is to keep the input unchanged. The first frame has the index 0. The default is to keep the input unchanged.
......
...@@ -68,7 +68,7 @@ static av_cold int init(AVFilterContext *ctx) ...@@ -68,7 +68,7 @@ static av_cold int init(AVFilterContext *ctx)
return AVERROR(EINVAL); return AVERROR(EINVAL);
} }
if (s->map[n] < 0 || s->map[n] >= nb_items) { if (s->map[n] < -1 || s->map[n] >= nb_items) {
av_log(ctx, AV_LOG_ERROR, "Index out of range.\n"); av_log(ctx, AV_LOG_ERROR, "Index out of range.\n");
av_free(mapping); av_free(mapping);
return AVERROR(EINVAL); return AVERROR(EINVAL);
...@@ -99,11 +99,13 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame) ...@@ -99,11 +99,13 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame)
AVFrame *out; AVFrame *out;
x = s->map[n]; x = s->map[n];
out = av_frame_clone(s->frames[x]); if (x >= 0) {
if (!out) out = av_frame_clone(s->frames[x]);
return AVERROR(ENOMEM); if (!out)
out->pts = s->pts[n]; return AVERROR(ENOMEM);
ret = ff_filter_frame(ctx->outputs[0], out); out->pts = s->pts[n];
ret = ff_filter_frame(ctx->outputs[0], out);
}
s->in_frames--; s->in_frames--;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment