audio/filter: remove useless af_info fields

Drop the author and comment fields. They were completely unused - not
even printed in verbose mode, just dead weight.

Also use designated initializers and drop redundant flags.
This commit is contained in:
wm4 2013-10-23 19:05:47 +02:00
parent a46453347f
commit b08617ff71
26 changed files with 94 additions and 152 deletions

View File

@ -45,8 +45,6 @@ struct af_instance;
struct af_info { struct af_info {
const char *info; const char *info;
const char *name; const char *name;
const char *author;
const char *comment;
const int flags; const int flags;
int (*open)(struct af_instance *vf); int (*open)(struct af_instance *vf);
bool (*test_conversion)(int src_format, int dst_format); bool (*test_conversion)(int src_format, int dst_format);

View File

@ -197,12 +197,9 @@ static int af_open(struct af_instance *af)
/// Description of this filter /// Description of this filter
struct af_info af_info_bs2b = { struct af_info af_info_bs2b = {
"Bauer stereophonic-to-binaural audio filter", .info = "Bauer stereophonic-to-binaural audio filter",
"bs2b", .name = "bs2b",
"Andrew Savchenko", .open = af_open,
"",
AF_FLAGS_REENTRANT,
af_open,
.priv_size = sizeof(struct af_bs2b), .priv_size = sizeof(struct af_bs2b),
.options = (const struct m_option[]) { .options = (const struct m_option[]) {
OPT_INTRANGE("fcut", fcut, 0, BS2B_MINFCUT, BS2B_MAXFCUT), OPT_INTRANGE("fcut", fcut, 0, BS2B_MINFCUT, BS2B_MAXFCUT),

View File

@ -119,10 +119,8 @@ static int af_open(struct af_instance* af){
// Description of this filter // Description of this filter
struct af_info af_info_center = { struct af_info af_info_center = {
"Audio filter for adding a center channel", .info = "Audio filter for adding a center channel",
"center", .name = "center",
"Alex Beregszaszi", .flags = AF_FLAGS_NOT_REENTRANT,
"", .open = af_open,
AF_FLAGS_NOT_REENTRANT,
af_open
}; };

View File

@ -3,6 +3,8 @@
* command line parameter channels. It is stupid and can only add * command line parameter channels. It is stupid and can only add
* silence or copy channels, not mix or filter. * silence or copy channels, not mix or filter.
* *
* Original author: Anders
*
* This file is part of MPlayer. * This file is part of MPlayer.
* *
* MPlayer is free software; you can redistribute it and/or modify * MPlayer is free software; you can redistribute it and/or modify
@ -262,10 +264,7 @@ static int af_open(struct af_instance* af){
// Description of this filter // Description of this filter
struct af_info af_info_channels = { struct af_info af_info_channels = {
"Insert or remove channels", .info = "Insert or remove channels",
"channels", .name = "channels",
"Anders", .open = af_open,
"",
AF_FLAGS_REENTRANT,
af_open
}; };

View File

@ -126,11 +126,8 @@ static int af_open(struct af_instance *af)
} }
struct af_info af_info_convert24 = { struct af_info af_info_convert24 = {
"Convert between 24 and 32 bit sample format", .info = "Convert between 24 and 32 bit sample format",
"convert24", .name = "convert24",
"", .open = af_open,
"",
0,
af_open,
.test_conversion = test_conversion, .test_conversion = test_conversion,
}; };

View File

@ -123,11 +123,8 @@ static int af_open(struct af_instance *af)
} }
struct af_info af_info_convertsignendian = { struct af_info af_info_convertsignendian = {
"Convert between sample format sign/endian", .info = "Convert between sample format sign/endian",
"convertsignendian", .name = "convertsignendian",
"", .open = af_open,
"",
0,
af_open,
.test_conversion = test_conversion, .test_conversion = test_conversion,
}; };

View File

@ -3,6 +3,8 @@
* channels and can be used for simple position panning. * channels and can be used for simple position panning.
* An extension for this filter would be a reverb. * An extension for this filter would be a reverb.
* *
* Original author: Anders
*
* This file is part of MPlayer. * This file is part of MPlayer.
* *
* MPlayer is free software; you can redistribute it and/or modify * MPlayer is free software; you can redistribute it and/or modify
@ -188,10 +190,7 @@ static int af_open(struct af_instance* af){
// Description of this filter // Description of this filter
struct af_info af_info_delay = { struct af_info af_info_delay = {
"Delay audio filter", .info = "Delay audio filter",
"delay", .name = "delay",
"Anders", .open = af_open,
"",
AF_FLAGS_REENTRANT,
af_open
}; };

View File

@ -339,10 +339,8 @@ static int af_open(struct af_instance* af){
// Description of this filter // Description of this filter
struct af_info af_info_drc = { struct af_info af_info_drc = {
"Dynamic range compression filter", .info = "Dynamic range compression filter",
"drc", .name = "drc",
"Alex Beregszaszi & Pierre Lombard", .flags = AF_FLAGS_NOT_REENTRANT,
"", .open = af_open,
AF_FLAGS_NOT_REENTRANT,
af_open
}; };

View File

@ -2,6 +2,8 @@
* The name speaks for itself. This filter is a dummy and will * The name speaks for itself. This filter is a dummy and will
* not blow up regardless of what you do with it. * not blow up regardless of what you do with it.
* *
* Original author: Anders
*
* This file is part of MPlayer. * This file is part of MPlayer.
* *
* MPlayer is free software; you can redistribute it and/or modify * MPlayer is free software; you can redistribute it and/or modify
@ -67,10 +69,7 @@ static int af_open(struct af_instance* af){
// Description of this filter // Description of this filter
struct af_info af_info_dummy = { struct af_info af_info_dummy = {
"dummy", .info = "dummy",
"dummy", .name = "dummy",
"Anders", .open = af_open,
"",
AF_FLAGS_REENTRANT,
af_open
}; };

View File

@ -213,10 +213,8 @@ static int af_open(struct af_instance* af){
// Description of this filter // Description of this filter
struct af_info af_info_equalizer = { struct af_info af_info_equalizer = {
"Equalizer audio filter", .info = "Equalizer audio filter",
"equalizer", .name = "equalizer",
"Anders", .flags = AF_FLAGS_NOT_REENTRANT,
"", .open = af_open,
AF_FLAGS_NOT_REENTRANT,
af_open
}; };

View File

@ -7,6 +7,8 @@
* the area changes), * the area changes),
* the rest is payload (non-interleaved). * the rest is payload (non-interleaved).
* *
* Authors: Anders; Gustavo Sverzut Barbieri <gustavo.barbieri@ic.unicamp.br>
*
* This file is part of MPlayer. * This file is part of MPlayer.
* *
* MPlayer is free software; you can redistribute it and/or modify * MPlayer is free software; you can redistribute it and/or modify
@ -270,10 +272,7 @@ static int af_open( struct af_instance* af )
// Description of this filter // Description of this filter
struct af_info af_info_export = { struct af_info af_info_export = {
"Sound export filter", .info = "Sound export filter",
"export", .name = "export",
"Anders; Gustavo Sverzut Barbieri <gustavo.barbieri@ic.unicamp.br>", .open = af_open,
"",
AF_FLAGS_REENTRANT,
af_open
}; };

View File

@ -139,10 +139,8 @@ static int af_open(struct af_instance* af){
// Description of this filter // Description of this filter
struct af_info af_info_extrastereo = { struct af_info af_info_extrastereo = {
"Increase difference between audio channels", .info = "Increase difference between audio channels",
"extrastereo", .name = "extrastereo",
"Alex Beregszaszi & Pierre Lombard", .flags = AF_FLAGS_NOT_REENTRANT,
"", .open = af_open,
AF_FLAGS_NOT_REENTRANT,
af_open
}; };

View File

@ -128,12 +128,9 @@ static int af_open(struct af_instance *af)
#define OPT_BASE_STRUCT struct priv #define OPT_BASE_STRUCT struct priv
struct af_info af_info_format = { struct af_info af_info_format = {
"Force audio format", .info = "Force audio format",
"format", .name = "format",
"", .open = af_open,
"",
0,
af_open,
.priv_size = sizeof(struct priv), .priv_size = sizeof(struct priv),
.options = (const struct m_option[]) { .options = (const struct m_option[]) {
OPT_AUDIOFORMAT("format", in_format, 0), OPT_AUDIOFORMAT("format", in_format, 0),

View File

@ -3,6 +3,8 @@
* encoded rear channels into headphone signal using FIR filtering * encoded rear channels into headphone signal using FIR filtering
* with HRTF. * with HRTF.
* *
* Author: ylai
*
* This file is part of MPlayer. * This file is part of MPlayer.
* *
* MPlayer is free software; you can redistribute it and/or modify * MPlayer is free software; you can redistribute it and/or modify
@ -660,10 +662,7 @@ static int af_open(struct af_instance* af)
/* Description of this filter */ /* Description of this filter */
struct af_info af_info_hrtf = { struct af_info af_info_hrtf = {
"HRTF Headphone", .info = "HRTF Headphone",
"hrtf", .name = "hrtf",
"ylai", .open = af_open,
"",
AF_FLAGS_REENTRANT,
af_open
}; };

View File

@ -87,10 +87,8 @@ static int af_open(struct af_instance* af){
// Description of this filter // Description of this filter
struct af_info af_info_karaoke = { struct af_info af_info_karaoke = {
"Simple karaoke/voice-removal audio filter", .info = "Simple karaoke/voice-removal audio filter",
"karaoke", .name = "karaoke",
"Reynaldo H. Verdejo Pinochet", .flags = AF_FLAGS_NOT_REENTRANT,
"", .open = af_open,
AF_FLAGS_NOT_REENTRANT,
af_open
}; };

View File

@ -103,12 +103,9 @@ static int af_ladspa_malloc_failed(char*);
/* Description */ /* Description */
struct af_info af_info_ladspa = { struct af_info af_info_ladspa = {
"LADSPA plugin loader", .info = "LADSPA plugin loader",
"ladspa", .name = "ladspa",
"Ivo van Poorten", .open = af_open,
"",
AF_FLAGS_REENTRANT,
af_open
}; };
/* ------------------------------------------------------------------------- */ /* ------------------------------------------------------------------------- */

View File

@ -379,10 +379,7 @@ static int af_open(struct af_instance* af){
} }
struct af_info af_info_lavcac3enc = { struct af_info af_info_lavcac3enc = {
"runtime encode to ac3 using libavcodec", .info = "runtime encode to ac3 using libavcodec",
"lavcac3enc", .name = "lavcac3enc",
"Ulion", .open = af_open,
"",
AF_FLAGS_REENTRANT,
af_open
}; };

View File

@ -307,12 +307,9 @@ static int af_open(struct af_instance *af)
#define OPT_BASE_STRUCT struct priv #define OPT_BASE_STRUCT struct priv
struct af_info af_info_lavfi = { struct af_info af_info_lavfi = {
"libavfilter bridge", .info = "libavfilter bridge",
"lavfi", .name = "lavfi",
"", .open = af_open,
"",
0,
af_open,
.priv_size = sizeof(struct priv), .priv_size = sizeof(struct priv),
.options = (const struct m_option[]) { .options = (const struct m_option[]) {
OPT_STRING("graph", cfg_graph, 0), OPT_STRING("graph", cfg_graph, 0),

View File

@ -3,6 +3,7 @@
* Copyright (c) 2013 Stefano Pigozzi <stefano.pigozzi@gmail.com> * Copyright (c) 2013 Stefano Pigozzi <stefano.pigozzi@gmail.com>
* *
* This file is part of mpv. * This file is part of mpv.
* Based on Michael Niedermayer's lavcresample.
* *
* MPlayer is free software; you can redistribute it and/or modify * MPlayer is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -370,12 +371,9 @@ static int af_open(struct af_instance *af)
#define OPT_BASE_STRUCT struct af_resample #define OPT_BASE_STRUCT struct af_resample
struct af_info af_info_lavrresample = { struct af_info af_info_lavrresample = {
"Sample frequency conversion using libavresample", .info = "Sample frequency conversion using libavresample",
"lavrresample", .name = "lavrresample",
"Stefano Pigozzi (based on Michael Niedermayer's lavcresample)", .open = af_open,
"",
AF_FLAGS_REENTRANT,
af_open,
.test_conversion = test_conversion, .test_conversion = test_conversion,
.priv_size = sizeof(struct af_resample), .priv_size = sizeof(struct af_resample),
.priv_defaults = &(const struct af_resample) { .priv_defaults = &(const struct af_resample) {

View File

@ -205,10 +205,7 @@ static int af_open(struct af_instance* af){
// Description of this filter // Description of this filter
struct af_info af_info_pan = { struct af_info af_info_pan = {
"Panning audio filter", .info = "Panning audio filter",
"pan", .name = "pan",
"Anders", .open = af_open,
"",
AF_FLAGS_REENTRANT,
af_open
}; };

View File

@ -507,12 +507,9 @@ static int af_open(struct af_instance* af){
#define OPT_BASE_STRUCT af_scaletempo_t #define OPT_BASE_STRUCT af_scaletempo_t
struct af_info af_info_scaletempo = { struct af_info af_info_scaletempo = {
"Scale audio tempo while maintaining pitch", .info = "Scale audio tempo while maintaining pitch",
"scaletempo", .name = "scaletempo",
"Robert Juliano", .open = af_open,
"",
AF_FLAGS_REENTRANT,
af_open,
.priv_size = sizeof(af_scaletempo_t), .priv_size = sizeof(af_scaletempo_t),
.priv_defaults = &(const af_scaletempo_t) { .priv_defaults = &(const af_scaletempo_t) {
.ms_stride = 60, .ms_stride = 60,

View File

@ -162,10 +162,7 @@ static int af_open(struct af_instance* af){
// Description of this filter // Description of this filter
struct af_info af_info_sinesuppress = { struct af_info af_info_sinesuppress = {
"Sine Suppress", .info = "Sine Suppress",
"sinesuppress", .name = "sinesuppress",
"Michael Niedermayer", .open = af_open,
"",
0,
af_open
}; };

View File

@ -178,10 +178,8 @@ static int af_open(struct af_instance* af){
// Description of this filter // Description of this filter
struct af_info af_info_sub = { struct af_info af_info_sub = {
"Audio filter for adding a sub-base channel", .info = "Audio filter for adding a sub-base channel",
"sub", .name = "sub",
"Anders", .flags = AF_FLAGS_NOT_REENTRANT,
"", .open = af_open,
AF_FLAGS_NOT_REENTRANT,
af_open
}; };

View File

@ -262,10 +262,8 @@ static int af_open(struct af_instance* af){
struct af_info af_info_surround = struct af_info af_info_surround =
{ {
"Surround decoder filter", .info = "Surround decoder filter",
"surround", .name = "surround",
"Steve Davies <steve@daviesfam.org>", .flags = AF_FLAGS_NOT_REENTRANT,
"", .open = af_open,
AF_FLAGS_NOT_REENTRANT,
af_open
}; };

View File

@ -92,10 +92,7 @@ static int af_open(struct af_instance* af){
} }
struct af_info af_info_sweep = { struct af_info af_info_sweep = {
"sine sweep", .info = "sine sweep",
"sweep", .name = "sweep",
"Michael Niedermayer", .open = af_open,
"",
AF_FLAGS_REENTRANT,
af_open
}; };

View File

@ -199,10 +199,8 @@ static int af_open(struct af_instance* af){
// Description of this filter // Description of this filter
struct af_info af_info_volume = { struct af_info af_info_volume = {
"Volume control audio filter", .info = "Volume control audio filter",
"volume", .name = "volume",
"Anders", .flags = AF_FLAGS_NOT_REENTRANT,
"", .open = af_open,
AF_FLAGS_NOT_REENTRANT,
af_open
}; };