[vlc-commits] [Git][videolan/vlc][master] 6 commits: modules: demux: move priorities from 8 to 9

Steve Lhomme (@robUx4) gitlab at videolan.org
Sat Apr 15 08:12:50 UTC 2023



Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
27ed5157 by Thomas Guillem at 2023-04-15T07:48:47+00:00
modules: demux: move priorities from 8 to 9

Only ps was using the 8 priority, and the 9 was not used.

After this commit, the 7-8 priorities are not used.

- - - - -
fae94043 by Thomas Guillem at 2023-04-15T07:48:47+00:00
modules: demux: move priorities from 6 to 8

Only h26x and ty were using the 6 priority, and the 7 and 8 were not used.

After this commit, the 6-7 priorities are not used.

- - - - -
7b1869eb by Thomas Guillem at 2023-04-15T07:48:47+00:00
modules: demux: move priorities from 5 to 7

bluray, dvdnav, mjpeg, es, mpgv, ytdl were using the 5 priority, and the
6 and 7 were not used.

After this commit, the 5-6 priorities are not used.

- - - - -
d7b4421b by Thomas Guillem at 2023-04-15T07:48:47+00:00
modules: demux: move priorities from 3 to 6

Only cdg was using the 3 priority, and the 4-6 were not used.

After this commit, the 3-5 priorities are not used.

- - - - -
20511a88 by Thomas Guillem at 2023-04-15T07:48:47+00:00
modules: demux: move priorities from 2 to 5

Only avformat and lua were using the 2 priority, and the 3-5 were not used.

After this commit, the 2-4 priorities are not used.

- - - - -
73053e6b by Thomas Guillem at 2023-04-15T07:48:47+00:00
modules: demux: increase stl and vobsub priorities

Only forced_ps should have a priority of 1 since this probe can't fail.

stl and vobsub could never being probed, depending on the way modules
were sorted (but that was not the case).

- - - - -


14 changed files:

- modules/access/bluray.c
- modules/access/dvdnav.c
- modules/demux/avformat/avformat.c
- modules/demux/cdg.c
- modules/demux/mjpeg.c
- modules/demux/mpeg/es.c
- modules/demux/mpeg/h26x.c
- modules/demux/mpeg/mpgv.c
- modules/demux/mpeg/ps.c
- modules/demux/stl.c
- modules/demux/ty.c
- modules/demux/vobsub.c
- modules/demux/ytdl.c
- modules/lua/vlc.c


Changes:

=====================================
modules/access/bluray.c
=====================================
@@ -256,7 +256,7 @@ vlc_module_begin ()
     add_submodule()
         set_description( "BluRay demuxer" )
         set_subcategory( SUBCAT_INPUT_DEMUX )
-        set_capability( "demux", 5 )
+        set_capability( "demux", 7 )
         set_callbacks( blurayOpen, blurayClose )
 #endif
 


=====================================
modules/access/dvdnav.c
=====================================
@@ -96,7 +96,7 @@ vlc_module_begin ()
     add_submodule()
         set_description( N_("DVDnav demuxer") )
         set_subcategory( SUBCAT_INPUT_DEMUX )
-        set_capability( "demux", 5 )
+        set_capability( "demux", 7 )
         set_callbacks( DemuxOpen, Close )
         add_shortcut( "dvd", "iso" )
 vlc_module_end ()


=====================================
modules/demux/avformat/avformat.c
=====================================
@@ -40,7 +40,7 @@ vlc_module_begin ()
     set_subcategory( SUBCAT_INPUT_DEMUX )
     set_description( N_("Avformat demuxer" ) )
     set_shortname( N_("Avformat") )
-    set_capability( "demux", 2 )
+    set_capability( "demux", 5 )
     set_callbacks( avformat_OpenDemux, avformat_CloseDemux )
     set_section( N_("Demuxer"), NULL )
     add_string( "avformat-format", NULL, FORMAT_TEXT, FORMAT_LONGTEXT )
@@ -51,7 +51,7 @@ vlc_module_begin ()
     add_submodule ()
     add_shortcut( "ffmpeg", "avformat" )
     set_description( N_("Avformat muxer" ) )
-    set_capability( "sout mux", 2 )
+    set_capability( "sout mux", 5 )
     set_section( N_("Muxer"), NULL )
     add_string( "sout-avformat-mux", NULL, MUX_TEXT, MUX_LONGTEXT )
     add_string( "sout-avformat-options", NULL, AV_OPTIONS_TEXT, AV_OPTIONS_LONGTEXT )


=====================================
modules/demux/cdg.c
=====================================
@@ -40,7 +40,7 @@ static int  Open ( vlc_object_t * );
 vlc_module_begin ()
     set_description( N_("CDG demuxer") )
     set_subcategory( SUBCAT_INPUT_DEMUX )
-    set_capability( "demux", 3 )
+    set_capability( "demux", 6 )
     set_callback( Open )
     add_shortcut( "cdg", "subtitle" )
 vlc_module_end ()


=====================================
modules/demux/mjpeg.c
=====================================
@@ -49,7 +49,7 @@ static int  Open ( vlc_object_t * );
 vlc_module_begin ()
     set_shortname( "MJPEG")
     set_description( N_("M-JPEG camera demuxer") )
