Commit a782a32e authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

aout: use distinct "audio converter" capability for converters

Contrary to normal audio filters, audio converters cannot change their
input and output formats, cannot have identical input and output
formats and are probed automatically rather than by name.
Using the same capability served no useful purpose.
parent e27457cb
......@@ -34,7 +34,7 @@ static int Open (vlc_object_t *);
vlc_module_begin ()
set_description (N_("ARM NEON audio format conversions") )
set_capability ("audio filter", 20)
set_capability ("audio converter", 20)
set_callbacks (Open, NULL)
vlc_module_end ()
......
......@@ -47,7 +47,7 @@ vlc_module_begin ()
set_description( N_("Audio filter for simple channel mixing using NEON assembly") )
set_category( CAT_AUDIO )
set_subcategory( SUBCAT_AUDIO_MISC )
set_capability( "audio filter", 20 )
set_capability( "audio converter", 20 )
set_callbacks( OpenFilter, NULL )
vlc_module_end ()
......
......@@ -50,7 +50,7 @@ vlc_module_begin ()
set_shortname( N_("Dolby Surround decoder") )
set_category( CAT_INPUT )
set_subcategory( SUBCAT_INPUT_ACODEC )
set_capability( "audio filter", 5 )
set_capability( "audio converter", 5 )
set_callbacks( Create, Destroy )
vlc_module_end ()
......
......@@ -44,7 +44,7 @@ vlc_module_begin ()
set_description( N_("Audio filter for simple channel mixing") )
set_category( CAT_AUDIO )
set_subcategory( SUBCAT_AUDIO_MISC )
set_capability( "audio filter", 10 )
set_capability( "audio converter", 10 )
set_callbacks( OpenFilter, NULL )
vlc_module_end ()
......
......@@ -46,7 +46,7 @@ static block_t *DoWork( filter_t *, block_t * );
*****************************************************************************/
vlc_module_begin ()
set_description( N_("Audio filter for trivial channel mixing") )
set_capability( "audio filter", 1 )
set_capability( "audio converter", 1 )
set_category( CAT_AUDIO )
set_subcategory( SUBCAT_AUDIO_MISC )
set_callbacks( Create, NULL )
......
......@@ -97,7 +97,7 @@ vlc_module_begin ()
set_subcategory( SUBCAT_INPUT_ACODEC )
add_bool( "a52-dynrng", true, DYNRNG_TEXT, DYNRNG_LONGTEXT, false )
add_bool( "a52-upmix", false, UPMIX_TEXT, UPMIX_LONGTEXT, true )
set_capability( "audio filter", 100 )
set_capability( "audio converter", 100 )
set_callbacks( OpenFilter, CloseFilter )
vlc_module_end ()
......
......@@ -49,7 +49,7 @@ vlc_module_begin ()
set_category( CAT_AUDIO )
set_subcategory( SUBCAT_AUDIO_MISC )
set_description( N_("Audio filter for A/52->S/PDIF encapsulation") )
set_capability( "audio filter", 10 )
set_capability( "audio converter", 10 )
set_callbacks( Create, NULL )
vlc_module_end ()
......
......@@ -86,7 +86,7 @@ vlc_module_begin ()
set_shortname( "DCA" )
set_description( N_("DTS Coherent Acoustics audio decoder") )
add_bool( "dts-dynrng", true, DYNRNG_TEXT, DYNRNG_LONGTEXT, false )
set_capability( "audio filter", 100 )
set_capability( "audio converter", 100 )
set_callbacks( OpenFilter, CloseFilter )
vlc_module_end ()
......
......@@ -63,7 +63,7 @@ vlc_module_begin ()
set_category( CAT_AUDIO )
set_subcategory( SUBCAT_AUDIO_MISC )
set_description( N_("Audio filter for DTS->S/PDIF encapsulation") )
set_capability( "audio filter", 10 )
set_capability( "audio converter", 10 )
set_callbacks( Create, Close )
vlc_module_end ()
......
......@@ -49,7 +49,7 @@ vlc_module_begin()
set_description(N_("Audio filter for PCM format conversion"))
set_category(CAT_AUDIO)
set_subcategory(SUBCAT_AUDIO_MISC)
set_capability("audio filter", 1)
set_capability("audio converter", 1)
set_callbacks(Open, Close)
vlc_module_end()
......
......@@ -66,7 +66,7 @@ vlc_module_begin ()
set_category( CAT_INPUT )
set_subcategory( SUBCAT_INPUT_ACODEC )
set_description( N_("MPEG audio decoder") )
set_capability( "audio filter", 100 )
set_capability( "audio converter", 100 )
set_callbacks( OpenFilter, CloseFilter )
vlc_module_end ()
......
......@@ -87,7 +87,7 @@ vlc_module_begin ()
set_category( CAT_AUDIO )
set_subcategory( SUBCAT_AUDIO_MISC )
set_description( N_("Audio filter for band-limited interpolation resampling") )
set_capability( "audio filter", 20 )
set_capability( "audio converter", 20 )
set_callbacks( OpenFilter, CloseFilter )
add_submodule()
......
......@@ -44,7 +44,7 @@ vlc_module_begin ()
add_integer ("speex-resampler-quality", 4,
QUALITY_TEXT, QUALITY_LONGTEXT, true)
change_integer_range (0, 10)
set_capability ("audio filter", 0)
set_capability ("audio converter", 0)
set_callbacks (Open, Close)
add_submodule ()
......
......@@ -53,7 +53,7 @@ vlc_module_begin ()
add_integer ("src-converter-type", SRC_SINC_FASTEST,
SRC_CONV_TYPE_TEXT, SRC_CONV_TYPE_LONGTEXT, true)
change_integer_list (conv_type_values, conv_type_texts)
set_capability ("audio filter", 50)
set_capability ("audio converter", 50)
set_callbacks (Open, Close)
add_submodule ()
......
......@@ -46,7 +46,7 @@ static block_t *DoWork( filter_t *, block_t * );
*****************************************************************************/
vlc_module_begin ()
set_description( N_("Nearest-neighbor audio resampler") )
set_capability( "audio filter", 2 )
set_capability( "audio converter", 2 )
set_category( CAT_AUDIO )
set_subcategory( SUBCAT_AUDIO_MISC )
set_callbacks( Create, NULL )
......
......@@ -290,7 +290,7 @@ int transcode_audio_new( sout_stream_t *p_stream,
}
/* Load conversion filters */
id->p_f_chain = filter_chain_New( p_stream, "audio filter", true,
id->p_f_chain = filter_chain_New( p_stream, "audio converter", true,
transcode_audio_filter_allocation_init, NULL, NULL );
filter_chain_Reset( id->p_f_chain, &fmt_last, &id->p_encoder->fmt_in );
......
......@@ -47,8 +47,8 @@ static filter_t * FindFilter( vlc_object_t *obj,
const audio_sample_format_t *infmt,
const audio_sample_format_t *outfmt )
{
static const char typename[] = "audio filter";
const char *type = "audio filter", *name = NULL;
static const char typename[] = "audio converter";
const char *type = "audio converter", *name = NULL;
filter_t * p_filter;
p_filter = vlc_custom_create( obj, sizeof(*p_filter), typename );
......
......@@ -1533,8 +1533,8 @@ vlc_module_begin ()
true )
change_short('A')
set_subcategory( SUBCAT_AUDIO_AFILTER )
add_module_list_cat( "audio-filter", SUBCAT_AUDIO_AFILTER, NULL,
AUDIO_FILTER_TEXT, AUDIO_FILTER_LONGTEXT, false )
add_module_list( "audio-filter", "audio filter", NULL,
AUDIO_FILTER_TEXT, AUDIO_FILTER_LONGTEXT, false )
set_subcategory( SUBCAT_AUDIO_VISUAL )
add_module( "audio-visual", "visualization2", NULL,AUDIO_VISUAL_TEXT,
AUDIO_VISUAL_LONGTEXT, false )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment