Added files/declarations for stream_filter module.

diff --git a/configure.ac b/configure.ac
index b01976c0251baa053bca0354dc6c0e3fdbe856bc..fb262500be1fb5f8776c87ec8e165534887ef8a6 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -5860,6 +5860,7 @@ AC_CONFIG_FILES([
   modules/mux/mpeg/Makefile
   modules/packetizer/Makefile
   modules/services_discovery/Makefile
+  modules/stream_filter/Makefile
   modules/stream_out/Makefile
   modules/stream_out/transrate/Makefile
   modules/video_chroma/Makefile

diff --git a/include/vlc_config_cat.h b/include/vlc_config_cat.h
index 99fac9f46af869906145739a02fc26508bb3bfa6..6bc4a6662a35fcf79202128fbf9df108d3a451ac 100644 (file)
--- a/include/vlc_config_cat.h
+++ b/include/vlc_config_cat.h
@@ -112,6 +112,12 @@
     "the input side of VLC. You should not touch anything here unless you " \
     "know what you are doing." )
 
+#define STREAM_FILTER_TITLE N_( "Stream filters" )
+#define STREAM_FILTER_HELP N_( \
+    "Stream filters are special modules that allow advanced operations on " \
+    "the input side of VLC. You should not touch anything here unless you " \
+    "know what you are doing." )
+
 #define DEMUX_TITLE N_("Demuxers")
 #define DEMUX_HELP N_( "Demuxers are used to separate audio and video streams." )
 
@@ -265,6 +271,7 @@ static const struct config_category_t categories_array[] =
     { SUBCAT_INPUT_VCODEC, VDEC_TITLE, VDEC_HELP },
     { SUBCAT_INPUT_ACODEC, ADEC_TITLE, ADEC_HELP },
     { SUBCAT_INPUT_SCODEC, SDEC_TITLE, SDEC_HELP },
+    { SUBCAT_INPUT_STREAM_FILTER, STREAM_FILTER_TITLE, STREAM_FILTER_HELP },
 
     { CAT_SOUT, SOUT_TITLE, SOUT_HELP },
     { SUBCAT_SOUT_GENERAL, GENERAL_TITLE, SOUT_GENERAL_HELP },

diff --git a/include/vlc_configuration.h b/include/vlc_configuration.h
index fa702f71bc3db8888f2ce6967444d36885f3659f..5b8f69df47d691047d3351424ab509c3154d531e 100644 (file)
--- a/include/vlc_configuration.h
+++ b/include/vlc_configuration.h
@@ -103,6 +103,7 @@ extern "C" {
    #define SUBCAT_INPUT_VCODEC 405
    #define SUBCAT_INPUT_ACODEC 406
    #define SUBCAT_INPUT_SCODEC 407
+   #define SUBCAT_INPUT_STREAM_FILTER 408
 
 #define CAT_SOUT 5
    #define SUBCAT_SOUT_GENERAL 501

diff --git a/modules/Makefile.am b/modules/Makefile.am
index 1a2ad33fb36a9e4c966bd98dc9a93ff3f1447890..bee6653f74077eddfcd25bfa2aed637b2f334080 100644 (file)
--- a/modules/Makefile.am
+++ b/modules/Makefile.am
@@ -12,6 +12,7 @@ BASE_SUBDIRS = \
        misc \
        packetizer \
        services_discovery \
+       stream_filter \
        video_chroma \
        video_filter \
        video_output \

diff --git a/modules/stream_filter/Modules.am b/modules/stream_filter/Modules.am
new file mode 100644 (file)
index 0000000..8b13789
--- /dev/null
+++ b/modules/stream_filter/Modules.am
@@ -0,0 +1 @@
+

diff --git a/src/libvlc-module.c b/src/libvlc-module.c
index ccc932aa32a792f424017a30a0c31de0541e917f..bdc87ec21d50e7d450df37c146b252399ac8e801 100644 (file)
--- a/src/libvlc-module.c
+++ b/src/libvlc-module.c
@@ -1014,8 +1014,11 @@ static const char *const ppsz_clock_descriptions[] =
 
 #define ACCESS_FILTER_TEXT N_("Access filter module")
 #define ACCESS_FILTER_LONGTEXT N_( \
-    "Access filters are used to modify the stream that is being read. " \
-    "This is used for instance for timeshifting.")
+    "Access filters are used to modify the stream that is being read." )
+
+#define STREAM_FILTER_TEXT N_("Stream filter module")
+#define STREAM_FILTER_LONGTEXT N_( \
+    "Stream filters are used to modify the stream that is being read. " )
 
 #define DEMUX_TEXT N_("Demux module")
 #define DEMUX_LONGTEXT N_( \
@@ -1806,6 +1809,10 @@ vlc_module_begin ()
     add_bool( "prefer-system-codecs", false, NULL, SYSTEM_CODEC_TEXT,
                                 SYSTEM_CODEC_LONGTEXT, false );
 
+    set_subcategory( SUBCAT_INPUT_STREAM_FILTER )
+    add_module_list_cat( "stream-filter", SUBCAT_INPUT_STREAM_FILTER, NULL, NULL,
+                STREAM_FILTER_TEXT, STREAM_FILTER_LONGTEXT, false );
+
 
 /* Stream output options */
     set_category( CAT_SOUT )

diff --git a/src/modules/modules.c b/src/modules/modules.c
index 0b00d07ee4ad8245c89c926c73589e18ba743bf0..0f39d63904f5a7b63bb5b7629b643d7688527f89 100644 (file)
--- a/src/modules/modules.c
+++ b/src/modules/modules.c
@@ -608,6 +608,7 @@ found_shortcut:
     else if( count == 0 )
     {
         if( !strcmp( psz_capability, "access_demux" )
+         || !strcmp( psz_capability, "stream_filter" )
          || !strcmp( psz_capability, "vout_window" ) )
         {
             msg_Dbg( p_this, "no %s module matched \"%s\"",