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.

diff --git a/modules/arm_neon/audio_format.c b/modules/arm_neon/audio_format.c
index ec331615a84612df33b3c4e389a81d0f7c4fa689..4a2f5fe9951a5555c9881ad2ad4b1fc3df0faa46 100644 (file)
--- a/modules/arm_neon/audio_format.c
+++ b/modules/arm_neon/audio_format.c
@@ -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 ()
 

diff --git a/modules/arm_neon/simple_channel_mixer.c b/modules/arm_neon/simple_channel_mixer.c
index 687ae2bbe4b4757c79fccae43bfce6eb238fd460..8f6e19b5d4ab258af6d95995b3bb335dba4a59b6 100644 (file)
--- a/modules/arm_neon/simple_channel_mixer.c
+++ b/modules/arm_neon/simple_channel_mixer.c
@@ -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 ()
 

diff --git a/modules/audio_filter/channel_mixer/dolby.c b/modules/audio_filter/channel_mixer/dolby.c
index 0a6dd13a249d1120a2f1efe597ec01a521a905b6..cd9922cd2a5206f9911f4407edc033b975e84649 100644 (file)
--- a/modules/audio_filter/channel_mixer/dolby.c
+++ b/modules/audio_filter/channel_mixer/dolby.c
@@ -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 ()
 

diff --git a/modules/audio_filter/channel_mixer/simple.c b/modules/audio_filter/channel_mixer/simple.c
index 0ad0b9c5619948263f12c76869e5607790584285..76494d2babbcd9e30d0cb21c5454ee54c687372d 100644 (file)
--- a/modules/audio_filter/channel_mixer/simple.c
+++ b/modules/audio_filter/channel_mixer/simple.c
@@ -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 ()
 

diff --git a/modules/audio_filter/channel_mixer/trivial.c b/modules/audio_filter/channel_mixer/trivial.c
index 645e6d9928d70f6ba2c8e1a31ecf2d909c967dd2..385f77c93bf6563ce94571703f25896ff693ef48 100644 (file)
--- a/modules/audio_filter/channel_mixer/trivial.c
+++ b/modules/audio_filter/channel_mixer/trivial.c
@@ -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 )

diff --git a/modules/audio_filter/converter/a52tofloat32.c b/modules/audio_filter/converter/a52tofloat32.c
index 0db610ec040e4c258b24b17158ead7514878c874..8379e07687365f165220793e0383ace1936bd572 100644 (file)
--- a/modules/audio_filter/converter/a52tofloat32.c
+++ b/modules/audio_filter/converter/a52tofloat32.c
@@ -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 ()
 

diff --git a/modules/audio_filter/converter/a52tospdif.c b/modules/audio_filter/converter/a52tospdif.c
index 08e85814e403544accfcd9f888c7db9c2ab779ab..a3658e7e32cd9994c5d0155e9199d6553bc70c34 100644 (file)
--- a/modules/audio_filter/converter/a52tospdif.c
+++ b/modules/audio_filter/converter/a52tospdif.c
@@ -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 ()
 

diff --git a/modules/audio_filter/converter/dtstofloat32.c b/modules/audio_filter/converter/dtstofloat32.c
index c459a3a1e65af14006842257c45b128db1cf1b64..f4b94129c6f3a7e31a9b7d85133183acbf442efd 100644 (file)
--- a/modules/audio_filter/converter/dtstofloat32.c
+++ b/modules/audio_filter/converter/dtstofloat32.c
@@ -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 ()
 

diff --git a/modules/audio_filter/converter/dtstospdif.c b/modules/audio_filter/converter/dtstospdif.c
index d0dcf73c464d99547d276a91495e2110f99b24f6..198d8f64093e6d86185fdd70401ba4f8817e3344 100644 (file)
--- a/modules/audio_filter/converter/dtstospdif.c
+++ b/modules/audio_filter/converter/dtstospdif.c
@@ -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 ()
 

diff --git a/modules/audio_filter/converter/format.c b/modules/audio_filter/converter/format.c
index 44e26ffc50d6834a2cf5bc10673fdeda5a5f2d84..5af95e0dd43e7d5fe344892fd12c6673712131da 100644 (file)
--- a/modules/audio_filter/converter/format.c
+++ b/modules/audio_filter/converter/format.c
@@ -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()
 

diff --git a/modules/audio_filter/converter/mpgatofixed32.c b/modules/audio_filter/converter/mpgatofixed32.c
index d525f98aa7b60b10c5045df4c9f8def6dd2696a6..9b989a8807c0481300f5a45b037739fb81cf4c82 100644 (file)
--- a/modules/audio_filter/converter/mpgatofixed32.c
+++ b/modules/audio_filter/converter/mpgatofixed32.c
@@ -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 ()
 

diff --git a/modules/audio_filter/resampler/bandlimited.c b/modules/audio_filter/resampler/bandlimited.c
index 0da28fd4278efec7e7e9aac87065d6b0fa53b47d..701ee0d35eb2d794db76b2a4ecfc3ef6a3597e9f 100644 (file)
--- a/modules/audio_filter/resampler/bandlimited.c
+++ b/modules/audio_filter/resampler/bandlimited.c
@@ -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()

diff --git a/modules/audio_filter/resampler/speex.c b/modules/audio_filter/resampler/speex.c
index 7638878fe02c458c7321671319063f6b9e459add..fdb783aad841ed2f7d98291b3b250ae067b92c89 100644 (file)
--- a/modules/audio_filter/resampler/speex.c
+++ b/modules/audio_filter/resampler/speex.c
@@ -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 ()

diff --git a/modules/audio_filter/resampler/src.c b/modules/audio_filter/resampler/src.c
index 4ea01aed6aa551df350fbe32bc060cb4c8289ade..ea6ed9968bf5e0019528bbcbf2608915e5e38780 100644 (file)
--- a/modules/audio_filter/resampler/src.c
+++ b/modules/audio_filter/resampler/src.c
@@ -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 ()

diff --git a/modules/audio_filter/resampler/ugly.c b/modules/audio_filter/resampler/ugly.c
index 3ea3dab53a23173dc87e9f1757b7f2af4f392706..3f3337eede4e3496f0bdeabbbad8ccf21389896a 100644 (file)
--- a/modules/audio_filter/resampler/ugly.c
+++ b/modules/audio_filter/resampler/ugly.c
@@ -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 )

diff --git a/modules/stream_out/transcode/audio.c b/modules/stream_out/transcode/audio.c
index f8b0f454474e3f4a411747f0857a65317da29575..8635d303d7a3b0236f358122d915abacf0dda8c9 100644 (file)
--- a/modules/stream_out/transcode/audio.c
+++ b/modules/stream_out/transcode/audio.c
@@ -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 );
 

diff --git a/src/audio_output/filters.c b/src/audio_output/filters.c
index fdaad8e979725e1a1bc3654ed78c0b024048ce58..2e12e9db37aac3b150dd19405f007e738249b0d3 100644 (file)
--- a/src/audio_output/filters.c
+++ b/src/audio_output/filters.c
@@ -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 );

diff --git a/src/libvlc-module.c b/src/libvlc-module.c
index d293be70b7740b2e808a5577eaa340ae16851f5c..ac1a40d6ac67743d37010540caa55e67befd86ff 100644 (file)
--- a/src/libvlc-module.c
+++ b/src/libvlc-module.c
@@ -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 )