[FFmpeg-devel] [PATCH 01/14] lavfi: add common code to handle options parsing.

[Nicolas George]

Signed-off-by: Nicolas George <nicolas.george at normalesup.org>
---
 libavfilter/avfilter.c |   12 ++++++++++++
 libavfilter/avfilter.h |    8 ++++++++
 2 files changed, 20 insertions(+)


The next patches change a few filters (those I had time to do and know how
to test easily) to use this new feature

The overall diffstat is:
 15 files changed, 65 insertions(+), 117 deletions(-)


diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c
index 1d27817..83d2651 100644
--- a/libavfilter/avfilter.c
+++ b/libavfilter/avfilter.c
@@ -24,6 +24,7 @@
 #include "libavutil/channel_layout.h"
 #include "libavutil/common.h"
 #include "libavutil/imgutils.h"
+#include "libavutil/opt.h"
 #include "libavutil/pixdesc.h"
 #include "libavutil/rational.h"
 #include "libavutil/samplefmt.h"
@@ -600,6 +601,17 @@ int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque
 {
     int ret=0;
 
+    if (filter->filter->shorthand) {
+        av_assert0(filter->priv);
+        av_assert0(filter->filter->priv_class);
+        *(const AVClass **)filter->priv = filter->filter->priv_class;
+        av_opt_set_defaults(filter->priv);
+        ret = av_opt_set_from_string(filter->priv, args,
+                                     filter->filter->shorthand, "=", ":");
+        if (ret < 0)
+            return ret;
+        args = NULL;
+    }
     if (filter->filter->init_opaque)
         ret = filter->filter->init_opaque(filter, args, opaque);
     else if (filter->filter->init)
diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h
index 45ad6f9..f660a7a 100644
--- a/libavfilter/avfilter.h
+++ b/libavfilter/avfilter.h
@@ -486,6 +486,14 @@ typedef struct AVFilter {
     int (*init_opaque)(AVFilterContext *ctx, const char *args, void *opaque);
 
     const AVClass *priv_class;      ///< private class, containing filter specific options
+
+    /**
+     * Shorthand syntax for init arguments.
+     * If this field is set (even to an empty list), just before init the
+     * private class will be set and the arguments string will be parsed
+     * using av_opt_set_from_string() with "=" and ":" delimiters.
+     */
+    const char *const *shorthand;
 } AVFilter;
 
 /** An instance of a filter */
-- 
1.7.10.4