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

Clément Bœsch committed 13 years ago

Commit 1b1688b1 parent 7c11c213 files · +3 −17Browse files

Unified · Split

3 files

@@ -1117,6 +1117,8 @@ minimum detected noise duration. · 1116 unmodified lines
1117		1117
1118	The printed times and duration are expressed in seconds.	1118	The printed times and duration are expressed in seconds.
1119		1119
		1120	The filter accepts the following options:
		1121
1120	@table @option	1122	@table @option
1121	@item duration, d	1123	@item duration, d
1122	Set silence duration until notification (default is 2 seconds).	1124	Set silence duration until notification (default is 2 seconds).

@@ -54,22 +54,6 @@ static const AVOption silencedetect_options[] = { · 53 unmodified lines
54		54
55	AVFILTER_DEFINE_CLASS(silencedetect);	55	AVFILTER_DEFINE_CLASS(silencedetect);
56		56
57	static av_cold int init(AVFilterContext ctx, const char args)
58	{
59	int ret;
60	SilenceDetectContext *silence = ctx->priv;
61
62	silence->class = &silencedetect_class;
63	av_opt_set_defaults(silence);
64
65	if ((ret = av_set_options_string(silence, args, "=", ":")) < 0)
66	return ret;
67
68	av_opt_free(silence);
69
70	return 0;
71	}
72
73	static char get_metadata_val(AVFrame insamples, const char *key)	57	static char get_metadata_val(AVFrame insamples, const char *key)
74	{	58	{
75	AVDictionaryEntry *e = av_dict_get(insamples->metadata, key, NULL, 0);	59	AVDictionaryEntry *e = av_dict_get(insamples->metadata, key, NULL, 0);
@@ -176,7 +160,6 @@ AVFilter avfilter_af_silencedetect = { · 100 unmodified lines
176	.name = "silencedetect",	160	.name = "silencedetect",
177	.description = NULL_IF_CONFIG_SMALL("Detect silence."),	161	.description = NULL_IF_CONFIG_SMALL("Detect silence."),
178	.priv_size = sizeof(SilenceDetectContext),	162	.priv_size = sizeof(SilenceDetectContext),
179	.init = init,
180	.query_formats = query_formats,	163	.query_formats = query_formats,
181	.inputs = silencedetect_inputs,	164	.inputs = silencedetect_inputs,
182	.outputs = silencedetect_outputs,	165	.outputs = silencedetect_outputs,

@@ -681,6 +681,7 @@ int avfilter_init_filter(AVFilterContext filter, const char args, void *opaque · 680 unmodified lines
681	!strcmp(filter->filter->name, "format") \|\|	681	!strcmp(filter->filter->name, "format") \|\|
682	!strcmp(filter->filter->name, "noformat") \|\|	682	!strcmp(filter->filter->name, "noformat") \|\|
683	!strcmp(filter->filter->name, "resample") \|\|	683	!strcmp(filter->filter->name, "resample") \|\|
		684	!strcmp(filter->filter->name, "silencedetect") \|\|
684	!strcmp(filter->filter->name, "thumbnail") \|\|	685	!strcmp(filter->filter->name, "thumbnail") \|\|
685	// !strcmp(filter->filter->name, "scale" ) \|\|	686	// !strcmp(filter->filter->name, "scale" ) \|\|
686	0	687	0

Keyboard shortcuts