[FFmpeg-devel] [PATCH] lavfi/transpose: add support to named options and shortands
Stefano Sabatini
stefasab at gmail.com
Sun Sep 30 13:47:03 CEST 2012
Allow extensibility.
---
doc/filters.texi | 10 ++++++++--
libavfilter/vf_transpose.c | 26 +++++++++++++++++---------
2 files changed, 25 insertions(+), 11 deletions(-)
diff --git a/doc/filters.texi b/doc/filters.texi
index 916aa6f..7ccab46 100644
--- a/doc/filters.texi
+++ b/doc/filters.texi
@@ -3519,8 +3519,12 @@ Default mode is @code{merge}.
Transpose rows with columns in the input video and optionally flip it.
-It accepts a parameter representing an integer, which can assume the
-values:
+This filter accepts the following named parameters:
+
+ at table @option
+
+ at item dir
+Specify the transposition direction. Can assume the following values:
@table @samp
@item 0, 4
@@ -3559,6 +3563,8 @@ l.r l.L
For values between 4-7 transposition is only done if the input video
geometry is portrait and not landscape.
+ at end table
+
@section unsharp
Sharpen or blur the input video.
diff --git a/libavfilter/vf_transpose.c b/libavfilter/vf_transpose.c
index 4161050..41ca062 100644
--- a/libavfilter/vf_transpose.c
+++ b/libavfilter/vf_transpose.c
@@ -28,6 +28,7 @@
#include <stdio.h>
#include "libavutil/intreadwrite.h"
+#include "libavutil/opt.h"
#include "libavutil/pixdesc.h"
#include "libavutil/imgutils.h"
#include "libavutil/internal.h"
@@ -37,6 +38,7 @@
#include "video.h"
typedef struct {
+ const AVClass *class;
int hsub, vsub;
int pixsteps[4];
@@ -48,20 +50,25 @@ typedef struct {
int passthrough; ///< landscape passthrough mode enabled
} TransContext;
+#define OFFSET(x) offsetof(TransContext, x)
+#define FLAGS AV_OPT_FLAG_FILTERING_PARAM|AV_OPT_FLAG_VIDEO_PARAM
+
+static const AVOption transpose_options[] = {
+ { "dir", "set transpose direction", OFFSET(dir), AV_OPT_TYPE_INT, {.i64=0}, 0, 7, FLAGS },
+ { NULL },
+};
+
+AVFILTER_DEFINE_CLASS(transpose);
+
static av_cold int init(AVFilterContext *ctx, const char *args)
{
TransContext *trans = ctx->priv;
- trans->dir = 0;
+ const char *shorthand[] = { "dir", NULL };
- if (args)
- sscanf(args, "%d", &trans->dir);
+ trans->class = &transpose_class;
+ av_opt_set_defaults(trans);
- if (trans->dir < 0 || trans->dir > 7) {
- av_log(ctx, AV_LOG_ERROR, "Invalid value %d not between 0 and 7.\n",
- trans->dir);
- return AVERROR(EINVAL);
- }
- return 0;
+ return av_opt_set_from_string(trans, args, shorthand, "=", ":");
}
static int query_formats(AVFilterContext *ctx)
@@ -262,4 +269,5 @@ AVFilter avfilter_vf_transpose = {
.config_props = config_props_output,
.type = AVMEDIA_TYPE_VIDEO, },
{ .name = NULL}},
+ .priv_class = &transpose_class,
};
--
1.7.5.4
More information about the ffmpeg-devel
mailing list