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

Rename audio filter2 capability back to audio filter

parent 694b6814
......@@ -31,7 +31,6 @@ Audio filters:
* 3F1R to stereo downmix filter
* Dolby mixer, parameterized equalizer, trivial mixer, scaletempo, bandlimited resampler,
linear resampler, ugly resampler, converter_float, converter_fixed, DTS to SPDIF and
A/52 to SPDIF filters have been upgraded to the "audio filter2" API
* NEON assembly audio converter module
Encoders:
......
......@@ -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 filter2", 5 )
set_capability( "audio filter", 5 )
set_callbacks( Create, Destroy )
vlc_module_end ()
......
......@@ -85,7 +85,7 @@ vlc_module_begin ()
add_bool( "headphone-dolby", false, NULL, HEADPHONE_DOLBY_TEXT,
HEADPHONE_DOLBY_LONGTEXT, true )
set_capability( "audio filter2", 0 )
set_capability( "audio filter", 0 )
set_callbacks( OpenFilter, CloseFilter )
add_shortcut( "headphone" )
vlc_module_end ()
......
......@@ -106,7 +106,7 @@ static const uint32_t pi_channels_out[] =
*****************************************************************************/
vlc_module_begin ()
set_description( N_("Audio filter for stereo to mono conversion") )
set_capability( "audio filter2", 2 )
set_capability( "audio filter", 2 )
set_category( CAT_AUDIO )
set_subcategory( SUBCAT_AUDIO_MISC )
set_callbacks( OpenFilter, CloseFilter )
......
......@@ -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 filter2", 10 )
set_capability( "audio filter", 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 filter2", 1 )
set_capability( "audio filter", 1 )
set_category( CAT_AUDIO )
set_subcategory( SUBCAT_AUDIO_MISC )
set_callbacks( Create, NULL )
......
......@@ -93,7 +93,7 @@ vlc_module_begin ()
N_("Wet mix"), N_("Level of delayed signal"), true )
add_float_with_range( "dry-mix", 0.4, -0.999, 0.999, NULL,
N_("Dry Mix"), N_("Level of input signal"), true )
set_capability( "audio filter2", 0 )
set_capability( "audio filter", 0 )
set_callbacks( Open, Close )
vlc_module_end ()
......
......@@ -97,7 +97,7 @@ vlc_module_begin ()
set_subcategory( SUBCAT_INPUT_ACODEC )
add_bool( "a52-dynrng", true, NULL, DYNRNG_TEXT, DYNRNG_LONGTEXT, false )
add_bool( "a52-upmix", false, NULL, UPMIX_TEXT, UPMIX_LONGTEXT, true )
set_capability( "audio filter2", 100 )
set_capability( "audio filter", 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 filter2", 10 )
set_capability( "audio filter", 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, NULL, DYNRNG_TEXT, DYNRNG_LONGTEXT, false )
set_capability( "audio filter2", 100 )
set_capability( "audio filter", 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 filter2", 10 )
set_capability( "audio filter", 10 )
set_callbacks( Create, Close )
vlc_module_end ()
......
......@@ -55,13 +55,13 @@ vlc_module_begin ()
set_description( N_("Fixed point audio format conversions") )
add_submodule ()
set_callbacks( Create_F32ToS16, NULL )
set_capability( "audio filter2", 10 )
set_capability( "audio filter", 10 )
add_submodule ()
set_callbacks( Create_S16ToF32, NULL )
set_capability( "audio filter2", 15 )
set_capability( "audio filter", 15 )
add_submodule ()
set_callbacks( Create_U8ToF32, NULL )
set_capability( "audio filter2", 1 )
set_capability( "audio filter", 1 )
vlc_module_end ()
/*****************************************************************************
......
......@@ -51,7 +51,7 @@ static block_t *Do_FL32ToF32 ( filter_t *, block_t * );
vlc_module_begin ()
set_description( N_("Floating-point audio format conversions") )
add_submodule ()
set_capability( "audio filter2", 10 )
set_capability( "audio filter", 10 )
set_callbacks( Create_F32ToFL32, NULL )
vlc_module_end ()
......
......@@ -194,7 +194,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 filter2", 1 )
set_capability( "audio filter", 1 )
set_callbacks( Open, NULL )
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 filter2", 100 )
set_capability( "audio filter", 100 )
set_callbacks( OpenFilter, CloseFilter )
vlc_module_end ()
......
......@@ -34,7 +34,7 @@ static int Open (vlc_object_t *);
vlc_module_begin ()
set_description (N_("ARM NEON audio format conversions") )
set_capability ("audio filter2", 20)
set_capability ("audio filter", 20)
set_callbacks (Open, NULL)
add_requirement (NEON)
vlc_module_end ()
......
......@@ -74,7 +74,7 @@ static void Close( vlc_object_t * );
vlc_module_begin ()
set_description( N_("Equalizer with 10 bands") )
set_shortname( N_("Equalizer" ) )
set_capability( "audio filter2", 0 )
set_capability( "audio filter", 0 )
set_category( CAT_AUDIO )
set_subcategory( SUBCAT_AUDIO_AFILTER )
......
......@@ -89,7 +89,7 @@ vlc_module_begin ()
true )
add_float( "norm-max-level", 2.0, NULL, LEVEL_TEXT,
LEVEL_LONGTEXT, true )
set_capability( "audio filter2", 0 )
set_capability( "audio filter", 0 )
set_callbacks( Open, Close )
vlc_module_end ()
......
......@@ -51,7 +51,7 @@ static block_t *DoWork( filter_t *, block_t * );
vlc_module_begin ()
set_description( N_("Parametric Equalizer") )
set_shortname( N_("Parametric Equalizer" ) )
set_capability( "audio filter2", 0 )
set_capability( "audio filter", 0 )
set_category( CAT_AUDIO )
set_subcategory( SUBCAT_AUDIO_AFILTER )
......
......@@ -49,7 +49,7 @@
* Local prototypes
*****************************************************************************/
/* audio filter2 */
/* audio filter */
static int OpenFilter ( vlc_object_t * );
static void CloseFilter( vlc_object_t * );
static block_t *Resample( filter_t *, block_t * );
......@@ -89,7 +89,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 filter2", 20 )
set_capability( "audio filter", 20 )
set_callbacks( OpenFilter, CloseFilter )
vlc_module_end ()
......
......@@ -71,7 +71,7 @@ vlc_module_begin ()
set_description( N_("Audio filter for linear interpolation resampling") )
set_category( CAT_AUDIO )
set_subcategory( SUBCAT_AUDIO_MISC )
set_capability( "audio filter2", 5 )
set_capability( "audio filter", 5 )
set_callbacks( OpenFilter, CloseFilter )
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 resampling") )
set_capability( "audio filter2", 1 )
set_capability( "audio filter", 1 )
set_category( CAT_AUDIO )
set_subcategory( SUBCAT_AUDIO_MISC )
set_callbacks( Create, NULL )
......
......@@ -46,7 +46,7 @@ static block_t *DoWork( filter_t *, block_t * );
*****************************************************************************/
vlc_module_begin ()
set_description( N_("Audio filter for ugly resampling") )
set_capability( "audio filter2", 2 )
set_capability( "audio filter", 2 )
set_category( CAT_AUDIO )
set_subcategory( SUBCAT_AUDIO_MISC )
set_callbacks( Create, NULL )
......
......@@ -46,7 +46,7 @@ static block_t *DoWork( filter_t *, block_t * );
vlc_module_begin ()
set_description( N_("Audio tempo scaler synched with rate") )
set_shortname( N_("Scaletempo") )
set_capability( "audio filter2", 0 )
set_capability( "audio filter", 0 )
set_category( CAT_AUDIO )
set_subcategory( SUBCAT_AUDIO_AFILTER )
......
......@@ -70,7 +70,7 @@ static void Close( vlc_object_t * );
vlc_module_begin ()
set_description( N_("Audio Spatializer") )
set_shortname( N_("Spatializer" ) )
set_capability( "audio filter2", 0 )
set_capability( "audio filter", 0 )
set_category( CAT_AUDIO )
set_subcategory( SUBCAT_AUDIO_AFILTER )
......
......@@ -215,7 +215,7 @@ vlc_module_begin ()
ARATE_LONGTEXT, true )
add_bool( SOUT_CFG_PREFIX "audio-sync", false, NULL, ASYNC_TEXT,
ASYNC_LONGTEXT, false )
add_module_list( SOUT_CFG_PREFIX "afilter", "audio filter2",
add_module_list( SOUT_CFG_PREFIX "afilter", "audio filter",
NULL, NULL,
AFILTER_TEXT, AFILTER_LONGTEXT, false )
......@@ -1239,7 +1239,7 @@ static int transcode_audio_new( sout_stream_t *p_stream,
}
fmt_last = fmt_fl32;
id->p_uf_chain = filter_chain_New( p_stream, "audio filter2", false,
id->p_uf_chain = filter_chain_New( p_stream, "audio filter", false,
transcode_audio_filter_allocation_init, NULL, NULL );
filter_chain_Reset( id->p_uf_chain, &fmt_last, &fmt_fl32 );
if( filter_chain_AppendFromString( id->p_uf_chain, p_sys->psz_af2 ) > 0 )
......@@ -1247,7 +1247,7 @@ static int transcode_audio_new( sout_stream_t *p_stream,
}
/* Load conversion filters */
id->p_f_chain = filter_chain_New( p_stream, "audio filter2", true,
id->p_f_chain = filter_chain_New( p_stream, "audio filter", true,
transcode_audio_filter_allocation_init, NULL, NULL );
filter_chain_Reset( id->p_f_chain, &fmt_last, &id->p_encoder->fmt_in );
......
......@@ -68,7 +68,7 @@ static filter_t * FindFilter( aout_instance_t * p_aout,
p_filter->fmt_out.i_codec = p_output_format->i_format;
p_filter->pf_audio_buffer_new = aout_FilterBufferNew;
p_filter->p_module = module_need( p_filter, "audio filter2", NULL, false );
p_filter->p_module = module_need( p_filter, "audio filter", NULL, false );
if ( p_filter->p_module == NULL )
{
vlc_object_detach( p_filter );
......
......@@ -305,7 +305,7 @@ int aout_InputNew( aout_instance_t * p_aout, aout_input_t * p_input, const aout_
}
else /* this can be a audio filter module as well as a visualization module */
{
p_filter->p_module = module_need( p_filter, "audio filter2",
p_filter->p_module = module_need( p_filter, "audio filter",
psz_parser, true );
if ( p_filter->p_module == NULL )
......@@ -319,7 +319,7 @@ int aout_InputNew( aout_instance_t * p_aout, aout_input_t * p_input, const aout_
aout_FormatPrepare( &p_filter->fmt_in.audio );
aout_FormatPrepare( &p_filter->fmt_out.audio );
p_filter->p_module = module_need( p_filter,
"audio filter2",
"audio filter",
psz_parser, true );
}
/* try visual filters */
......
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