vf_select: switch to an AVOptions-based system.

Anton Khirnov committed 13 years ago

Commit 95f1f561 parent 40c885c2 files · +34 −8Browse files

Unified · Split

2 files

doc/filters.texi +13 −6
libavfilter/vf_select.c +21 −2

@@ -1742,9 +1742,16 @@ scale=w='min(500\, iw*3/2):h=-1' · 1741 unmodified lines
1742	@section select	1742	@section select
1743	Select frames to pass in output.	1743	Select frames to pass in output.
1744		1744
1745	It accepts in input an expression, which is evaluated for each input	1745	This filter accepts the following options:
1746	frame. If the expression is evaluated to a non-zero value, the frame	1746
1747	is selected and passed to the output, otherwise it is discarded.	1747	@table @option
		1748
		1749	@item expr
		1750	An expression, which is evaluated for each input frame. If the expression is
		1751	evaluated to a non-zero value, the frame is selected and passed to the output,
		1752	otherwise it is discarded.
		1753
		1754	@end table
1748		1755
1749	The expression can contain the following constants:	1756	The expression can contain the following constants:
1750		1757
@@ -1831,13 +1838,13 @@ Some examples follow: · 80 unmodified lines
1831	select	1838	select
1832		1839
1833	# the above is the same as:	1840	# the above is the same as:
1834	select=1	1841	select=expr=1
1835		1842
1836	# skip all frames:	1843	# skip all frames:
1837	select=0	1844	select=expr=0
1838		1845
1839	# select only I-frames	1846	# select only I-frames
1840	select='eq(pict_type\,I)'	1847	select='expr=eq(pict_type\,I)'
1841		1848
1842	# select one frame every 100	1849	# select one frame every 100
1843	select='not(mod(n\,100))'	1850	select='not(mod(n\,100))'

libavfilter/vf_select.c+21−2

 #include "libavutil/fifo.h"
 #include "libavutil/internal.h"
 #include "libavutil/mathematics.h"
+#include "libavutil/opt.h"
 #include "avfilter.h"
 #include "internal.h"
 #include "video.h"
 #define FIFO_SIZE 8
 typedef struct {
+    const AVClass *class;
+    char *expr_str;
     AVExpr *expr;
     double var_values[VAR_VARS_NB];
     double select;
     SelectContext *select = ctx->priv;
     int ret;
-    if ((ret = av_expr_parse(&select->expr, args ? args : "1",
+    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", args);
+        av_log(ctx, AV_LOG_ERROR, "Error while parsing expression '%s'\n",
+               select->expr_str);
         return ret;
     }
     select->pending_frames = NULL;
 }
+#define OFFSET(x) offsetof(SelectContext, x)
+#define FLAGS AV_OPT_FLAG_VIDEO_PARAM
+static const AVOption options[] = {
+    { "expr", "An expression to use for selecting frames", OFFSET(expr_str), AV_OPT_TYPE_STRING, { .str = "1" }, .flags = FLAGS },
+    { NULL },
+};
+static const AVClass select_class = {
+    .class_name = "select",
+    .item_name  = av_default_item_name,
+    .option     = options,
+    .version    = LIBAVUTIL_VERSION_INT,
+};
 static const AVFilterPad avfilter_vf_select_inputs[] = {
     {
         .name             = "default",
     .uninit    = uninit,
     .priv_size = sizeof(SelectContext),
+    .priv_class = &select_class,
     .inputs    = avfilter_vf_select_inputs,
     .outputs   = avfilter_vf_select_outputs,

vf_select: switch to an AVOptions-based system.

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code