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

This commit is contained in:
Clément Bœsch 2013-04-10 22:10:56 +02:00
parent 1b1688bfc6
commit 4964ec2cd4
3 changed files with 3 additions and 16 deletions

View File

@ -7033,7 +7033,8 @@ do not have exactly the same duration in the first file.
Convert input audio to a video output, representing the audio frequency Convert input audio to a video output, representing the audio frequency
spectrum. spectrum.
The filter accepts the following named parameters: The filter accepts the following options:
@table @option @table @option
@item size, s @item size, s
Specify the video size for the output. Default value is @code{640x512}. Specify the video size for the output. Default value is @code{640x512}.

View File

@ -97,20 +97,6 @@ static const struct {
{ 1, 1, 0, 0 } { 1, 1, 0, 0 }
}; };
static av_cold int init(AVFilterContext *ctx, const char *args)
{
ShowSpectrumContext *showspectrum = ctx->priv;
int err;
showspectrum->class = &showspectrum_class;
av_opt_set_defaults(showspectrum);
if ((err = av_set_options_string(showspectrum, args, "=", ":")) < 0)
return err;
return 0;
}
static av_cold void uninit(AVFilterContext *ctx) static av_cold void uninit(AVFilterContext *ctx)
{ {
ShowSpectrumContext *showspectrum = ctx->priv; ShowSpectrumContext *showspectrum = ctx->priv;
@ -505,7 +491,6 @@ static const AVFilterPad showspectrum_outputs[] = {
AVFilter avfilter_avf_showspectrum = { AVFilter avfilter_avf_showspectrum = {
.name = "showspectrum", .name = "showspectrum",
.description = NULL_IF_CONFIG_SMALL("Convert input audio to a spectrum video output."), .description = NULL_IF_CONFIG_SMALL("Convert input audio to a spectrum video output."),
.init = init,
.uninit = uninit, .uninit = uninit,
.query_formats = query_formats, .query_formats = query_formats,
.priv_size = sizeof(ShowSpectrumContext), .priv_size = sizeof(ShowSpectrumContext),

View File

@ -681,6 +681,7 @@ int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque
!strcmp(filter->filter->name, "format") || !strcmp(filter->filter->name, "format") ||
!strcmp(filter->filter->name, "noformat") || !strcmp(filter->filter->name, "noformat") ||
!strcmp(filter->filter->name, "resample") || !strcmp(filter->filter->name, "resample") ||
!strcmp(filter->filter->name, "showspectrum") ||
!strcmp(filter->filter->name, "silencedetect") || !strcmp(filter->filter->name, "silencedetect") ||
!strcmp(filter->filter->name, "thumbnail") || !strcmp(filter->filter->name, "thumbnail") ||
// !strcmp(filter->filter->name, "scale" ) || // !strcmp(filter->filter->name, "scale" ) ||