X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-allstuff%2Fsrc%2Flib.rs;h=ec41d7ecec01058c577e3c8514f01ed8a4749652;hb=e31eabc9d7a774e2234835f4deffaa8e5991cb97;hp=88435c549e03ab3f5ca19420c92025fd090a2fb0;hpb=4c1582cf2e275af7c0f4a2c1a397fed5b68d31d5;p=nihav.git

diff --git a/nihav-allstuff/src/lib.rs b/nihav-allstuff/src/lib.rs
index 88435c5..ec41d7e 100644
--- a/nihav-allstuff/src/lib.rs
+++ b/nihav-allstuff/src/lib.rs
@@ -1,70 +1,93 @@
 //! Umbrella crate to register decoders and demuxers from all known NihAV crates.
-extern crate nihav_core;
-extern crate nihav_commonfmt;
-extern crate nihav_duck;
-extern crate nihav_game;
-extern crate nihav_indeo;
-extern crate nihav_ms;
-extern crate nihav_rad;
-extern crate nihav_realmedia;
-
 use nihav_core::codecs::RegisteredDecoders;
+use nihav_core::codecs::RegisteredMTDecoders;
+use nihav_core::codecs::RegisteredPacketisers;
 use nihav_core::codecs::RegisteredEncoders;
 use nihav_core::demuxers::RegisteredDemuxers;
+use nihav_core::demuxers::RegisteredRawDemuxers;
 use nihav_core::muxers::RegisteredMuxers;
 
-use nihav_commonfmt::generic_register_all_codecs;
-use nihav_commonfmt::generic_register_all_demuxers;
-use nihav_commonfmt::generic_register_all_encoders;
-use nihav_commonfmt::generic_register_all_muxers;
-
-use nihav_duck::duck_register_all_codecs;
-
-use nihav_game::game_register_all_codecs;
-use nihav_game::game_register_all_demuxers;
-
-use nihav_indeo::indeo_register_all_codecs;
-
-use nihav_ms::ms_register_all_codecs;
-use nihav_ms::ms_register_all_encoders;
-
-use nihav_qt::qt_register_all_codecs;
+use nihav_commonfmt::*;
+use nihav_duck::*;
+use nihav_flash::*;
+use nihav_game::*;
+use nihav_indeo::*;
+use nihav_itu::*;
+use nihav_llaudio::*;
+use nihav_misc::*;
+use nihav_mpeg::*;
+use nihav_ms::*;
+use nihav_qt::qt_register_all_decoders;
+use nihav_rad::*;
+use nihav_realmedia::*;
+use nihav_vivo::*;
 
-use nihav_rad::rad_register_all_codecs;
-use nihav_rad::rad_register_all_demuxers;
+/// Registers all known decoders.
+pub fn nihav_register_all_decoders(rd: &mut RegisteredDecoders) {
+    generic_register_all_decoders(rd);
+    duck_register_all_decoders(rd);
+    flash_register_all_decoders(rd);
+    game_register_all_decoders(rd);
+    indeo_register_all_decoders(rd);
+    itu_register_all_decoders(rd);
+    llaudio_register_all_decoders(rd);
+    misc_register_all_decoders(rd);
+    mpeg_register_all_decoders(rd);
+    ms_register_all_decoders(rd);
+    qt_register_all_decoders(rd);
+    rad_register_all_decoders(rd);
+    realmedia_register_all_decoders(rd);
+    vivo_register_all_decoders(rd);
+}
 
-use nihav_realmedia::realmedia_register_all_codecs;
-use nihav_realmedia::realmedia_register_all_demuxers;
+/// Registers all known multi-threaded decoders.
+pub fn nihav_register_all_mt_decoders(rd: &mut RegisteredMTDecoders) {
+    itu_register_all_mt_decoders(rd);
+}
 
-/// Registers all known decoders.
-pub fn nihav_register_all_codecs(rd: &mut RegisteredDecoders) {
-    generic_register_all_codecs(rd);
-    duck_register_all_codecs(rd);
-    game_register_all_codecs(rd);
-    indeo_register_all_codecs(rd);
-    ms_register_all_codecs(rd);
-    qt_register_all_codecs(rd);
-    rad_register_all_codecs(rd);
-    realmedia_register_all_codecs(rd);
+/// Registers all known packetisers.
+pub fn nihav_register_all_packetisers(rp: &mut RegisteredPacketisers) {
+    llaudio_register_all_packetisers(rp);
+    mpeg_register_all_packetisers(rp);
 }
 
 /// Registers all known demuxers.
 pub fn nihav_register_all_demuxers(rd: &mut RegisteredDemuxers) {
+    duck_register_all_demuxers(rd);
     generic_register_all_demuxers(rd);
+    flash_register_all_demuxers(rd);
     game_register_all_demuxers(rd);
+    indeo_register_all_demuxers(rd);
+    llaudio_register_all_demuxers(rd);
     rad_register_all_demuxers(rd);
     realmedia_register_all_demuxers(rd);
+    vivo_register_all_demuxers(rd);
+}
+
+/// Registers all known raw stream demuxers.
+pub fn nihav_register_all_raw_demuxers(rd: &mut RegisteredRawDemuxers) {
+    llaudio_register_all_raw_demuxers(rd);
 }
 
 /// Registers all known encoders.
 pub fn nihav_register_all_encoders(re: &mut RegisteredEncoders) {
+    flash_register_all_encoders(re);
     generic_register_all_encoders(re);
+    indeo_register_all_encoders(re);
+    duck_register_all_encoders(re);
+    llaudio_register_all_encoders(re);
     ms_register_all_encoders(re);
+    rad_register_all_encoders(re);
+    realmedia_register_all_encoders(re);
 }
 
 /// Registers all known demuxers.
 pub fn nihav_register_all_muxers(rm: &mut RegisteredMuxers) {
+    flash_register_all_muxers(rm);
     generic_register_all_muxers(rm);
+    llaudio_register_all_muxers(rm);
+    rad_register_all_muxers(rm);
+    realmedia_register_all_muxers(rm);
 }
 
 #[cfg(test)]
@@ -78,7 +101,7 @@ mod test {
     #[test]
     fn test_descriptions() {
         let mut rd = RegisteredDecoders::new();
-        nihav_register_all_codecs(&mut rd);
+        nihav_register_all_decoders(&mut rd);
         let mut has_missing = false;
         for dec in rd.iter() {
             print!("decoder {} - ", dec.name);