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	4800	pixels comprise the logo. It works by filling in the pixels that
4801	4801	comprise the logo with neighboring pixels.
4802	4802
4803		−This filter requires one argument which specifies the filter bitmap
4804		−file, which can be any image format supported by libavformat. The
4805		−width and height of the image file must match those of the video
4806		−stream being processed.
	4803	+The filters accept the following options:
	4804	+
	4805	+@table @option
	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	4812	Pixels in the provided bitmap image with a value of zero are not
4809	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	681	"hue",
682	682	"mp",
683	683	"pan",
684		− "removelogo",
685	684	"scale",
686	685	"setdar",
687	686	"setsar",

libavfilter/vf_removelogo.c+17−3

@@ -70,6 +70,7 @@ · 69 unmodified lines
70	70	*/
71	71
72	72	#include "libavutil/imgutils.h"
	73	+#include "libavutil/opt.h"
73	74	#include "avfilter.h"
74	75	#include "formats.h"
75	76	#include "internal.h"
@@ -79,6 +80,8 @@ · 3 unmodified lines
79	80	#include "lswsutils.h"
80	81
81	82	typedef struct {
	83	+ const AVClass *class;
	84	+ char *filename;
82	85	/* Stores our collection of masks. The first is for an array of
83	86	the second for the y axis, and the third for the x axis. */
84	87	int ***mask;
@@ -91,6 +94,16 @@ typedef struct { · 6 unmodified lines
91	94	FFBoundingBox half_mask_bbox;
92	95	} RemovelogoContext;
93	96
	97	+#define OFFSET(x) offsetof(RemovelogoContext, x)
	98	+#define FLAGS AV_OPT_FLAG_FILTERING_PARAM\|AV_OPT_FLAG_VIDEO_PARAM
	99	+static const AVOption removelogo_options[] = {
	100	+ { "filename", "set bitmap filename", OFFSET(filename), AV_OPT_TYPE_STRING, {.str=NULL}, .flags = FLAGS },
	101	+ { "f", "set bitmap filename", OFFSET(filename), AV_OPT_TYPE_STRING, {.str=NULL}, .flags = FLAGS },
	102	+ { NULL }
	103	+};
	104	+
	105	+AVFILTER_DEFINE_CLASS(removelogo);
	106	+
94	107	/**
95	108	* Choose a slightly larger mask size to improve performance.
96	109	*
@@ -272,13 +285,13 @@ static av_cold int init(AVFilterContext ctx, const char args) · 175 unmodified lines
272	285	int a, b, c, w, h;
273	286	int full_max_mask_size, half_max_mask_size;
274	287
275		− if (!args) {
276		− av_log(ctx, AV_LOG_ERROR, "An image file must be specified as argument\n");
	288	+ if (!removelogo->filename) {
	289	+ av_log(ctx, AV_LOG_ERROR, "The bitmap file name is mandatory\n");
277	290	return AVERROR(EINVAL);
278	291	}
279	292
280	293	/* Load our mask image. */
281		− if ((ret = load_mask(&removelogo->full_mask_data, &w, &h, args, ctx)) < 0)
	294	+ if ((ret = load_mask(&removelogo->full_mask_data, &w, &h, removelogo->filename, ctx)) < 0)
282	295	return ret;
283	296	removelogo->mask_w = w;
284	297	removelogo->mask_h = h;
@@ -564,4 +577,5 @@ AVFilter avfilter_vf_removelogo = { · 279 unmodified lines
564	577	.query_formats = query_formats,
565	578	.inputs = removelogo_inputs,
566	579	.outputs = removelogo_outputs,
	580	+ .priv_class = &removelogo_class,
567	581	};

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

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code