virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

lavfi/framestep: switch to an AVOptions-based system

Browse Source 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
This commit is contained in:
Paul B Mahol
2013-04-11 00:03:23 +00:00
parent ac217bda30
commit f77db72965
3 changed files with 18 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
doc/filters.texi
View File

@@ -3216,10 +3216,14 @@ See also the @ref{setpts} filter.
@section framestep @section framestep
Select one frame every N. Select one frame every N-th frame.
This filter accepts in input a string representing a positive This filter accepts the following option:
integer. Default argument is @code{1}. @table @option
@item step
Select frame after every @code{step} frames.
Allowed values are positive integers higher than 0. Default value is @code{1}.
@end table
@anchor{frei0r} @anchor{frei0r}
@section frei0r @section frei0r

1
libavfilter/avfilter.c
View File

@@ -677,6 +677,7 @@ int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque
!strcmp(filter->filter->name, "field" ) || !strcmp(filter->filter->name, "field" ) ||
!strcmp(filter->filter->name, "fieldorder") || !strcmp(filter->filter->name, "fieldorder") ||
!strcmp(filter->filter->name, "fps" ) || !strcmp(filter->filter->name, "fps" ) ||
!strcmp(filter->filter->name, "framestep" ) ||
!strcmp(filter->filter->name, "frei0r" ) || !strcmp(filter->filter->name, "frei0r" ) ||
!strcmp(filter->filter->name, "frei0r_src") || !strcmp(filter->filter->name, "frei0r_src") ||
!strcmp(filter->filter->name, "geq" ) || !strcmp(filter->filter->name, "geq" ) ||

27
libavfilter/vf_framestep.c
View File

@@ -23,32 +23,25 @@
* Daniele Fornighieri <guru AT digitalfantasy it>. * Daniele Fornighieri <guru AT digitalfantasy it>.
*/ */
#include "libavutil/opt.h"
#include "avfilter.h" #include "avfilter.h"
#include "internal.h" #include "internal.h"
#include "video.h" #include "video.h"
typedef struct { typedef struct {
const AVClass *class;
int frame_step, frame_count, frame_selected; int frame_step, frame_count, frame_selected;
} FrameStepContext; } FrameStepContext;
static av_cold int init(AVFilterContext *ctx, const char *args) #define OFFSET(x) offsetof(FrameStepContext, x)
{ #define FLAGS AV_OPT_FLAG_FILTERING_PARAM|AV_OPT_FLAG_VIDEO_PARAM
FrameStepContext *framestep = ctx->priv;
char *tailptr;
long int n = 1;
if (args) { static const AVOption framestep_options[] = {
n = strtol(args, &tailptr, 10); { "step", "set frame step", OFFSET(frame_step), AV_OPT_TYPE_INT, {.i64=1}, 1, INT_MAX, FLAGS},
if (*tailptr || n <= 0 || n >= INT_MAX) { {NULL},
av_log(ctx, AV_LOG_ERROR, };
"Invalid argument '%s', must be a positive integer <= INT_MAX\n", args);
return AVERROR(EINVAL);
}
}
framestep->frame_step = n; AVFILTER_DEFINE_CLASS(framestep);
return 0;
}
static int config_output_props(AVFilterLink *outlink) static int config_output_props(AVFilterLink *outlink)
{ {
@@ -117,8 +110,8 @@ static const AVFilterPad framestep_outputs[] = {
AVFilter avfilter_vf_framestep = { AVFilter avfilter_vf_framestep = {
.name = "framestep", .name = "framestep",
.description = NULL_IF_CONFIG_SMALL("Select one frame every N frames."), .description = NULL_IF_CONFIG_SMALL("Select one frame every N frames."),
.init = init,
.priv_size = sizeof(FrameStepContext), .priv_size = sizeof(FrameStepContext),
.priv_class = &framestep_class,
.inputs = framestep_inputs, .inputs = framestep_inputs,
.outputs = framestep_outputs, .outputs = framestep_outputs,
}; };