Merge commit '95f1f56a21bc2f824af6fb97ca7ab35cdd0c401e'

* commit '95f1f56a21bc2f824af6fb97ca7ab35cdd0c401e': vf_select: switch to an AVOptions-based system. Conflicts: doc/filters.texi libavfilter/f_select.c

Michael Niedermayer committed 13 years ago

Commit b3fb2d82 parents 7e99ccf 95f1f563 files · +30 −21Browse files

Unified · Split

3 files

doc/filters.texi +10 −8
libavfilter/avfilter.c +1 −0
libavfilter/f_select.c +19 −13

doc/filters.texi+10−8

@@ -6421,14 +6421,16 @@ It accepts the following values: · 6420 unmodified lines
6421	@section aselect, select	6421	@section aselect, select
6422	Select frames to pass in output.	6422	Select frames to pass in output.
6423		6423
6424	These filters accept a single option @option{expr} or @option{e}	6424	This filter accepts the following options:
6425	specifying the select expression, which can be specified either by	6425
6426	specyfing @code{expr=VALUE} or specifying the expression	6426	@table @option
6427	alone.	6427
6428		6428	@item expr
6429	The select expression is evaluated for each input frame. If the	6429	An expression, which is evaluated for each input frame. If the expression is
6430	evaluation result is a non-zero value, the frame is selected and	6430	evaluated to a non-zero value, the frame is selected and passed to the output,
6431	passed to the output, otherwise it is discarded.	6431	otherwise it is discarded.
		6432
		6433	@end table
6432		6434
6433	The expression can contain the following constants:	6435	The expression can contain the following constants:
6434		6436

libavfilter/avfilter.c+1−0

@@ -682,6 +682,7 @@ int avfilter_init_filter(AVFilterContext filter, const char args, void *opaque · 681 unmodified lines
682	!strcmp(filter->filter->name, "noformat") \|\|	682	!strcmp(filter->filter->name, "noformat") \|\|
683	!strcmp(filter->filter->name, "resample") \|\|	683	!strcmp(filter->filter->name, "resample") \|\|
684	// !strcmp(filter->filter->name, "scale" ) \|\|	684	// !strcmp(filter->filter->name, "scale" ) \|\|
		685	!strcmp(filter->filter->name, "select") \|\|
685	0	686	0
686	;	687	;
687		688

libavfilter/f_select.c+19−13

 typedef struct {
     const AVClass *class;
-    AVExpr *expr;
     char *expr_str;
+    AVExpr *expr;
     double var_values[VAR_VARS_NB];
     int do_scene_detect;            ///< 1 if the expression requires scene detection variables, 0 otherwise
 #if CONFIG_AVCODEC
     double select;
 } SelectContext;
-#define OFFSET(x) offsetof(SelectContext, x)
-#define FLAGS AV_OPT_FLAG_FILTERING_PARAM
-static const AVOption options[] = {
-    { "expr", "set selection expression", OFFSET(expr_str), AV_OPT_TYPE_STRING, {.str = "1"}, 0, 0, FLAGS },
-    { "e",    "set selection expression", OFFSET(expr_str), AV_OPT_TYPE_STRING, {.str = "1"}, 0, 0, FLAGS },
-    {NULL},
-};
 static av_cold int init(AVFilterContext *ctx, const char *args, const AVClass *class)
 {
     if ((ret = av_expr_parse(&select->expr, select->expr_str,
                              var_names, NULL, NULL, NULL, NULL, 0, ctx)) < 0) {
-        av_log(ctx, AV_LOG_ERROR, "Error while parsing expression '%s'\n", select->expr_str);
+        av_log(ctx, AV_LOG_ERROR, "Error while parsing expression '%s'\n",
+               select->expr_str);
         return ret;
     }
     select->do_scene_detect = !!strstr(select->expr_str, "scene");
 #if CONFIG_ASELECT_FILTER
-#define aselect_options options
+#define OFFSET(x) offsetof(SelectContext, x)
+#define AFLAGS AV_OPT_FLAG_FILTERING_PARAM | AV_OPT_FLAG_AUDIO_PARAM
+static const AVOption aselect_options[] = {
+    { "expr", "An expression to use for selecting frames", OFFSET(expr_str), AV_OPT_TYPE_STRING, { .str = "1" }, .flags = AFLAGS },
+    { "e",    "An expression to use for selecting frames", OFFSET(expr_str), AV_OPT_TYPE_STRING, { .str = "1" }, .flags = AFLAGS },
+    { NULL },
+};
 AVFILTER_DEFINE_CLASS(aselect);
 static av_cold int aselect_init(AVFilterContext *ctx, const char *args)
 #if CONFIG_SELECT_FILTER
-#define select_options options
+#define OFFSET(x) offsetof(SelectContext, x)
+#define FLAGS AV_OPT_FLAG_FILTERING_PARAM | AV_OPT_FLAG_VIDEO_PARAM
+static const AVOption select_options[] = {
+    { "expr", "An expression to use for selecting frames", OFFSET(expr_str), AV_OPT_TYPE_STRING, { .str = "1" }, .flags = FLAGS },
+    { "e",    "An expression to use for selecting frames", OFFSET(expr_str), AV_OPT_TYPE_STRING, { .str = "1" }, .flags = FLAGS },
+    { NULL },
+};
 AVFILTER_DEFINE_CLASS(select);
 static av_cold int select_init(AVFilterContext *ctx, const char *args)
     .query_formats = query_formats,
     .priv_size = sizeof(SelectContext),
+    .priv_class = &select_class,
     .inputs    = avfilter_vf_select_inputs,
     .outputs   = avfilter_vf_select_outputs,
-    .priv_class = &select_class,
-    .shorthand  = shorthand,
 };
 #endif /* CONFIG_SELECT_FILTER */

Merge commit '95f1f56a21bc2f824af6fb97ca7ab35cdd0c401e'

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code