-    set_capability( "demux", 5 )
+    set_capability( "demux", 7 )
     set_callback( Open )
     set_subcategory( SUBCAT_INPUT_DEMUX )
     add_float( "mjpeg-fps", 0.0, FPS_TEXT, FPS_LONGTEXT )


=====================================
modules/demux/mpeg/es.c
=====================================
@@ -71,7 +71,7 @@ vlc_module_begin ()
 
     add_submodule()
     set_description( N_("MPEG-4 video" ) )
-    set_capability( "demux", 5 )
+    set_capability( "demux", 7 )
     set_callbacks( OpenVideo, Close )
     add_float( "es-fps", 25, FPS_TEXT, FPS_LONGTEXT )
 


=====================================
modules/demux/mpeg/h26x.c
=====================================
@@ -50,7 +50,7 @@ vlc_module_begin ()
     set_shortname( "H264")
     set_subcategory( SUBCAT_INPUT_DEMUX )
     set_description( N_("H264 video demuxer" ) )
-    set_capability( "demux", 6 )
+    set_capability( "demux", 8 )
     set_section( N_("H264 video demuxer" ), NULL )
     add_float( "h264-fps", 0.0, FPS_TEXT, FPS_LONGTEXT )
     set_callbacks( OpenH264, Close )
@@ -61,7 +61,7 @@ vlc_module_begin ()
         set_shortname( "HEVC")
         set_subcategory( SUBCAT_INPUT_DEMUX )
         set_description( N_("HEVC/H.265 video demuxer" ) )
-        set_capability( "demux", 6 )
+        set_capability( "demux", 8 )
         set_section( N_("HEVC/H.265 video demuxer" ), NULL )
         add_float( "hevc-fps", 0.0, FPS_TEXT, FPS_LONGTEXT )
         set_callbacks( OpenHEVC, Close )


=====================================
modules/demux/mpeg/mpgv.c
=====================================
@@ -42,7 +42,7 @@ static void Close( vlc_object_t * );
 vlc_module_begin ()
     set_subcategory( SUBCAT_INPUT_DEMUX )
     set_description( N_("MPEG-I/II video demuxer" ) )
-    set_capability( "demux", 5 )
+    set_capability( "demux", 7 )
     set_callbacks( Open, Close )
     add_shortcut( "mpgv" )
 vlc_module_end ()


=====================================
modules/demux/mpeg/ps.c
=====================================
@@ -71,7 +71,7 @@ vlc_module_begin ()
 
     add_submodule ()
     set_description( N_("MPEG-PS demuxer") )
-    set_capability( "demux", 8 )
+    set_capability( "demux", 9 )
     set_callbacks( Open, Close )
     add_shortcut( "ps" )
 vlc_module_end ()


=====================================
modules/demux/stl.c
=====================================
@@ -41,7 +41,7 @@ static void Close(vlc_object_t *);
 vlc_module_begin()
     set_description(N_("EBU STL subtitles parser"))
     set_subcategory(SUBCAT_INPUT_DEMUX)
-    set_capability("demux", 1)
+    set_capability("demux", 4)
     set_callbacks(Open, Close)
     add_shortcut("stl", "subtitle")
 vlc_module_end()


=====================================
modules/demux/ty.c
=====================================
@@ -62,7 +62,7 @@ vlc_module_begin ()
     set_shortname( N_("TY") )
     set_description(N_("TY Stream audio/video demux"))
     set_subcategory( SUBCAT_INPUT_DEMUX )
-    set_capability("demux", 6)
+    set_capability("demux", 8)
     /* FIXME: there seems to be a segfault when using PVR access
      * and TY demux has a bigger priority than PS
      * Something must be wrong.


=====================================
modules/demux/vobsub.c
=====================================
@@ -49,7 +49,7 @@ static void Close( vlc_object_t *p_this );
 vlc_module_begin ()
     set_description( N_("Vobsub subtitles parser") )
     set_subcategory( SUBCAT_INPUT_DEMUX )
-    set_capability( "demux", 1 )
+    set_capability( "demux", 4 )
 
     set_callbacks( Open, Close )
 


=====================================
modules/demux/ytdl.c
=====================================
@@ -437,7 +437,7 @@ vlc_module_begin()
     set_shortname("YT-DL")
     set_description("YT-DL extractor")
     set_subcategory(SUBCAT_INPUT_STREAM_FILTER)
-    set_capability("demux", 5)
+    set_capability("demux", 7)
     set_callbacks(OpenFilter, Close)
     add_bool("ytdl", true, N_("Enable YT-DL"), NULL)
         change_safe()


=====================================
modules/lua/vlc.c
=====================================
@@ -667,7 +667,7 @@ vlc_module_begin ()
         add_shortcut( "luaplaylist" )
         set_shortname( N_("Lua Playlist") )
         set_description( N_("Lua Playlist Parser Interface") )
-        set_capability( "demux", 2 )
+        set_capability( "demux", 5 )
         set_callbacks( Import_LuaPlaylist, Close_LuaPlaylist )
 
     add_submodule ()



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/9814ddaa6987aaf79701ed07f6c8de845aa8a821...73053e6b9a35f49c90747154f386d3546c413228

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/9814ddaa6987aaf79701ed07f6c8de845aa8a821...73053e6b9a35f49c90747154f386d3546c413228
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance


More information about the vlc-commits mailing list