lavfi/removelogo: switch to an AVOptions-based system.

Clément Bœsch committed 13 years ago

Commit c1907bd1 parent 7f09b883 files · +25 −8Browse files

Unified · Split

3 files

doc/filters.texi +8 −4
libavfilter/avfilter.c +0 −1
libavfilter/vf_removelogo.c +17 −3

@@ -4800,10 +4800,14 @@ Suppress a TV station logo, using an image file to determine which · 4799 unmodified lines
4800	pixels comprise the logo. It works by filling in the pixels that	4800	pixels comprise the logo. It works by filling in the pixels that
4801	comprise the logo with neighboring pixels.	4801	comprise the logo with neighboring pixels.
4802		4802
4803	This filter requires one argument which specifies the filter bitmap	4803	The filters accept the following options:
4804	file, which can be any image format supported by libavformat. The	4804
4805	width and height of the image file must match those of the video	4805	@table @option
4806	stream being processed.	4806	@item filename, f
		4807	Set the filter bitmap file, which can be any image format supported by
		4808	libavformat. The width and height of the image file must match those of the
		4809	video stream being processed.
		4810	@end table
4807		4811
4808	Pixels in the provided bitmap image with a value of zero are not	4812	Pixels in the provided bitmap image with a value of zero are not
4809	considered part of the logo, non-zero pixels are considered part of	4813	considered part of the logo, non-zero pixels are considered part of

libavfilter/avfilter.c+0−1

@@ -681,7 +681,6 @@ static const char *const filters_left_to_update[] = { · 680 unmodified lines
681	"hue",	681	"hue",
682	"mp",	682	"mp",
683	"pan",	683	"pan",
684	"removelogo",
685	"scale",	684	"scale",
686	"setdar",	685	"setdar",
687	"setsar",	686	"setsar",

libavfilter/vf_removelogo.c+17−3

  */
 #include "libavutil/imgutils.h"
+#include "libavutil/opt.h"
 #include "avfilter.h"
 #include "formats.h"
 #include "internal.h"
 #include "lswsutils.h"
 typedef struct {
+    const AVClass *class;
+    char *filename;
     /* Stores our collection of masks. The first is for an array of
        the second for the y axis, and the third for the x axis. */
     int ***mask;
     FFBoundingBox half_mask_bbox;
 } RemovelogoContext;
+#define OFFSET(x) offsetof(RemovelogoContext, x)
+#define FLAGS AV_OPT_FLAG_FILTERING_PARAM|AV_OPT_FLAG_VIDEO_PARAM
+static const AVOption removelogo_options[] = {
+    { "filename", "set bitmap filename", OFFSET(filename), AV_OPT_TYPE_STRING, {.str=NULL}, .flags = FLAGS },
+    { "f",        "set bitmap filename", OFFSET(filename), AV_OPT_TYPE_STRING, {.str=NULL}, .flags = FLAGS },
+    { NULL }
+};
+AVFILTER_DEFINE_CLASS(removelogo);
 /**
  * Choose a slightly larger mask size to improve performance.
  *
     int a, b, c, w, h;
     int full_max_mask_size, half_max_mask_size;
-    if (!args) {
+    if (!removelogo->filename) {
-        av_log(ctx, AV_LOG_ERROR, "An image file must be specified as argument\n");
+        av_log(ctx, AV_LOG_ERROR, "The bitmap file name is mandatory\n");
         return AVERROR(EINVAL);
     }
     /* Load our mask image. */
-    if ((ret = load_mask(&removelogo->full_mask_data, &w, &h, args, ctx)) < 0)
+    if ((ret = load_mask(&removelogo->full_mask_data, &w, &h, removelogo->filename, ctx)) < 0)
         return ret;
     removelogo->mask_w = w;
     removelogo->mask_h = h;
     .query_formats = query_formats,
     .inputs        = removelogo_inputs,
     .outputs       = removelogo_outputs,
+    .priv_class    = &removelogo_class,
 };

lavfi/removelogo: switch to an AVOptions-based system.

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code