diff options
| author | Kostya Shishkov <kostya.shishkov@gmail.com> | 2020-07-09 18:57:29 +0200 |
|---|---|---|
| committer | Kostya Shishkov <kostya.shishkov@gmail.com> | 2020-07-09 18:57:29 +0200 |
| commit | 78fb6560c73965d834b215fb0b49505ae5443288 (patch) | |
| tree | 837f8adb980249cb696c35b39a0e43bfde976ad6 | |
| parent | 0bc221c3de38a5e549cb23cebf74349669310143 (diff) | |
| download | nihav-78fb6560c73965d834b215fb0b49505ae5443288.tar.gz | |
rename register_all_codecs to register_all_decoders
79 files changed, 188 insertions, 188 deletions
diff --git a/nihav-allstuff/src/lib.rs b/nihav-allstuff/src/lib.rs index 88435c5..5ef4fe9 100644 --- a/nihav-allstuff/src/lib.rs +++ b/nihav-allstuff/src/lib.rs @@ -13,39 +13,39 @@ use nihav_core::codecs::RegisteredEncoders; use nihav_core::demuxers::RegisteredDemuxers; use nihav_core::muxers::RegisteredMuxers; -use nihav_commonfmt::generic_register_all_codecs; +use nihav_commonfmt::generic_register_all_decoders; 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_duck::duck_register_all_decoders; -use nihav_game::game_register_all_codecs; +use nihav_game::game_register_all_decoders; use nihav_game::game_register_all_demuxers; -use nihav_indeo::indeo_register_all_codecs; +use nihav_indeo::indeo_register_all_decoders; -use nihav_ms::ms_register_all_codecs; +use nihav_ms::ms_register_all_decoders; use nihav_ms::ms_register_all_encoders; -use nihav_qt::qt_register_all_codecs; +use nihav_qt::qt_register_all_decoders; -use nihav_rad::rad_register_all_codecs; +use nihav_rad::rad_register_all_decoders; use nihav_rad::rad_register_all_demuxers; -use nihav_realmedia::realmedia_register_all_codecs; +use nihav_realmedia::realmedia_register_all_decoders; use nihav_realmedia::realmedia_register_all_demuxers; /// 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); +pub fn nihav_register_all_decoders(rd: &mut RegisteredDecoders) { + generic_register_all_decoders(rd); + duck_register_all_decoders(rd); + game_register_all_decoders(rd); + indeo_register_all_decoders(rd); + ms_register_all_decoders(rd); + qt_register_all_decoders(rd); + rad_register_all_decoders(rd); + realmedia_register_all_decoders(rd); } /// Registers all known demuxers. @@ -78,7 +78,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); diff --git a/nihav-commonfmt/src/codecs/aac.rs b/nihav-commonfmt/src/codecs/aac.rs index 54ccef6..d3f991b 100644 --- a/nihav-commonfmt/src/codecs/aac.rs +++ b/nihav-commonfmt/src/codecs/aac.rs @@ -1274,14 +1274,14 @@ mod test { use nihav_core::codecs::RegisteredDecoders; use nihav_core::demuxers::RegisteredDemuxers; use nihav_codec_support::test::dec_video::test_decode_audio; - use crate::generic_register_all_codecs; + use crate::generic_register_all_decoders; use nihav_realmedia::realmedia_register_all_demuxers; #[test] fn test_aac() { let mut dmx_reg = RegisteredDemuxers::new(); realmedia_register_all_demuxers(&mut dmx_reg); let mut dec_reg = RegisteredDecoders::new(); - generic_register_all_codecs(&mut dec_reg); + generic_register_all_decoders(&mut dec_reg); // let file = "assets/RV/rv40_weighted_mc.rmvb"; let file = "assets/RV/rv40_weighted_mc_2.rmvb"; diff --git a/nihav-commonfmt/src/codecs/atrac3.rs b/nihav-commonfmt/src/codecs/atrac3.rs index 8512482..f1b9ef6 100644 --- a/nihav-commonfmt/src/codecs/atrac3.rs +++ b/nihav-commonfmt/src/codecs/atrac3.rs @@ -712,14 +712,14 @@ mod test { use nihav_core::codecs::RegisteredDecoders; use nihav_core::demuxers::RegisteredDemuxers; use nihav_codec_support::test::dec_video::test_decode_audio; - use crate::generic_register_all_codecs; + use crate::generic_register_all_decoders; use nihav_realmedia::realmedia_register_all_demuxers; #[test] fn test_atrac3() { let mut dmx_reg = RegisteredDemuxers::new(); realmedia_register_all_demuxers(&mut dmx_reg); let mut dec_reg = RegisteredDecoders::new(); - generic_register_all_codecs(&mut dec_reg); + generic_register_all_decoders(&mut dec_reg); let file = "assets/RV/rv30_atrc_384x208_realproducer_plus_8.51.rm"; // let file = "assets/RV/rv20_svt_atrc_640x352_realproducer_plus_8.51.rm"; diff --git a/nihav-commonfmt/src/codecs/cinepak.rs b/nihav-commonfmt/src/codecs/cinepak.rs index 8c67c5c..ff1130b 100644 --- a/nihav-commonfmt/src/codecs/cinepak.rs +++ b/nihav-commonfmt/src/codecs/cinepak.rs @@ -399,14 +399,14 @@ mod test { use nihav_core::codecs::RegisteredDecoders; use nihav_core::demuxers::RegisteredDemuxers; use nihav_codec_support::test::dec_video::*; - use crate::generic_register_all_codecs; + use crate::generic_register_all_decoders; use crate::generic_register_all_demuxers; #[test] fn test_cinepak() { let mut dmx_reg = RegisteredDemuxers::new(); generic_register_all_demuxers(&mut dmx_reg); let mut dec_reg = RegisteredDecoders::new(); - generic_register_all_codecs(&mut dec_reg); + generic_register_all_decoders(&mut dec_reg); test_decoding("avi", "cinepak", "assets/Misc/ot171.avi", Some(10), &dmx_reg, &dec_reg, ExpectedTestResult::MD5Frames(vec![ [0xd58326b0, 0xdbfc1dcc, 0x6d66a04c, 0x08a21bbb], @@ -426,7 +426,7 @@ mod test { let mut dmx_reg = RegisteredDemuxers::new(); generic_register_all_demuxers(&mut dmx_reg); let mut dec_reg = RegisteredDecoders::new(); - generic_register_all_codecs(&mut dec_reg); + generic_register_all_decoders(&mut dec_reg); test_decoding("mov", "cinepak", "assets/Misc/dday.mov", Some(10), &dmx_reg, &dec_reg, ExpectedTestResult::MD5Frames(vec![ [0x2ab229bc, 0xb71308aa, 0x979511c6, 0xcef3ea92], @@ -446,7 +446,7 @@ mod test { let mut dmx_reg = RegisteredDemuxers::new(); generic_register_all_demuxers(&mut dmx_reg); let mut dec_reg = RegisteredDecoders::new(); - generic_register_all_codecs(&mut dec_reg); + generic_register_all_decoders(&mut dec_reg); test_decoding("mov", "cinepak", "assets/Misc/catfight Tag team DT.mov", Some(10), &dmx_reg, &dec_reg, ExpectedTestResult::MD5Frames(vec![ [0x3f7ec8ea, 0x873a2bc6, 0xcc58336e, 0xe88c4ffd], diff --git a/nihav-commonfmt/src/codecs/cinepakenc.rs b/nihav-commonfmt/src/codecs/cinepakenc.rs index 1c134c0..95994ee 100644 --- a/nihav-commonfmt/src/codecs/cinepakenc.rs +++ b/nihav-commonfmt/src/codecs/cinepakenc.rs @@ -1069,7 +1069,7 @@ mod test { let mut dmx_reg = RegisteredDemuxers::new(); generic_register_all_demuxers(&mut dmx_reg); let mut dec_reg = RegisteredDecoders::new(); - generic_register_all_codecs(&mut dec_reg); + generic_register_all_decoders(&mut dec_reg); let mut mux_reg = RegisteredMuxers::new(); generic_register_all_muxers(&mut mux_reg); let mut enc_reg = RegisteredEncoders::new(); diff --git a/nihav-commonfmt/src/codecs/clearvideo.rs b/nihav-commonfmt/src/codecs/clearvideo.rs index 4f24bd4..8b22dad 100644 --- a/nihav-commonfmt/src/codecs/clearvideo.rs +++ b/nihav-commonfmt/src/codecs/clearvideo.rs @@ -727,14 +727,14 @@ mod test { use nihav_core::codecs::RegisteredDecoders; use nihav_core::demuxers::RegisteredDemuxers; use nihav_codec_support::test::dec_video::*; - use crate::generic_register_all_codecs; + use crate::generic_register_all_decoders; use crate::generic_register_all_demuxers; #[test] fn test_clv() { let mut dmx_reg = RegisteredDemuxers::new(); generic_register_all_demuxers(&mut dmx_reg); let mut dec_reg = RegisteredDecoders::new(); - generic_register_all_codecs(&mut dec_reg); + generic_register_all_decoders(&mut dec_reg); test_decoding("avi", "clearvideo", "assets/Misc/TalkingHead_352x288.avi", Some(10), &dmx_reg, &dec_reg, ExpectedTestResult::MD5Frames(vec![ [0xb432376c, 0xf1dce57b, 0x8e79c7ee, 0xdd51850d], diff --git a/nihav-commonfmt/src/codecs/mod.rs b/nihav-commonfmt/src/codecs/mod.rs index 9cedec9..643e73c 100644 --- a/nihav-commonfmt/src/codecs/mod.rs +++ b/nihav-commonfmt/src/codecs/mod.rs @@ -52,7 +52,7 @@ const DECODERS: &[DecoderInfo] = &[ ]; /// Registers all available codecs provided by this crate. -pub fn generic_register_all_codecs(rd: &mut RegisteredDecoders) { +pub fn generic_register_all_decoders(rd: &mut RegisteredDecoders) { for decoder in DECODERS.iter() { rd.add_decoder(decoder.clone()); } diff --git a/nihav-commonfmt/src/codecs/sipro.rs b/nihav-commonfmt/src/codecs/sipro.rs index 86a8bd5..a1a1ed3 100644 --- a/nihav-commonfmt/src/codecs/sipro.rs +++ b/nihav-commonfmt/src/codecs/sipro.rs @@ -750,14 +750,14 @@ mod test { use nihav_core::codecs::RegisteredDecoders; use nihav_core::demuxers::RegisteredDemuxers; use nihav_codec_support::test::dec_video::test_decode_audio; - use crate::generic_register_all_codecs; + use crate::generic_register_all_decoders; use nihav_realmedia::realmedia_register_all_demuxers; #[test] fn test_sipro() { let mut dmx_reg = RegisteredDemuxers::new(); realmedia_register_all_demuxers(&mut dmx_reg); let mut dec_reg = RegisteredDecoders::new(); - generic_register_all_codecs(&mut dec_reg); + generic_register_all_decoders(&mut dec_reg); let file = "assets/RV/autahi-vox.rm"; test_decode_audio("realmedia", file, Some(5000), None/*Some("sipro")*/, &dmx_reg, &dec_reg); diff --git a/nihav-commonfmt/src/codecs/ts102366.rs b/nihav-commonfmt/src/codecs/ts102366.rs index ab0e84c..c4b1800 100644 --- a/nihav-commonfmt/src/codecs/ts102366.rs +++ b/nihav-commonfmt/src/codecs/ts102366.rs @@ -1256,14 +1256,14 @@ mod test { use nihav_core::codecs::RegisteredDecoders; use nihav_core::demuxers::RegisteredDemuxers; use nihav_codec_support::test::dec_video::test_decode_audio; - use crate::generic_register_all_codecs; + use crate::generic_register_all_decoders; use nihav_realmedia::realmedia_register_all_demuxers; #[test] fn test_ts102366() { let mut dmx_reg = RegisteredDemuxers::new(); realmedia_register_all_demuxers(&mut dmx_reg); let mut dec_reg = RegisteredDecoders::new(); - generic_register_all_codecs(&mut dec_reg); + generic_register_all_decoders(&mut dec_reg); let file = "assets/RV/sp_sample1.rm"; test_decode_audio("realmedia", file, Some(12000), None/*Some("ac3")*/, &dmx_reg, &dec_reg); diff --git a/nihav-commonfmt/src/lib.rs b/nihav-commonfmt/src/lib.rs index b5b96d2..b02cd81 100644 --- a/nihav-commonfmt/src/lib.rs +++ b/nihav-commonfmt/src/lib.rs @@ -11,7 +11,7 @@ extern crate nihav_registry; mod codecs; #[cfg(feature="decoders")] -pub use crate::codecs::generic_register_all_codecs; +pub use crate::codecs::generic_register_all_decoders; #[cfg(feature="encoders")] pub use crate::codecs::generic_register_all_encoders; diff --git a/nihav-core/src/codecs/mod.rs b/nihav-core/src/codecs/mod.rs index c6ee95e..58757ef 100644 --- a/nihav-core/src/codecs/mod.rs +++ b/nihav-core/src/codecs/mod.rs @@ -102,7 +102,7 @@ pub struct DecoderInfo { /// Structure for registering known decoders. /// -/// It is supposed to be filled using `register_all_codecs()` from some decoders crate and then it can be used to create decoders for the requested codecs. +/// It is supposed to be filled using `register_all_decoders()` from some decoders crate and then it can be used to create decoders for the requested codecs. #[derive(Default)] pub struct RegisteredDecoders { decs: Vec<DecoderInfo>, @@ -319,7 +319,7 @@ pub struct EncoderInfo { /// Structure for registering known encoders. /// -/// It is supposed to be filled using `register_all_codecs()` from some encoders crate and then it can be used to create encoders for the requested codecs. +/// It is supposed to be filled using `register_all_decoders()` from some encoders crate and then it can be used to create encoders for the requested codecs. #[derive(Default)] pub struct RegisteredEncoders { encs: Vec<EncoderInfo>, diff --git a/nihav-duck/src/codecs/dkadpcm.rs b/nihav-duck/src/codecs/dkadpcm.rs index be128db..399b4f7 100644 --- a/nihav-duck/src/codecs/dkadpcm.rs +++ b/nihav-duck/src/codecs/dkadpcm.rs @@ -159,14 +159,14 @@ mod test { use nihav_core::codecs::RegisteredDecoders; use nihav_core::demuxers::RegisteredDemuxers; use nihav_codec_support::test::dec_video::*; - use crate::duck_register_all_codecs; + use crate::duck_register_all_decoders; use nihav_commonfmt::generic_register_all_demuxers; #[test] fn test_dk3() { let mut dmx_reg = RegisteredDemuxers::new(); generic_register_all_demuxers(&mut dmx_reg); let mut dec_reg = RegisteredDecoders::new(); - duck_register_all_codecs(&mut dec_reg); + duck_register_all_decoders(&mut dec_reg); //let file = "assets/Duck/AVI-DUCK-dk3.duk"; //test_decode_audio("avi", file, Some(100), None/*Some("dk3")*/, &dmx_reg, &dec_reg); @@ -178,7 +178,7 @@ mod test { let mut dmx_reg = RegisteredDemuxers::new(); generic_register_all_demuxers(&mut dmx_reg); let mut dec_reg = RegisteredDecoders::new(); - duck_register_all_codecs(&mut dec_reg); + duck_register_all_decoders(&mut dec_reg); // let file = "assets/Duck/virtuafighter2-opening1.avi"; // test_decode_audio("avi", file, Some(100), None/*Some("dk4")*/, &dmx_reg, &dec_reg); diff --git a/nihav-duck/src/codecs/mod.rs b/nihav-duck/src/codecs/mod.rs index c5412e9..bfdd44e 100644 --- a/nihav-duck/src/codecs/mod.rs +++ b/nihav-duck/src/codecs/mod.rs @@ -91,7 +91,7 @@ const DUCK_CODECS: &[DecoderInfo] = &[ ]; /// Registers all available codecs provided by this crate. -pub fn duck_register_all_codecs(rd: &mut RegisteredDecoders) { +pub fn duck_register_all_decoders(rd: &mut RegisteredDecoders) { for decoder in DUCK_CODECS.iter() { rd.add_decoder(decoder.clone()); } diff --git a/nihav-duck/src/codecs/on2avc.rs b/nihav-duck/src/codecs/on2avc.rs index d65dbd6..29ead41 100644 --- a/nihav-duck/src/codecs/on2avc.rs +++ b/nihav-duck/src/codecs/on2avc.rs @@ -1068,14 +1068,14 @@ mod test { use nihav_core::codecs::RegisteredDecoders; use nihav_core::demuxers::RegisteredDemuxers; use nihav_codec_support::test::dec_video::*; - use crate::duck_register_all_codecs; + use crate::duck_register_all_decoders; use nihav_commonfmt::generic_register_all_demuxers; #[test] fn test_avc() { let mut dmx_reg = RegisteredDemuxers::new(); generic_register_all_demuxers(&mut dmx_reg); let mut dec_reg = RegisteredDecoders::new(); - duck_register_all_codecs(&mut dec_reg); + duck_register_all_decoders(&mut dec_reg); //let file = "assets/Duck/Cell-140.vp5"; //let file = "assets/Duck/Chocolat-500.vp5"; diff --git a/nihav-duck/src/codecs/truemotion1.rs b/nihav-duck/src/codecs/truemotion1.rs index b95b410..e1d0557 100644 --- a/nihav-duck/src/codecs/truemotion1.rs +++ b/nihav-duck/src/codecs/truemotion1.rs @@ -674,14 +674,14 @@ mod test { use nihav_core::codecs::RegisteredDecoders; use nihav_core::demuxers::RegisteredDemuxers; use nihav_codec_support::test::dec_video::*; - use crate::duck_register_all_codecs; + use crate::duck_register_all_decoders; use nihav_commonfmt::generic_register_all_demuxers; #[test] fn test_tm1() { let mut dmx_reg = RegisteredDemuxers::new(); generic_register_all_demuxers(&mut dmx_reg); let mut dec_reg = RegisteredDecoders::new(); - duck_register_all_codecs(&mut dec_reg); + duck_register_all_decoders(&mut dec_reg); test_decoding("avi", "truemotion1", "assets/Duck/phant2-940.duk", Some(12), &dmx_reg, &dec_reg, ExpectedTestResult::MD5Frames(vec![ diff --git a/nihav-duck/src/codecs/truemotion2.rs b/nihav-duck/src/codecs/truemotion2.rs index 09c9844..bf8aa7d 100644 --- a/nihav-duck/src/codecs/truemotion2.rs +++ b/nihav-duck/src/codecs/truemotion2.rs @@ -597,14 +597,14 @@ mod test { use nihav_core::codecs::RegisteredDecoders; use nihav_core::demuxers::RegisteredDemuxers; use nihav_codec_support::test::dec_video::*; - use crate::duck_register_all_codecs; + use crate::duck_register_all_decoders; use nihav_commonfmt::generic_register_all_demuxers; #[test] fn test_tm2() { let mut dmx_reg = RegisteredDemuxers::new(); generic_register_all_demuxers(&mut dmx_reg); let mut dec_reg = RegisteredDecoders::new(); - duck_register_all_codecs(&mut dec_reg); + duck_register_all_decoders(&mut dec_reg); test_decoding("avi", "truemotion2", "assets/Duck/tm20.avi", Some(16), &dmx_reg, &dec_reg, ExpectedTestResult::MD5Frames(vec![ diff --git a/nihav-duck/src/codecs/truemotion2x.rs b/nihav-duck/src/codecs/truemotion2x.rs index 76ca244..7f4ac52 100644 --- a/nihav-duck/src/codecs/truemotion2x.rs +++ b/nihav-duck/src/codecs/truemotion2x.rs @@ -710,14 +710,14 @@ mod test { use nihav_core::codecs::RegisteredDecoders; use nihav_core::demuxers::RegisteredDemuxers; use nihav_codec_support::test::dec_video::*; - use crate::duck_register_all_codecs; + use crate::duck_register_all_decoders; use nihav_commonfmt::generic_register_all_demuxers; #[test] fn test_tm2x() { let mut dmx_reg = RegisteredDemuxers::new(); generic_register_all_demuxers(&mut dmx_reg); let mut dec_reg = RegisteredDecoders::new(); - duck_register_all_codecs(&mut dec_reg); + duck_register_all_decoders(&mut dec_reg); test_decoding("avi", "truemotion2x", "assets/Duck/TM2x.avi", None, &dmx_reg, &dec_reg, ExpectedTestResult::MD5Frames(vec![ diff --git a/nihav-duck/src/codecs/truemotionrt.rs b/nihav-duck/src/codecs/truemotionrt.rs index 98d8858..5ca17bd 100644 --- a/nihav-duck/src/codecs/truemotionrt.rs +++ b/nihav-duck/src/codecs/truemotionrt.rs @@ -100,14 +100,14 @@ mod test { use nihav_core::codecs::RegisteredDecoders; use nihav_core::demuxers::RegisteredDemuxers; use nihav_codec_support::test::dec_video::*; - use crate::duck_register_all_codecs; + use crate::duck_register_all_decoders; use nihav_commonfmt::generic_register_all_demuxers; #[test] fn test_tmrt() { let mut dmx_reg = RegisteredDemuxers::new(); generic_register_all_demuxers(&mut dmx_reg); let mut dec_reg = RegisteredDecoders::new(); - duck_register_all_codecs(&mut dec_reg); + duck_register_all_decoders(&mut dec_reg); test_decoding("avi", "truemotionrt", "assets/Duck/tr20_low.avi", Some(10), &dmx_reg, &dec_reg, diff --git a/nihav-duck/src/codecs/vp3.rs b/nihav-duck/src/codecs/vp3.rs index c6dc62d..9d6ef6a 100644 --- a/nihav-duck/src/codecs/vp3.rs +++ b/nihav-duck/src/codecs/vp3.rs @@ -1885,7 +1885,7 @@ mod test { use nihav_core::codecs::RegisteredDecoders; use nihav_core::demuxers::RegisteredDemuxers; use nihav_codec_support::test::dec_video::*; - use crate::duck_register_all_codecs; + use crate::duck_register_all_decoders; use nihav_commonfmt::generic_register_all_demuxers; #[test] @@ -1893,7 +1893,7 @@ mod test { let mut dmx_reg = RegisteredDemuxers::new(); generic_register_all_demuxers(&mut dmx_reg); let mut dec_reg = RegisteredDecoders::new(); - duck_register_all_codecs(&mut dec_reg); + duck_register_all_decoders(&mut dec_reg); test_decoding("avi", "vp3", "assets/Duck/vp30-logo.avi", Some(23), &dmx_reg, &dec_reg, ExpectedTestResult::MD5([0x51aba7df, 0x6e42534d, 0xef6c5b13, 0x26c38d1f])); @@ -1904,7 +1904,7 @@ mod test { let mut dmx_reg = RegisteredDemuxers::new(); generic_register_all_demuxers(&mut dmx_reg); let mut dec_reg = RegisteredDecoders::new(); - duck_register_all_codecs(&mut dec_reg); + duck_register_all_decoders(&mut dec_reg); // let file = "assets/Duck/vp31.avi"; // let file = "assets/Duck/vp31_crash.avi"; @@ -1920,7 +1920,7 @@ mod test { let mut dmx_reg = RegisteredDemuxers::new(); generic_register_all_demuxers(&mut dmx_reg); let mut dec_reg = RegisteredDecoders::new(); - duck_register_all_codecs(&mut dec_reg); + duck_register_all_decoders(&mut dec_reg); test_decoding("avi", "vp3", "assets/Duck/ot171_vp40.avi", Some(86), &dmx_reg, &dec_reg, ExpectedTestResult::MD5([0xd41d8cd9, 0x8f00b204, 0xe9800998, 0xecf8427e])); diff --git a/nihav-duck/src/codecs/vp5.rs b/nihav-duck/src/codecs/vp5.rs index 36579a5..70c26c6 100644 --- a/nihav-duck/src/codecs/vp5.rs +++ b/nihav-duck/src/codecs/vp5.rs @@ -293,7 +293,7 @@ mod test { use nihav_core::codecs::RegisteredDecoders; use nihav_core::demuxers::RegisteredDemuxers; use nihav_codec_support::test::dec_video::*; - use crate::duck_register_all_codecs; + use crate::duck_register_all_decoders; use nihav_commonfmt::generic_register_all_demuxers; #[test] @@ -301,7 +301,7 @@ mod test { let mut dmx_reg = RegisteredDemuxers::new(); generic_register_all_demuxers(&mut dmx_reg); let mut dec_reg = RegisteredDecoders::new(); - duck_register_all_codecs(&mut dec_reg); + duck_register_all_decoders(&mut dec_reg); let file = "assets/Duck/Cell-140.vp5"; //let file = "assets/Duck/Chocolat-500.vp5"; diff --git a/nihav-duck/src/codecs/vp6.rs b/nihav-duck/src/codecs/vp6.rs index ddc8e63..93722d3 100644 --- a/nihav-duck/src/codecs/vp6.rs +++ b/nihav-duck/src/codecs/vp6.rs @@ -733,7 +733,7 @@ mod test { use nihav_core::codecs::RegisteredDecoders; use nihav_core::demuxers::RegisteredDemuxers; use nihav_codec_support::test::dec_video::*; - use crate::duck_register_all_codecs; + use crate::duck_register_all_decoders; use nihav_commonfmt::generic_register_all_demuxers; #[test] @@ -741,7 +741,7 @@ mod test { let mut dmx_reg = RegisteredDemuxers::new(); generic_register_all_demuxers(&mut dmx_reg); let mut dec_reg = RegisteredDecoders::new(); - duck_register_all_codecs(&mut dec_reg); + duck_register_all_decoders(&mut dec_reg); test_decoding("avi", "vp6", "assets/Duck/selection_720x576_300kBit_vp60i.avi", Some(16), &dmx_reg, &dec_reg, @@ -752,7 +752,7 @@ mod test { let mut dmx_reg = RegisteredDemuxers::new(); generic_register_all_demuxers(&mut dmx_reg); let mut dec_reg = RegisteredDecoders::new(); - duck_register_all_codecs(&mut dec_reg); + duck_register_all_decoders(&mut dec_reg); test_decoding("avi", "vp6", "assets/Duck/vp6_crash.avi", Some(4), &dmx_reg, &dec_reg, ExpectedTestResult::MD5Frames(vec![ diff --git a/nihav-duck/src/codecs/vp7.rs b/nihav-duck/src/codecs/vp7.rs index d40a81d..2632b40 100644 --- a/nihav-duck/src/codecs/vp7.rs +++ b/nihav-duck/src/codecs/vp7.rs @@ -1439,7 +1439,7 @@ mod test { use nihav_core::codecs::RegisteredDecoders; use nihav_core::demuxers::RegisteredDemuxers; use nihav_codec_support::test::dec_video::*; - use crate::duck_register_all_codecs; + use crate::duck_register_all_decoders; use nihav_commonfmt::generic_register_all_demuxers; #[test] @@ -1447,7 +1447,7 @@ mod test { let mut dmx_reg = RegisteredDemuxers::new(); generic_register_all_demuxers(&mut dmx_reg); let mut dec_reg = RegisteredDecoders::new(); - duck_register_all_codecs(&mut dec_reg); + duck_register_all_decoders(&mut dec_reg); test_decoding("avi", "vp7", "assets/Duck/interlaced_blit_pitch.avi", Some(12), &dmx_reg, &dec_reg, ExpectedTestResult::MD5Frames(vec![ diff --git a/nihav-duck/src/lib.rs b/nihav-duck/src/lib.rs index a3d59f0..b0dae19 100644 --- a/nihav-duck/src/lib.rs +++ b/nihav-duck/src/lib.rs @@ -8,7 +8,7 @@ extern crate nihav_codec_support; #[allow(clippy::verbose_bit_mask)] mod codecs; -pub use crate::codecs::duck_register_all_codecs; +pub use crate::codecs::duck_register_all_decoders; #[cfg(test)] extern crate nihav_commonfmt; diff --git a/nihav-game/src/codecs/bmv.rs b/nihav-game/src/codecs/bmv.rs index 2e42390..a407fb9 100644 --- a/nihav-game/src/codecs/bmv.rs +++ b/nihav-game/src/codecs/bmv.rs @@ -320,14 +320,14 @@ mod test { use nihav_core::codecs::RegisteredDecoders; use nihav_core::demuxers::RegisteredDemuxers; use nihav_codec_support::test::dec_video::*; - use crate::game_register_all_codecs; + use crate::game_register_all_decoders; use crate::game_register_all_demuxers; #[test] fn test_bmv_video() { let mut dmx_reg = RegisteredDemuxers::new(); game_register_all_demuxers(&mut dmx_reg); let mut dec_reg = RegisteredDecoders::new(); - game_register_all_codecs(&mut dec_reg); + game_register_all_decoders(&mut dec_reg); test_decoding("bmv", "bmv-video", "assets/Game/WILDCAT.BMV", Some(40), &dmx_reg, &dec_reg, ExpectedTestResult::MD5([0x9e91bb16, 0xc1edafc9, 0x4ef3171f, 0x0f3f6181])); @@ -337,7 +337,7 @@ mod test { let mut dmx_reg = RegisteredDemuxers::new(); game_register_all_demuxers(&mut dmx_reg); let mut dec_reg = RegisteredDecoders::new(); - game_register_all_codecs(&mut dec_reg); + game_register_all_decoders(&mut dec_reg); test_decoding("bmv", "bmv-audio", "assets/Game/PERFECT.BMV", None, &dmx_reg, &dec_reg, ExpectedTestResult::MD5([0x90b9ace4, 0x5fc19938, 0x7f534560, 0x32589cdf])); diff --git a/nihav-game/src/codecs/bmv3.rs b/nihav-game/src/codecs/bmv3.rs index cde7892..0140c8c 100644 --- a/nihav-game/src/codecs/bmv3.rs +++ b/nihav-game/src/codecs/bmv3.rs @@ -618,14 +618,14 @@ mod test { use nihav_core::codecs::RegisteredDecoders; use nihav_core::demuxers::RegisteredDemuxers; use nihav_codec_support::test::dec_video::*; - use crate::game_register_all_codecs; + use crate::game_register_all_decoders; use crate::game_register_all_demuxers; #[test] fn test_bmv_video() { let mut dmx_reg = RegisteredDemuxers::new(); game_register_all_demuxers(&mut dmx_reg); let mut dec_reg = RegisteredDecoders::new(); - game_register_all_codecs(&mut dec_reg); + game_register_all_decoders(&mut dec_reg); test_decoding("bmv3", "bmv3-video", "assets/Game/DW3-Loffnote.bmv", None, &dmx_reg, &dec_reg, ExpectedTestResult::MD5([0xfa34b81b, 0xd0ab79e2, 0x78fb25cc, 0x98ae47ff])); @@ -635,7 +635,7 @@ mod test { let mut dmx_reg = RegisteredDemuxers::new(); game_register_all_demuxers(&mut dmx_reg); let mut dec_reg = RegisteredDecoders::new(); - game_register_all_codecs(&mut dec_reg); + game_register_all_decoders(&mut dec_reg); test_decoding("bmv3", "bmv3-audio", "assets/Game/DW3-Loffnote.bmv", None, &dmx_reg, &dec_reg, ExpectedTestResult::MD5([0xd8e743cc, 0x97604bd7, 0x8dbb89c6, 0xb34cad63])); diff --git a/nihav-game/src/codecs/gremlinvideo.rs b/nihav-game/src/codecs/gremlinvideo.rs index 4b53ae8..7e91ea2 100644 --- a/nihav-game/src/codecs/gremlinvideo.rs +++ b/nihav-game/src/codecs/gremlinvideo.rs @@ -576,7 +576,7 @@ mod test { use nihav_core::codecs::RegisteredDecoders; use nihav_core::demuxers::RegisteredDemuxers; use nihav_codec_support::test::dec_video::*; - use crate::game_register_all_codecs; + use crate::game_register_all_decoders; use crate::game_register_all_demuxers; #[test] @@ -584,7 +584,7 @@ mod test { let mut dmx_reg = RegisteredDemuxers::new(); game_register_all_demuxers(&mut dmx_reg); let mut dec_reg = RegisteredDecoders::new(); - game_register_all_codecs(&mut dec_reg); + game_register_all_decoders(&mut dec_reg); test_decoding("gdv", "gdv-video", "assets/Game/intro1.gdv", Some(10), &dmx_reg, &dec_reg, ExpectedTestResult::MD5([0x7ea302bf, 0xc3e210cf, 0x6e341376, 0x9e976056])); @@ -594,7 +594,7 @@ mod test { let mut dmx_reg = RegisteredDemuxers::new(); game_register_all_demuxers(&mut dmx_reg); let mut dec_reg = RegisteredDecoders::new(); - game_register_all_codecs(&mut dec_reg); + game_register_all_decoders(&mut dec_reg); test_decoding("gdv", "gdv-audio", "assets/Game/intro1.gdv", None, &dmx_reg, &dec_reg, ExpectedTestResult::MD5([0xd41d8cd9, 0x8f00b204, 0xe9800998, 0xecf8427e])); diff --git a/nihav-game/src/codecs/midivid.rs b/nihav-game/src/codecs/midivid.rs index 700491e..ac91fde 100644 --- a/nihav-game/src/codecs/midivid.rs +++ b/nihav-game/src/codecs/midivid.rs @@ -192,14 +192,14 @@ mod test { use nihav_core::codecs::RegisteredDecoders; use nihav_core::demuxers::RegisteredDemuxers; use nihav_codec_support::test::dec_video::*; - use crate::game_register_all_codecs; + use crate::game_register_all_decoders; use nihav_commonfmt::generic_register_all_demuxers; #[test] fn test_midivid_video() { let mut dmx_reg = RegisteredDemuxers::new(); generic_register_all_demuxers(&mut dmx_reg); let mut dec_reg = RegisteredDecoders::new(); - game_register_all_codecs(&mut dec_reg); + game_register_all_decoders(&mut dec_reg); test_decoding("avi", "midivid", "assets/Game/MVDV.avi", Some(16), &dmx_reg, &dec_reg, ExpectedTestResult::MD5Frames(vec![ diff --git a/nihav-game/src/codecs/midivid3.rs b/nihav-game/src/codecs/midivid3.rs index 3a3c161..3c06e96 100644 --- a/nihav-game/src/codecs/midivid3.rs +++ b/nihav-game/src/codecs/midivid3.rs @@ -527,14 +527,14 @@ mod test { use nihav_core::codecs::RegisteredDecoders; use nihav_core::demuxers::RegisteredDemuxers; use nihav_codec_support::test::dec_video::*; - use crate::game_register_all_codecs; + use crate::game_register_all_decoders; use nihav_commonfmt::generic_register_all_demuxers; #[test] fn test_midivid3_video() { let mut dmx_reg = RegisteredDemuxers::new(); generic_register_all_demuxers(&mut dmx_reg); let mut dec_reg = RegisteredDecoders::new(); - game_register_all_codecs(&mut dec_reg); + game_register_all_decoders(&mut dec_reg); test_decoding("avi", "midivid3", "assets/Game/mv30.avi", Some(16), &dmx_reg, &dec_reg, ExpectedTestResult::MD5Frames(vec![ diff --git a/nihav-game/src/codecs/mod.rs b/nihav-game/src/codecs/mod.rs index bd2d6eb..064b567 100644 --- a/nihav-game/src/codecs/mod.rs +++ b/nihav-game/src/codecs/mod.rs @@ -45,7 +45,7 @@ const GAME_CODECS: &[DecoderInfo] = &[ ]; /// Registers all available codecs provided by this crate. -pub fn game_register_all_codecs(rd: &mut RegisteredDecoders) { +pub fn game_register_all_decoders(rd: &mut RegisteredDecoders) { for decoder in GAME_CODECS.iter() { rd.add_decoder(decoder.clone()); } diff --git a/nihav-game/src/codecs/vmd.rs b/nihav-game/src/codecs/vmd.rs index 110548a..40d8c5e 100644 --- a/nihav-game/src/codecs/vmd.rs +++ b/nihav-game/src/codecs/vmd.rs @@ -690,14 +690,14 @@ mod test { use nihav_core::codecs::RegisteredDecoders; use nihav_core::demuxers::RegisteredDemuxers; use nihav_codec_support::test::dec_video::*; - use crate::game_register_all_codecs; + use crate::game_register_all_decoders; use crate::game_register_all_demuxers; #[test] fn test_vmd_video() { let mut dmx_reg = RegisteredDemuxers::new(); game_register_all_demuxers(&mut dmx_reg); let mut dec_reg = RegisteredDecoders::new(); - game_register_all_codecs(&mut dec_reg); + game_register_all_decoders(&mut dec_reg); test_decoding("vmd", "vmd-video", "assets/Game/2832.VMD", Some(10), &dmx_reg, &dec_reg, ExpectedTestResult::MD5Frames(vec![ @@ -718,7 +718,7 @@ mod test { let mut dmx_reg = RegisteredDemuxers::new(); game_register_all_demuxers(&mut dmx_reg); let mut dec_reg = RegisteredDecoders::new(); - game_register_all_codecs(&mut dec_reg); + game_register_all_decoders(&mut dec_reg); test_decoding("vmd", "vmd-video", "assets/Game/HLP1000.VMD", Some(10), &dmx_reg, &dec_reg, ExpectedTestResult::MD5Frames(vec![ @@ -734,7 +734,7 @@ mod test { let mut dmx_reg = RegisteredDemuxers::new(); game_register_all_demuxers(&mut dmx_reg); let mut dec_reg = RegisteredDecoders::new(); - game_register_all_codecs(&mut dec_reg); + game_register_all_decoders(&mut dec_reg); test_decoding("vmd", "vmd-video", "assets/Game/02C.VMD", None, &dmx_reg, &dec_reg, ExpectedTestResult::MD5([0xb580782c, 0xd7fb98c0, 0xaf9b83cc, 0xaea0846b])); @@ -744,7 +744,7 @@ mod test { let mut dmx_reg = RegisteredDemuxers::new(); game_register_all_demuxers(&mut dmx_reg); let mut dec_reg = RegisteredDecoders::new(); - game_register_all_codecs(&mut dec_reg); + game_register_all_decoders(&mut dec_reg); test_decoding("vmd", "vmd-audio", "assets/Game/1491.VMD", None, &dmx_reg, &dec_reg, ExpectedTestResult::MD5([0x75037601, 0xbc7b3976, 0x6e1c948b, 0xf05a3d6c])); @@ -754,7 +754,7 @@ mod test { let mut dmx_reg = RegisteredDemuxers::new(); game_register_all_demuxers(&mut dmx_reg); let mut dec_reg = RegisteredDecoders::new(); - game_register_all_codecs(&mut dec_reg); + game_register_all_decoders(&mut dec_reg); test_decoding("vmd", "vmd-audio", "assets/Game/2832.VMD", None, &dmx_reg, &dec_reg, ExpectedTestResult::MD5([0x32dcdf0e, 0xee058684, 0x43ed5bf1, 0x2ff18b5a])); @@ -764,7 +764,7 @@ mod test { let mut dmx_reg = RegisteredDemuxers::new(); game_register_all_demuxers(&mut dmx_reg); let mut dec_reg = RegisteredDecoders::new(); - game_register_all_codecs(&mut dec_reg); + game_register_all_decoders(&mut dec_reg); test_decoding("vmd", "vmd-audio", "assets/Game/1000.VMD", None, &dmx_reg, &dec_reg, ExpectedTestResult::MD5([0xc36215d3, 0x96530a80, 0x89f1fa8e, 0x49da302b])); @@ -774,7 +774,7 @@ mod test { let mut dmx_reg = RegisteredDemuxers::new(); game_register_all_demuxers(&mut dmx_reg); let mut dec_reg = RegisteredDecoders::new(); - game_register_all_codecs(&mut dec_reg); + game_register_all_decoders(&mut dec_reg); test_decoding("vmd", "vmd-audio", "assets/Game/HLP1000.VMD", None, &dmx_reg, &dec_reg, ExpectedTestResult::MD5([0x76a00405, 0xe4e5378d, 0x495b2a68, 0x4dffe042])); diff --git a/nihav-game/src/lib.rs b/nihav-game/src/lib.rs index f619cb9..310e3f7 100644 --- a/nihav-game/src/lib.rs +++ b/nihav-game/src/lib.rs @@ -7,7 +7,7 @@ extern crate nihav_codec_support; #[allow(clippy::unreadable_literal)] #[allow(clippy::useless_let_if_seq)] mod codecs; -pub use crate::codecs::game_register_all_codecs; +pub use crate::codecs::game_register_all_decoders; #[allow(clippy::collapsible_if)] #[allow(clippy::needless_range_loop)] #[allow(clippy::unreadable_literal)] diff --git a/nihav-indeo/src/codecs/imc.rs b/nihav-indeo/src/codecs/imc.rs index 6840739..ea84d0a 100644 --- a/nihav-indeo/src/codecs/imc.rs +++ b/nihav-indeo/src/codecs/imc.rs @@ -1119,14 +1119,14 @@ mod test { use nihav_core::codecs::RegisteredDecoders; use nihav_core::demuxers::RegisteredDemuxers; use nihav_codec_support::test::dec_video::*; - use crate::indeo_register_all_codecs; + use crate::indeo_register_all_decoders; use nihav_commonfmt::generic_register_all_demuxers; #[test] fn test_imc() { let mut dmx_reg = RegisteredDemuxers::new(); generic_register_all_demuxers(&mut dmx_reg); let mut dec_reg = RegisteredDecoders::new(); - indeo_register_all_codecs(&mut dec_reg); + indeo_register_all_decoders(&mut dec_reg); // let file = "assets/Indeo/neal73_saber.avi"; // let file = "assets/Indeo/IMC/hvalen.avi"; diff --git a/nihav-indeo/src/codecs/indeo2.rs b/nihav-indeo/src/codecs/indeo2.rs index 960bc0b..32e54f8 100644 --- a/nihav-indeo/src/codecs/indeo2.rs +++ b/nihav-indeo/src/codecs/indeo2.rs @@ -380,14 +380,14 @@ mod test { use nihav_core::codecs::RegisteredDecoders; use nihav_core::demuxers::RegisteredDemuxers; use nihav_codec_support::test::dec_video::*; - use crate::indeo_register_all_codecs; + use crate::indeo_register_all_decoders; use nihav_commonfmt::generic_register_all_demuxers; #[test] fn test_indeo2() { let mut dmx_reg = RegisteredDemuxers::new(); generic_register_all_demuxers(&mut dmx_reg); let mut dec_reg = RegisteredDecoders::new(); - indeo_register_all_codecs(&mut dec_reg); + indeo_register_all_decoders(&mut dec_reg); test_decoding("avi", "indeo2", "assets/Indeo/laser05.avi", Some(10), &dmx_reg, &dec_reg, ExpectedTestResult::MD5Frames(vec![ diff --git a/nihav-indeo/src/codecs/indeo3.rs b/nihav-indeo/src/codecs/indeo3.rs index 1705a43..cc3bed8 100644 --- a/nihav-indeo/src/codecs/indeo3.rs +++ b/nihav-indeo/src/codecs/indeo3.rs @@ -808,14 +808,14 @@ mod test { use nihav_core::codecs::RegisteredDecoders; use nihav_core::demuxers::RegisteredDemuxers; use nihav_codec_support::test::dec_video::*; - use crate::indeo_register_all_codecs; + use crate::indeo_register_all_decoders; use nihav_commonfmt::generic_register_all_demuxers; #[test] fn test_indeo3() { let mut dmx_reg = RegisteredDemuxers::new(); generic_register_all_demuxers(&mut dmx_reg); let mut dec_reg = RegisteredDecoders::new(); - indeo_register_all_codecs(&mut dec_reg); + indeo_register_all_decoders(&mut dec_reg); test_decoding("avi", "indeo3", "assets/Indeo/iv32_example.avi", Some(10), &dmx_reg, &dec_reg, ExpectedTestResult::MD5Frames(vec![ diff --git a/nihav-indeo/src/codecs/indeo4.rs b/nihav-indeo/src/codecs/indeo4.rs index 879f850..474a8d5 100644 --- a/nihav-indeo/src/codecs/indeo4.rs +++ b/nihav-indeo/src/codecs/indeo4.rs @@ -777,14 +777,14 @@ mod test { use nihav_core::codecs::RegisteredDecoders; use nihav_core::demuxers::RegisteredDemuxers; use nihav_codec_support::test::dec_video::*; - use crate::indeo_register_all_codecs; + use crate::indeo_register_all_decoders; use nihav_commonfmt::generic_register_all_demuxers; #[test] fn test_indeo4() { let mut dmx_reg = RegisteredDemuxers::new(); generic_register_all_demuxers(&mut dmx_reg); let mut dec_reg = RegisteredDecoders::new(); - indeo_register_all_codecs(&mut dec_reg); + indeo_register_all_decoders(&mut dec_reg); test_decoding("avi", "indeo4", "assets/Indeo/IV4/volcano.avi", Some(16), &dmx_reg, &dec_reg, ExpectedTestResult::MD5Frames(vec![ diff --git a/nihav-indeo/src/codecs/indeo5.rs b/nihav-indeo/src/codecs/indeo5.rs index 5eedd14..3527906 100644 --- a/nihav-indeo/src/codecs/indeo5.rs +++ b/nihav-indeo/src/codecs/indeo5.rs @@ -731,14 +731,14 @@ mod test { use nihav_core::codecs::RegisteredDecoders; use nihav_core::demuxers::RegisteredDemuxers; use nihav_codec_support::test::dec_video::*; - use crate::indeo_register_all_codecs; + use crate::indeo_register_all_decoders; use nihav_commonfmt::generic_register_all_demuxers; #[test] fn test_indeo5() { let mut dmx_reg = RegisteredDemuxers::new(); generic_register_all_demuxers(&mut dmx_reg); let mut dec_reg = RegisteredDecoders::new(); - indeo_register_all_codecs(&mut dec_reg); + indeo_register_all_decoders(&mut dec_reg); test_decoding("avi", "indeo5", "assets/Indeo/IV5/sample.avi", Some(100), &dmx_reg, &dec_reg, ExpectedTestResult::MD5Frames(vec![ diff --git a/nihav-indeo/src/codecs/intel263.rs b/nihav-indeo/src/codecs/intel263.rs index acedfb4..ff55e65 100644 --- a/nihav-indeo/src/codecs/intel263.rs +++ b/nihav-indeo/src/codecs/intel263.rs @@ -749,14 +749,14 @@ mod test { use nihav_core::codecs::RegisteredDecoders; use nihav_core::demuxers::RegisteredDemuxers; use nihav_codec_support::test::dec_video::*; - use crate::indeo_register_all_codecs; + use crate::indeo_register_all_decoders; use nihav_commonfmt::generic_register_all_demuxers; #[test] fn test_intel263() { let mut dmx_reg = RegisteredDemuxers::new(); generic_register_all_demuxers(&mut dmx_reg); let mut dec_reg = RegisteredDecoders::new(); - indeo_register_all_codecs(&mut dec_reg); + indeo_register_all_decoders(&mut dec_reg); test_decoding("avi", "intel263", "assets/Indeo/neal73_saber.avi", Some(16), &dmx_reg, &dec_reg, ExpectedTestResult::MD5Frames(vec![ diff --git a/nihav-indeo/src/codecs/mod.rs b/nihav-indeo/src/codecs/mod.rs index 4ab5e8f..321fe38 100644 --- a/nihav-indeo/src/codecs/mod.rs +++ b/nihav-indeo/src/codecs/mod.rs @@ -47,7 +47,7 @@ const INDEO_CODECS: &[DecoderInfo] = &[ ]; /// Registers all available codecs provided by this crate. -pub fn indeo_register_all_codecs(rd: &mut RegisteredDecoders) { +pub fn indeo_register_all_decoders(rd: &mut RegisteredDecoders) { for decoder in INDEO_CODECS.iter() { rd.add_decoder(decoder.clone()); } diff --git a/nihav-indeo/src/lib.rs b/nihav-indeo/src/lib.rs index 21b4cd9..c920ea4 100644 --- a/nihav-indeo/src/lib.rs +++ b/nihav-indeo/src/lib.rs @@ -9,7 +9,7 @@ extern crate nihav_codec_support; #[allow(clippy::verbose_bit_mask)] mod codecs; -pub use crate::codecs::indeo_register_all_codecs; +pub use crate::codecs::indeo_register_all_decoders; #[cfg(test)] extern crate nihav_commonfmt;
\ No newline at end of file diff --git a/nihav-ms/src/codecs/imaadpcm.rs b/nihav-ms/src/codecs/imaadpcm.rs index 2ee538d..d58ef36 100644 --- a/nihav-ms/src/codecs/imaadpcm.rs +++ b/nihav-ms/src/codecs/imaadpcm.rs @@ -97,14 +97,14 @@ mod test { use nihav_core::codecs::RegisteredDecoders; use nihav_core::demuxers::RegisteredDemuxers; use nihav_codec_support::test::dec_video::*; - use crate::ms_register_all_codecs; + use crate::ms_register_all_decoders; use nihav_commonfmt::generic_register_all_demuxers; #[test] fn test_ima_adpcm_ms() { let mut dmx_reg = RegisteredDemuxers::new(); generic_register_all_demuxers(&mut dmx_reg); let mut dec_reg = RegisteredDecoders::new(); - ms_register_all_codecs(&mut dec_reg); + ms_register_all_decoders(&mut dec_reg); test_decoding("avi", "ima-adpcm-ms", "assets/MS/IMAG0006.AVI", None, &dmx_reg, &dec_reg, ExpectedTestResult::MD5([0x0cdc640f, 0xb00df235, 0x1ec4a280, 0x065b5e9e])); diff --git a/nihav-ms/src/codecs/mod.rs b/nihav-ms/src/codecs/mod.rs index 3ed99b4..e01a6bb 100644 --- a/nihav-ms/src/codecs/mod.rs +++ b/nihav-ms/src/codecs/mod.rs @@ -28,7 +28,7 @@ const MS_CODECS: &[DecoderInfo] = &[ ]; /// Registers all available codecs provided by this crate. -pub fn ms_register_all_codecs(rd: &mut RegisteredDecoders) { +pub fn ms_register_all_decoders(rd: &mut RegisteredDecoders) { for decoder in MS_CODECS.iter() { rd.add_decoder(decoder.clone()); } diff --git a/nihav-ms/src/codecs/msadpcm.rs b/nihav-ms/src/codecs/msadpcm.rs index aff4979..44baedb 100644 --- a/nihav-ms/src/codecs/msadpcm.rs +++ b/nihav-ms/src/codecs/msadpcm.rs @@ -419,7 +419,7 @@ mod test { let mut dmx_reg = RegisteredDemuxers::new(); generic_register_all_demuxers(&mut dmx_reg); let mut dec_reg = RegisteredDecoders::new(); - ms_register_all_codecs(&mut dec_reg); + ms_register_all_decoders(&mut dec_reg); test_decoding("avi", "ms-adpcm", "assets/MS/dance.avi", None, &dmx_reg, &dec_reg, ExpectedTestResult::MD5([0xf5e3fc84, 0xbcabc11c, 0x33c6874e, 0xe05ecd14])); @@ -430,8 +430,8 @@ mod test { let mut dmx_reg = RegisteredDemuxers::new(); generic_register_all_demuxers(&mut dmx_reg); let mut dec_reg = RegisteredDecoders::new(); - generic_register_all_codecs(&mut dec_reg); - ms_register_all_codecs(&mut dec_reg); + generic_register_all_decoders(&mut dec_reg); + ms_register_all_decoders(&mut dec_reg); let mut mux_reg = RegisteredMuxers::new(); generic_register_all_muxers(&mut mux_reg); let mut enc_reg = RegisteredEncoders::new(); diff --git a/nihav-ms/src/codecs/msrle.rs b/nihav-ms/src/codecs/msrle.rs index 0c2fc9c..e586910 100644 --- a/nihav-ms/src/codecs/msrle.rs +++ b/nihav-ms/src/codecs/msrle.rs @@ -260,14 +260,14 @@ mod test { use nihav_core::codecs::RegisteredDecoders; use nihav_core::demuxers::RegisteredDemuxers; use nihav_codec_support::test::dec_video::*; - use crate::ms_register_all_codecs; + use crate::ms_register_all_decoders; use nihav_commonfmt::generic_register_all_demuxers; #[test] fn test_ms_rle_8bit() { let mut dmx_reg = RegisteredDemuxers::new(); generic_register_all_demuxers(&mut dmx_reg); let mut dec_reg = RegisteredDecoders::new(); - ms_register_all_codecs(&mut dec_reg); + ms_register_all_decoders(&mut dec_reg); test_decoding("avi", "msrle", "assets/MS/workcycl-64color.avi", Some(6), &dmx_reg, &dec_reg, ExpectedTestResult::MD5Frames(vec![ @@ -284,7 +284,7 @@ mod test { let mut dmx_reg = RegisteredDemuxers::new(); generic_register_all_demuxers(&mut dmx_reg); let mut dec_reg = RegisteredDecoders::new(); - ms_register_all_codecs(&mut dec_reg); + ms_register_all_decoders(&mut dec_reg); test_decoding("avi", "msrle", "assets/MS/suzie_appl_rle8.avi", Some(2), &dmx_reg, &dec_reg, ExpectedTestResult::MD5Frames(vec![ @@ -297,7 +297,7 @@ mod test { let mut dmx_reg = RegisteredDemuxers::new(); generic_register_all_demuxers(&mut dmx_reg); let mut dec_reg = RegisteredDecoders::new(); - ms_register_all_codecs(&mut dec_reg); + ms_register_all_decoders(&mut dec_reg); test_decoding("avi", "msrle", "assets/MS/mplayer-msrle-4bit.avi", Some(2), &dmx_reg, &dec_reg, ExpectedTestResult::MD5Frames(vec![ @@ -310,7 +310,7 @@ mod test { let mut dmx_reg = RegisteredDemuxers::new(); generic_register_all_demuxers(&mut dmx_reg); let mut dec_reg = RegisteredDecoders::new(); - ms_register_all_codecs(&mut dec_reg); + ms_register_all_decoders(&mut dec_reg); test_decoding("avi", "msrle", "assets/MS/suzie_appl_rle4.avi", Some(2), &dmx_reg, &dec_reg, ExpectedTestResult::MD5([0xb5d38296, 0xdae25407, 0x985973f0, 0xb1da9c94])); diff --git a/nihav-ms/src/codecs/msvideo1.rs b/nihav-ms/src/codecs/msvideo1.rs index a3bfebc..2fb7713 100644 --- a/nihav-ms/src/codecs/msvideo1.rs +++ b/nihav-ms/src/codecs/msvideo1.rs @@ -263,14 +263,14 @@ mod test { use nihav_core::codecs::RegisteredDecoders; use nihav_core::demuxers::RegisteredDemuxers; use nihav_codec_support::test::dec_video::*; - use crate::ms_register_all_codecs; + use crate::ms_register_all_decoders; use nihav_commonfmt::generic_register_all_demuxers; #[test] fn test_ms_video1_8bit() { let mut dmx_reg = RegisteredDemuxers::new(); generic_register_all_demuxers(&mut dmx_reg); let mut dec_reg = RegisteredDecoders::new(); - ms_register_all_codecs(&mut dec_reg); + ms_register_all_decoders(&mut dec_reg); test_decoding("avi", "msvideo1", "assets/MS/toon.avi", Some(66), &dmx_reg, &dec_reg, ExpectedTestResult::MD5([0x0c26ec42, 0xb75bfea7, 0x1e6342ae, 0xb14dcfa3])); @@ -280,7 +280,7 @@ mod test { let mut dmx_reg = RegisteredDemuxers::new(); generic_register_all_demuxers(&mut dmx_reg); let mut dec_reg = RegisteredDecoders::new(); - ms_register_all_codecs(&mut dec_reg); + ms_register_all_decoders(&mut dec_reg); test_decoding("avi", "msvideo1", "assets/MS/clock-cram16.avi", None, &dmx_reg, &dec_reg, ExpectedTestResult::MD5([0x03381fa4, 0x5b294fec, 0xb97a7575, 0xa1a3ffe9])); diff --git a/nihav-ms/src/codecs/msvideo1enc.rs b/nihav-ms/src/codecs/msvideo1enc.rs index 49be39e..b2233c2 100644 --- a/nihav-ms/src/codecs/msvideo1enc.rs +++ b/nihav-ms/src/codecs/msvideo1enc.rs @@ -534,8 +534,8 @@ mod test { let mut dmx_reg = RegisteredDemuxers::new(); generic_register_all_demuxers(&mut dmx_reg); let mut dec_reg = RegisteredDecoders::new(); - generic_register_all_codecs(&mut dec_reg); - ms_register_all_codecs(&mut dec_reg); + generic_register_all_decoders(&mut dec_reg); + ms_register_all_decoders(&mut dec_reg); let mut mux_reg = RegisteredMuxers::new(); generic_register_all_muxers(&mut mux_reg); let mut enc_reg = RegisteredEncoders::new(); diff --git a/nihav-ms/src/lib.rs b/nihav-ms/src/lib.rs index 6bfdad6..ebc84f5 100644 --- a/nihav-ms/src/lib.rs +++ b/nihav-ms/src/lib.rs @@ -5,5 +5,5 @@ extern crate nihav_codec_support; #[allow(clippy::single_match)] #[allow(clippy::verbose_bit_mask)] mod codecs; -pub use crate::codecs::ms_register_all_codecs; +pub use crate::codecs::ms_register_all_decoders; pub use crate::codecs::ms_register_all_encoders; diff --git a/nihav-qt/src/codecs/imaadpcm.rs b/nihav-qt/src/codecs/imaadpcm.rs index 1d1a647..636f882 100644 --- a/nihav-qt/src/codecs/imaadpcm.rs +++ b/nihav-qt/src/codecs/imaadpcm.rs @@ -94,14 +94,14 @@ mod test { use nihav_core::codecs::RegisteredDecoders; use nihav_core::demuxers::RegisteredDemuxers; use nihav_codec_support::test::dec_video::*; - use crate::qt_register_all_codecs; + use crate::qt_register_all_decoders; use nihav_commonfmt::generic_register_all_demuxers; #[test] fn test_ima_adpcm_qt() { let mut dmx_reg = RegisteredDemuxers::new(); generic_register_all_demuxers(&mut dmx_reg); let mut dec_reg = RegisteredDecoders::new(); - qt_register_all_codecs(&mut dec_reg); + qt_register_all_decoders(&mut dec_reg); test_decoding("mov", "ima-adpcm-qt", "assets/QT/shuffle-ima41.mov", None, &dmx_reg, &dec_reg, ExpectedTestResult::MD5([0xba2ad472, 0xd6aee026, 0xb915dd7d, 0xac51314c])); diff --git a/nihav-qt/src/codecs/mace.rs b/nihav-qt/src/codecs/mace.rs index d3fc953..1166d92 100644 --- a/nihav-qt/src/codecs/mace.rs +++ b/nihav-qt/src/codecs/mace.rs @@ -181,14 +181,14 @@ mod test { use nihav_core::codecs::RegisteredDecoders; use nihav_core::demuxers::RegisteredDemuxers; use nihav_codec_support::test::dec_video::*; - use crate::qt_register_all_codecs; + use crate::qt_register_all_decoders; use nihav_commonfmt::generic_register_all_demuxers; #[test] fn test_mace3() { let mut dmx_reg = RegisteredDemuxers::new(); generic_register_all_demuxers(&mut dmx_reg); let mut dec_reg = RegisteredDecoders::new(); - qt_register_all_codecs(&mut dec_reg); + qt_register_all_decoders(&mut dec_reg); test_decoding("mov", "mace-3", "assets/QT/surge-1-8-MAC3.mov", None, &dmx_reg, &dec_reg, ExpectedTestResult::MD5([0x2df88db3, 0xa6167019, 0x6d4c64e7, 0xc89da2a5])); @@ -198,7 +198,7 @@ mod test { let mut dmx_reg = RegisteredDemuxers::new(); generic_register_all_demuxers(&mut dmx_reg); let mut dec_reg = RegisteredDecoders::new(); - qt_register_all_codecs(&mut dec_reg); + qt_register_all_decoders(&mut dec_reg); test_decoding("mov", "mace-6", "assets/QT/surge-1-8-MAC6.mov", None, &dmx_reg, &dec_reg, ExpectedTestResult::MD5([0xc32857e2, 0xc1ea1ce8, 0x2d77dacf, 0xef504f1f])); diff --git a/nihav-qt/src/codecs/mod.rs b/nihav-qt/src/codecs/mod.rs index 733d599..0e91176 100644 --- a/nihav-qt/src/codecs/mod.rs +++ b/nihav-qt/src/codecs/mod.rs @@ -86,7 +86,7 @@ const QT_CODECS: &[DecoderInfo] = &[ ]; /// Registers all available codecs provided by this crate. -pub fn qt_register_all_codecs(rd: &mut RegisteredDecoders) { +pub fn qt_register_all_decoders(rd: &mut RegisteredDecoders) { for decoder in QT_CODECS.iter() { rd.add_decoder(decoder.clone()); } diff --git a/nihav-qt/src/codecs/qdm2.rs b/nihav-qt/src/codecs/qdm2.rs index ff9a337..5edd336 100644 --- a/nihav-qt/src/codecs/qdm2.rs +++ b/nihav-qt/src/codecs/qdm2.rs @@ -293,14 +293,14 @@ mod test { use nihav_core::codecs::RegisteredDecoders; use nihav_core::demuxers::RegisteredDemuxers; use nihav_codec_support::test::dec_video::*; - use crate::qt_register_all_codecs; + use crate::qt_register_all_decoders; use nihav_commonfmt::generic_register_all_demuxers; #[test] fn test_qdm2() { let mut dmx_reg = RegisteredDemuxers::new(); generic_register_all_demuxers(&mut dmx_reg); let mut dec_reg = RegisteredDecoders::new(); - qt_register_all_codecs(&mut dec_reg); + qt_register_all_decoders(&mut dec_reg); //test_decode_audio("mov", "assets/QT/0-22050HzSweep8kb.mov", None, Some("qdm2"), &dmx_reg, &dec_reg); test_decoding("mov", "qdesign-music2", "assets/QT/0-22050HzSweep10kb.mov", None, &dmx_reg, &dec_reg, diff --git a/nihav-qt/src/codecs/qdmc.rs b/nihav-qt/src/codecs/qdmc.rs index 818b02f..f8aaecd 100644 --- a/nihav-qt/src/codecs/qdmc.rs +++ b/nihav-qt/src/codecs/qdmc.rs @@ -387,14 +387,14 @@ mod test { use nihav_core::codecs::RegisteredDecoders; use nihav_core::demuxers::RegisteredDemuxers; use nihav_codec_support::test::dec_video::*; - use crate::qt_register_all_codecs; + use crate::qt_register_all_decoders; use nihav_commonfmt::generic_register_all_demuxers; #[test] fn test_qdmc() { let mut dmx_reg = RegisteredDemuxers::new(); generic_register_all_demuxers(&mut dmx_reg); let mut dec_reg = RegisteredDecoders::new(); - qt_register_all_codecs(&mut dec_reg); + qt_register_all_decoders(&mut dec_reg); test_decoding("mov", "qdesign-music", "assets/QT/rumcoke.mov", Some(32), &dmx_reg, &dec_reg, ExpectedTestResult::Decodes); diff --git a/nihav-qt/src/codecs/rle.rs b/nihav-qt/src/codecs/rle.rs index 929476e..969c104 100644 --- a/nihav-qt/src/codecs/rle.rs +++ b/nihav-qt/src/codecs/rle.rs @@ -511,14 +511,14 @@ mod test { use nihav_core::codecs::RegisteredDecoders; use nihav_core::demuxers::RegisteredDemuxers; use nihav_codec_support::test::dec_video::*; - use crate::qt_register_all_codecs; + use crate::qt_register_all_decoders; use nihav_commonfmt::generic_register_all_demuxers; #[test] fn test_qt_rle_1bit() { let mut dmx_reg = RegisteredDemuxers::new(); generic_register_all_demuxers(&mut dmx_reg); let mut dec_reg = RegisteredDecoders::new(); - qt_register_all_codecs(&mut dec_reg); + qt_register_all_decoders(&mut dec_reg); //test_file_decoding("mov", "assets/QT/Animation-Monochrome.mov", Some(6), true, false, Some("qtrle-mono"), &dmx_reg, &dec_reg); test_decoding("mov", "qt-rle", "assets/QT/Animation-Monochrome.mov", Some(6), &dmx_reg, &dec_reg, @@ -536,7 +536,7 @@ mod test { let mut dmx_reg = RegisteredDemuxers::new(); generic_register_all_demuxers(&mut dmx_reg); let mut dec_reg = RegisteredDecoders::new(); - qt_register_all_codecs(&mut dec_reg); + qt_register_all_decoders(&mut dec_reg); test_decoding("mov", "qt-rle", "assets/QT/Animation-16Greys.mov", Some(6), &dmx_reg, &dec_reg, ExpectedTestResult::MD5Frames(vec![ @@ -553,7 +553,7 @@ mod test { let mut dmx_reg = RegisteredDemuxers::new(); generic_register_all_demuxers(&mut dmx_reg); let mut dec_reg = RegisteredDecoders::new(); - qt_register_all_codecs(&mut dec_reg); + qt_register_all_decoders(&mut dec_reg); test_decoding("mov", "qt-rle", "assets/QT/Animation-256Greys.mov", Some(6), &dmx_reg, &dec_reg, ExpectedTestResult::MD5Frames(vec![ @@ -570,7 +570,7 @@ mod test { let mut dmx_reg = RegisteredDemuxers::new(); generic_register_all_demuxers(&mut dmx_reg); let mut dec_reg = RegisteredDecoders::new(); - qt_register_all_codecs(&mut dec_reg); + qt_register_all_decoders(&mut dec_reg); test_decoding("mov", "qt-rle", "assets/QT/Animation-Highcolour.mov", Some(6), &dmx_reg, &dec_reg, ExpectedTestResult::MD5Frames(vec![ @@ -587,7 +587,7 @@ mod test { let mut dmx_reg = RegisteredDemuxers::new(); generic_register_all_demuxers(&mut dmx_reg); let mut dec_reg = RegisteredDecoders::new(); - qt_register_all_codecs(&mut dec_reg); + qt_register_all_decoders(&mut dec_reg); test_decoding("mov", "qt-rle", "assets/QT/Animation-Truecolour.mov", Some(6), &dmx_reg, &dec_reg, ExpectedTestResult::MD5Frames(vec![ @@ -604,7 +604,7 @@ mod test { let mut dmx_reg = RegisteredDemuxers::new(); generic_register_all_demuxers(&mut dmx_reg); let mut dec_reg = RegisteredDecoders::new(); - qt_register_all_codecs(&mut dec_reg); + qt_register_all_decoders(&mut dec_reg); test_decoding("mov", "qt-rle", "assets/QT/Jag-finder-renaming.mov", Some(10), &dmx_reg, &dec_reg, ExpectedTestResult::MD5Frames(vec![ diff --git a/nihav-qt/src/codecs/rpza.rs b/nihav-qt/src/codecs/rpza.rs index a3b2e5f..cbea562 100644 --- a/nihav-qt/src/codecs/rpza.rs +++ b/nihav-qt/src/codecs/rpza.rs @@ -195,14 +195,14 @@ mod test { use nihav_core::codecs::RegisteredDecoders; use nihav_core::demuxers::RegisteredDemuxers; use nihav_codec_support::test::dec_video::*; - use crate::qt_register_all_codecs; + use crate::qt_register_all_decoders; use nihav_commonfmt::generic_register_all_demuxers; #[test] fn test_rpza() { let mut dmx_reg = RegisteredDemuxers::new(); generic_register_all_demuxers(&mut dmx_reg); let mut dec_reg = RegisteredDecoders::new(); - qt_register_all_codecs(&mut dec_reg); + qt_register_all_decoders(&mut dec_reg); test_decoding("mov", "apple-video", "assets/QT/aletrek-rpza.mov", Some(6), &dmx_reg, &dec_reg, ExpectedTestResult::MD5Frames(vec![ diff --git a/nihav-qt/src/codecs/smc.rs b/nihav-qt/src/codecs/smc.rs index 96fcba2..b78c46b 100644 --- a/nihav-qt/src/codecs/smc.rs +++ b/nihav-qt/src/codecs/smc.rs @@ -290,14 +290,14 @@ mod test { use nihav_core::codecs::RegisteredDecoders; use nihav_core::demuxers::RegisteredDemuxers; use nihav_codec_support::test::dec_video::*; - use crate::qt_register_all_codecs; + use crate::qt_register_all_decoders; use nihav_commonfmt::generic_register_all_demuxers; #[test] fn test_smc() { let mut dmx_reg = RegisteredDemuxers::new(); generic_register_all_demuxers(&mut dmx_reg); let mut dec_reg = RegisteredDecoders::new(); - qt_register_all_codecs(&mut dec_reg); + qt_register_all_decoders(&mut dec_reg); test_decoding("mov", "qt-smc", "assets/QT/aletrek-smc.mov", Some(6), &dmx_reg, &dec_reg, ExpectedTestResult::MD5Frames(vec![ @@ -314,7 +314,7 @@ mod test { let mut dmx_reg = RegisteredDemuxers::new(); generic_register_all_demuxers(&mut dmx_reg); let mut dec_reg = RegisteredDecoders::new(); - qt_register_all_codecs(&mut dec_reg); + qt_register_all_decoders(&mut dec_reg); test_decoding("mov", "qt-smc", "assets/QT/aletrek-smc-gray.mov", Some(6), &dmx_reg, &dec_reg, ExpectedTestResult::MD5Frames(vec![ diff --git a/nihav-qt/src/codecs/svq1.rs b/nihav-qt/src/codecs/svq1.rs index 68db3a3..a6735bb 100644 --- a/nihav-qt/src/codecs/svq1.rs +++ b/nihav-qt/src/codecs/svq1.rs @@ -495,14 +495,14 @@ mod test { use nihav_core::codecs::RegisteredDecoders; use nihav_core::demuxers::RegisteredDemuxers; use nihav_codec_support::test::dec_video::*; - use crate::qt_register_all_codecs; + use crate::qt_register_all_decoders; use nihav_commonfmt::generic_register_all_demuxers; #[test] fn test_svq1() { let mut dmx_reg = RegisteredDemuxers::new(); generic_register_all_demuxers(&mut dmx_reg); let mut dec_reg = RegisteredDecoders::new(); - qt_register_all_codecs(&mut dec_reg); + qt_register_all_decoders(&mut dec_reg); test_decoding("mov", "sorenson-video", "assets/QT/adpcm-bug.mov", Some(6), &dmx_reg, &dec_reg, ExpectedTestResult::MD5Frames(vec![ diff --git a/nihav-qt/src/codecs/svq3.rs b/nihav-qt/src/codecs/svq3.rs index 6d65e65..d166723 100644 --- a/nihav-qt/src/codecs/svq3.rs +++ b/nihav-qt/src/codecs/svq3.rs @@ -1217,14 +1217,14 @@ mod test { use nihav_core::codecs::RegisteredDecoders; use nihav_core::demuxers::RegisteredDemuxers; use nihav_codec_support::test::dec_video::*; - use crate::qt_register_all_codecs; + use crate::qt_register_all_decoders; use nihav_commonfmt::generic_register_all_demuxers; #[test] fn test_svq3() { let mut dmx_reg = RegisteredDemuxers::new(); generic_register_all_demuxers(&mut dmx_reg); let mut dec_reg = RegisteredDecoders::new(); - qt_register_all_codecs(&mut dec_reg); + qt_register_all_decoders(&mut dec_reg); //let file = "assets/QT/cristinreel.mov"; //let file = "assets/QT/broken_sword_Large.mov"; diff --git a/nihav-qt/src/lib.rs b/nihav-qt/src/lib.rs index 1996c60..29180f0 100644 --- a/nihav-qt/src/lib.rs +++ b/nihav-qt/src/lib.rs @@ -3,4 +3,4 @@ extern crate nihav_codec_support; #[allow(clippy::single_match)] mod codecs; -pub use crate::codecs::qt_register_all_codecs; +pub use crate::codecs::qt_register_all_decoders; diff --git a/nihav-rad/src/codecs/bink2.rs b/nihav-rad/src/codecs/bink2.rs index 2b6ca26..9ae02a7 100644 --- a/nihav-rad/src/codecs/bink2.rs +++ b/nihav-rad/src/codecs/bink2.rs @@ -1959,14 +1959,14 @@ mod test { use nihav_core::codecs::RegisteredDecoders; use nihav_core::demuxers::RegisteredDemuxers; use nihav_codec_support::test::dec_video::*; - use crate::rad_register_all_codecs; + use crate::rad_register_all_decoders; use crate::rad_register_all_demuxers; #[test] fn test_bink2() { let mut dmx_reg = RegisteredDemuxers::new(); rad_register_all_demuxers(&mut dmx_reg); let mut dec_reg = RegisteredDecoders::new(); - rad_register_all_codecs(&mut dec_reg); + rad_register_all_decoders(&mut dec_reg); //let file = "assets/RAD/Open_Logos_partial.bik"; //let file = "assets/RAD/sc13_01_partial.bk2"; diff --git a/nihav-rad/src/codecs/binkaud.rs b/nihav-rad/src/codecs/binkaud.rs index c94f39d..1cdb0a1 100644 --- a/nihav-rad/src/codecs/binkaud.rs +++ b/nihav-rad/src/codecs/binkaud.rs @@ -298,7 +298,7 @@ mod test { use nihav_core::codecs::RegisteredDecoders; use nihav_core::demuxers::RegisteredDemuxers; use nihav_codec_support::test::dec_video::*; - use crate::rad_register_all_codecs; + use crate::rad_register_all_decoders; use crate::rad_register_all_demuxers; #[test] @@ -306,7 +306,7 @@ mod test { let mut dmx_reg = RegisteredDemuxers::new(); rad_register_all_demuxers(&mut dmx_reg); let mut dec_reg = RegisteredDecoders::new(); - rad_register_all_codecs(&mut dec_reg); + rad_register_all_decoders(&mut dec_reg); let file = "assets/RAD/ActivisionLogo.bik"; test_decode_audio("bink", file, None, None/*Some("bink")*/, &dmx_reg, &dec_reg); @@ -316,7 +316,7 @@ mod test { let mut dmx_reg = RegisteredDemuxers::new(); rad_register_all_demuxers(&mut dmx_reg); let mut dec_reg = RegisteredDecoders::new(); - rad_register_all_codecs(&mut dec_reg); + rad_register_all_decoders(&mut dec_reg); let file = "assets/RAD/NWCLOGO.BIK"; test_decode_audio("bink", file, None, None/*Some("bink")*/, &dmx_reg, &dec_reg); diff --git a/nihav-rad/src/codecs/binkvid.rs b/nihav-rad/src/codecs/binkvid.rs index 0c23480..5f5bb56 100644 --- a/nihav-rad/src/codecs/binkvid.rs +++ b/nihav-rad/src/codecs/binkvid.rs @@ -1264,14 +1264,14 @@ mod test { use nihav_core::codecs::RegisteredDecoders; use nihav_core::demuxers::RegisteredDemuxers; use nihav_codec_support::test::dec_video::*; - use crate::rad_register_all_codecs; + use crate::rad_register_all_decoders; use crate::rad_register_all_demuxers; #[test] fn test_binkvid_b() { let mut dmx_reg = RegisteredDemuxers::new(); rad_register_all_demuxers(&mut dmx_reg); let mut dec_reg = RegisteredDecoders::new(); - rad_register_all_codecs(&mut dec_reg); + rad_register_all_decoders(&mut dec_reg); test_decoding("bink", "bink-video", "assets/RAD/NEW.BIK", Some(16), &dmx_reg, &dec_reg, ExpectedTestResult::MD5Frames(vec![ @@ -1298,7 +1298,7 @@ mod test { let mut dmx_reg = RegisteredDemuxers::new(); rad_register_all_demuxers(&mut dmx_reg); let mut dec_reg = RegisteredDecoders::new(); - rad_register_all_codecs(&mut dec_reg); + rad_register_all_decoders(&mut dec_reg); test_decoding("bink", "bink-video", "assets/RAD/ActivisionLogo.bik", Some(42), &dmx_reg, &dec_reg, diff --git a/nihav-rad/src/codecs/mod.rs b/nihav-rad/src/codecs/mod.rs index 2e279b6..a11f5c5 100644 --- a/nihav-rad/src/codecs/mod.rs +++ b/nihav-rad/src/codecs/mod.rs @@ -29,7 +29,7 @@ const RAD_CODECS: &[DecoderInfo] = &[ ]; /// Registers all available codecs provided by this crate. -pub fn rad_register_all_codecs(rd: &mut RegisteredDecoders) { +pub fn rad_register_all_decoders(rd: &mut RegisteredDecoders) { for decoder in RAD_CODECS.iter() { rd.add_decoder(decoder.clone()); } diff --git a/nihav-rad/src/codecs/smacker.rs b/nihav-rad/src/codecs/smacker.rs index 14e5125..0d681dc 100644 --- a/nihav-rad/src/codecs/smacker.rs +++ b/nihav-rad/src/codecs/smacker.rs @@ -616,14 +616,14 @@ mod test { use nihav_core::codecs::RegisteredDecoders; use nihav_core::demuxers::RegisteredDemuxers; use nihav_codec_support::test::dec_video::*; - use crate::rad_register_all_codecs; + use crate::rad_register_all_decoders; use crate::rad_register_all_demuxers; #[test] fn test_smkvid() { let mut dmx_reg = RegisteredDemuxers::new(); rad_register_all_demuxers(&mut dmx_reg); let mut dec_reg = RegisteredDecoders::new(); - rad_register_all_codecs(&mut dec_reg); + rad_register_all_decoders(&mut dec_reg); test_decoding("smacker", "smacker-video", "assets/RAD/credits.smk", None, &dmx_reg, &dec_reg, ExpectedTestResult::MD5Frames(vec![ @@ -643,7 +643,7 @@ mod test { let mut dmx_reg = RegisteredDemuxers::new(); rad_register_all_demuxers(&mut dmx_reg); let mut dec_reg = RegisteredDecoders::new(); - rad_register_all_codecs(&mut dec_reg); + rad_register_all_decoders(&mut dec_reg); test_decoding("smacker", "smacker-audio", "assets/RAD/wetlogo.smk", None, &dmx_reg, &dec_reg, ExpectedTestResult::MD5([0xc686b833, 0x0a203038, 0x012f6d9b, 0xa4186d44])); @@ -653,7 +653,7 @@ mod test { let mut dmx_reg = RegisteredDemuxers::new(); rad_register_all_demuxers(&mut dmx_reg); let mut dec_reg = RegisteredDecoders::new(); - rad_register_all_codecs(&mut dec_reg); + rad_register_all_decoders(&mut dec_reg); test_decoding("smacker", "smacker-audio", "assets/RAD/20130507_audio-distortion.smk", None, &dmx_reg, &dec_reg, ExpectedTestResult::MD5([0x942a0922, 0x182bb5fd, 0x94ab7a59, 0x2028d810])); diff --git a/nihav-rad/src/lib.rs b/nihav-rad/src/lib.rs index 65b94e6..6ce3702 100644 --- a/nihav-rad/src/lib.rs +++ b/nihav-rad/src/lib.rs @@ -12,7 +12,7 @@ extern crate nihav_codec_support; #[allow(clippy::useless_let_if_seq)] mod codecs; #[cfg(feature="decoders")] -pub use crate::codecs::rad_register_all_codecs; +pub use crate::codecs::rad_register_all_decoders; #[cfg(feature="demuxers")] #[allow(clippy::cast_lossless)] diff --git a/nihav-realmedia/src/codecs/cook.rs b/nihav-realmedia/src/codecs/cook.rs index 2ac7a66..c3e8276 100644 --- a/nihav-realmedia/src/codecs/cook.rs +++ b/nihav-realmedia/src/codecs/cook.rs @@ -691,14 +691,14 @@ mod test { use nihav_core::codecs::RegisteredDecoders; use nihav_core::demuxers::RegisteredDemuxers; use nihav_codec_support::test::dec_video::*; - use crate::realmedia_register_all_codecs; + use crate::realmedia_register_all_decoders; use crate::realmedia_register_all_demuxers; #[test] fn test_cook() { let mut dmx_reg = RegisteredDemuxers::new(); realmedia_register_all_demuxers(&mut dmx_reg); let mut dec_reg = RegisteredDecoders::new(); - realmedia_register_all_codecs(&mut dec_reg); + realmedia_register_all_decoders(&mut dec_reg); // let file = "assets/RV/rv30_weighted_mc.rm"; let file = "assets/RV/multichannel.rma"; diff --git a/nihav-realmedia/src/codecs/mod.rs b/nihav-realmedia/src/codecs/mod.rs index b8ad7be..d8a36d4 100644 --- a/nihav-realmedia/src/codecs/mod.rs +++ b/nihav-realmedia/src/codecs/mod.rs @@ -73,7 +73,7 @@ const RM_CODECS: &[DecoderInfo] = &[ ]; /// Registers all available codecs provided by this crate. -pub fn realmedia_register_all_codecs(rd: &mut RegisteredDecoders) { +pub fn realmedia_register_all_decoders(rd: &mut RegisteredDecoders) { for decoder in RM_CODECS.iter() { rd.add_decoder(decoder.clone()); } diff --git a/nihav-realmedia/src/codecs/ra144.rs b/nihav-realmedia/src/codecs/ra144.rs index 31f2c01..5cae66c 100644 --- a/nihav-realmedia/src/codecs/ra144.rs +++ b/nihav-realmedia/src/codecs/ra144.rs @@ -326,14 +326,14 @@ mod test { use nihav_core::codecs::RegisteredDecoders; use nihav_core::demuxers::RegisteredDemuxers; use nihav_codec_support::test::dec_video::*; - use crate::realmedia_register_all_codecs; + use crate::realmedia_register_all_decoders; use crate::realmedia_register_all_demuxers; #[test] fn test_ra144() { let mut dmx_reg = RegisteredDemuxers::new(); realmedia_register_all_demuxers(&mut dmx_reg); let mut dec_reg = RegisteredDecoders::new(); - realmedia_register_all_codecs(&mut dec_reg); + realmedia_register_all_decoders(&mut dec_reg); let file = "assets/RV/ra3_in_rm_file.rm"; test_decode_audio("realmedia", file, Some(5000), None/*Some("ra14.4")*/, &dmx_reg, &dec_reg); diff --git a/nihav-realmedia/src/codecs/ra288.rs b/nihav-realmedia/src/codecs/ra288.rs index 1d98331..624769d 100644 --- a/nihav-realmedia/src/codecs/ra288.rs +++ b/nihav-realmedia/src/codecs/ra288.rs @@ -216,14 +216,14 @@ mod test { use nihav_core::codecs::RegisteredDecoders; use nihav_core::demuxers::RegisteredDemuxers; use nihav_codec_support::test::dec_video::*; - use crate::realmedia_register_all_codecs; + use crate::realmedia_register_all_decoders; use crate::realmedia_register_all_demuxers; #[test] fn test_ra288() { let mut dmx_reg = RegisteredDemuxers::new(); realmedia_register_all_demuxers(&mut dmx_reg); let mut dec_reg = RegisteredDecoders::new(); - realmedia_register_all_codecs(&mut dec_reg); + realmedia_register_all_decoders(&mut dec_reg); let file = "assets/RV/A0000044.rm"; test_decode_audio("realmedia", file, Some(5000), None/*Some("ra28.8")*/, &dmx_reg, &dec_reg); diff --git a/nihav-realmedia/src/codecs/ralf.rs b/nihav-realmedia/src/codecs/ralf.rs index 56af967..be256b3 100644 --- a/nihav-realmedia/src/codecs/ralf.rs +++ b/nihav-realmedia/src/codecs/ralf.rs @@ -486,14 +486,14 @@ mod test { use nihav_core::codecs::RegisteredDecoders; use nihav_core::demuxers::RegisteredDemuxers; use nihav_codec_support::test::dec_video::*; - use crate::realmedia_register_all_codecs; + use crate::realmedia_register_all_decoders; use crate::realmedia_register_all_demuxers; #[test] fn test_ralf() { let mut dmx_reg = RegisteredDemuxers::new(); realmedia_register_all_demuxers(&mut dmx_reg); let mut dec_reg = RegisteredDecoders::new(); - realmedia_register_all_codecs(&mut dec_reg); + realmedia_register_all_decoders(&mut dec_reg); test_decoding("realmedia", "ralf", "assets/RV/rv40_ralf.rmvb", None, &dmx_reg, &dec_reg, ExpectedTestResult::MD5([0x6cf18361, 0x9548b5ce, 0x5dfc0b5c, 0x2bd6f392])); diff --git a/nihav-realmedia/src/codecs/rv10.rs b/nihav-realmedia/src/codecs/rv10.rs index e729b0d..7c317af 100644 --- a/nihav-realmedia/src/codecs/rv10.rs +++ b/nihav-realmedia/src/codecs/rv10.rs @@ -476,14 +476,14 @@ mod test { use nihav_core::codecs::RegisteredDecoders; use nihav_core::demuxers::RegisteredDemuxers; use nihav_codec_support::test::dec_video::*; - use crate::realmedia_register_all_codecs; + use crate::realmedia_register_all_decoders; use crate::realmedia_register_all_demuxers; #[test] fn test_rv10_old() { let mut dmx_reg = RegisteredDemuxers::new(); realmedia_register_all_demuxers(&mut dmx_reg); let mut dec_reg = RegisteredDecoders::new(); - realmedia_register_all_codecs(&mut dec_reg); + realmedia_register_all_decoders(&mut dec_reg); test_decoding("realmedia", "realvideo1", "assets/RV/thankyou.rm", Some(1000), &dmx_reg, &dec_reg, ExpectedTestResult::MD5Frames(vec![ @@ -501,7 +501,7 @@ mod test { let mut dmx_reg = RegisteredDemuxers::new(); realmedia_register_all_demuxers(&mut dmx_reg); let mut dec_reg = RegisteredDecoders::new(); - realmedia_register_all_codecs(&mut dec_reg); + realmedia_register_all_decoders(&mut dec_reg); test_decoding("realmedia", "realvideo1", "assets/RV/rv10_dnet_640x352_realvideo_encoder_4.0.rm", diff --git a/nihav-realmedia/src/codecs/rv20.rs b/nihav-realmedia/src/codecs/rv20.rs index 39254db..88b1a60 100644 --- a/nihav-realmedia/src/codecs/rv20.rs +++ b/nihav-realmedia/src/codecs/rv20.rs @@ -693,14 +693,14 @@ mod test { use nihav_core::codecs::RegisteredDecoders; use nihav_core::demuxers::RegisteredDemuxers; use nihav_codec_support::test::dec_video::*; - use crate::realmedia_register_all_codecs; + use crate::realmedia_register_all_decoders; use crate::realmedia_register_all_demuxers; #[test] fn test_rv20() { let mut dmx_reg = RegisteredDemuxers::new(); realmedia_register_all_demuxers(&mut dmx_reg); let mut dec_reg = RegisteredDecoders::new(); - realmedia_register_all_codecs(&mut dec_reg); + realmedia_register_all_decoders(&mut dec_reg); test_decoding("realmedia", "realvideo2", "assets/RV/rv20_svt_atrc_640x352_realproducer_plus_8.51.rm", diff --git a/nihav-realmedia/src/codecs/rv30.rs b/nihav-realmedia/src/codecs/rv30.rs index 1827980..f5a894b 100644 --- a/nihav-realmedia/src/codecs/rv30.rs +++ b/nihav-realmedia/src/codecs/rv30.rs @@ -180,14 +180,14 @@ mod test { use nihav_core::codecs::RegisteredDecoders; use nihav_core::demuxers::RegisteredDemuxers; use nihav_codec_support::test::dec_video::*; - use crate::realmedia_register_all_codecs; + use crate::realmedia_register_all_decoders; use crate::realmedia_register_all_demuxers; #[test] fn test_rv30() { let mut dmx_reg = RegisteredDemuxers::new(); realmedia_register_all_demuxers(&mut dmx_reg); let mut dec_reg = RegisteredDecoders::new(); - realmedia_register_all_codecs(&mut dec_reg); + realmedia_register_all_decoders(&mut dec_reg); test_decoding("realmedia", "realvideo3", "assets/RV/rv30_weighted_mc.rm", Some(700), &dmx_reg, &dec_reg, ExpectedTestResult::MD5Frames(vec![ diff --git a/nihav-realmedia/src/codecs/rv40.rs b/nihav-realmedia/src/codecs/rv40.rs index 95e2325..bcd600b 100644 --- a/nihav-realmedia/src/codecs/rv40.rs +++ b/nihav-realmedia/src/codecs/rv40.rs @@ -373,14 +373,14 @@ mod test { use nihav_core::codecs::RegisteredDecoders; use nihav_core::demuxers::RegisteredDemuxers; use nihav_codec_support::test::dec_video::*; - use crate::realmedia_register_all_codecs; + use crate::realmedia_register_all_decoders; use crate::realmedia_register_all_demuxers; #[test] fn test_rv40() { let mut dmx_reg = RegisteredDemuxers::new(); realmedia_register_all_demuxers(&mut dmx_reg); let mut dec_reg = RegisteredDecoders::new(); - realmedia_register_all_codecs(&mut dec_reg); + realmedia_register_all_decoders(&mut dec_reg); test_decoding("realmedia", "realvideo4", "assets/RV/rv40_weighted_mc.rmvb", Some(1500), &dmx_reg, &dec_reg,ExpectedTestResult::MD5Frames(vec![ diff --git a/nihav-realmedia/src/codecs/rv60.rs b/nihav-realmedia/src/codecs/rv60.rs index ecc400a..d1e7c53 100644 --- a/nihav-realmedia/src/codecs/rv60.rs +++ b/nihav-realmedia/src/codecs/rv60.rs @@ -1589,14 +1589,14 @@ mod test { use nihav_core::codecs::RegisteredDecoders; use nihav_core::demuxers::RegisteredDemuxers; use nihav_codec_support::test::dec_video::*; - use crate::realmedia_register_all_codecs; + use crate::realmedia_register_all_decoders; use crate::realmedia_register_all_demuxers; #[test] fn test_rv60() { let mut dmx_reg = RegisteredDemuxers::new(); realmedia_register_all_demuxers(&mut dmx_reg); let mut dec_reg = RegisteredDecoders::new(); - realmedia_register_all_codecs(&mut dec_reg); + realmedia_register_all_decoders(&mut dec_reg); test_decoding("realmedia", "realvideo6", "assets/RV/RV60.rmhd", Some(1000), &dmx_reg, &dec_reg, ExpectedTestResult::MD5Frames(vec![ diff --git a/nihav-realmedia/src/lib.rs b/nihav-realmedia/src/lib.rs index 634e3b2..0155eac 100644 --- a/nihav-realmedia/src/lib.rs +++ b/nihav-realmedia/src/lib.rs @@ -13,7 +13,7 @@ extern crate nihav_codec_support; #[allow(clippy::useless_let_if_seq)] mod codecs; #[cfg(feature="decoders")] -pub use crate::codecs::realmedia_register_all_codecs; +pub use crate::codecs::realmedia_register_all_decoders; #[cfg(feature="demuxers")] #[allow(clippy::cast_lossless)] diff --git a/nihav-vivo/src/codecs/g723_1.rs b/nihav-vivo/src/codecs/g723_1.rs index 1b6d8c6..42dda3a 100644 --- a/nihav-vivo/src/codecs/g723_1.rs +++ b/nihav-vivo/src/codecs/g723_1.rs @@ -975,14 +975,14 @@ mod test { use nihav_core::codecs::RegisteredDecoders; use nihav_core::demuxers::RegisteredDemuxers; use nihav_codec_support::test::dec_video::*; - use crate::vivo_register_all_codecs; + use crate::vivo_register_all_decoders; use crate::vivo_register_all_demuxers; #[test] fn test_g723_1() { let mut dmx_reg = RegisteredDemuxers::new(); vivo_register_all_demuxers(&mut dmx_reg); let mut dec_reg = RegisteredDecoders::new(); - vivo_register_all_codecs(&mut dec_reg); + vivo_register_all_decoders(&mut dec_reg); let file = "assets/Misc/adalogo.viv"; //let file = "assets/Misc/gr_al.viv"; diff --git a/nihav-vivo/src/codecs/mod.rs b/nihav-vivo/src/codecs/mod.rs index 62d4448..354f585 100644 --- a/nihav-vivo/src/codecs/mod.rs +++ b/nihav-vivo/src/codecs/mod.rs @@ -30,7 +30,7 @@ const VIVO_CODECS: &[DecoderInfo] = &[ ]; /// Registers all available codecs provided by this crate. -pub fn vivo_register_all_codecs(rd: &mut RegisteredDecoders) { +pub fn vivo_register_all_decoders(rd: &mut RegisteredDecoders) { for decoder in VIVO_CODECS.iter() { rd.add_decoder(decoder.clone()); } diff --git a/nihav-vivo/src/codecs/siren.rs b/nihav-vivo/src/codecs/siren.rs index 79c821b..0b23f18 100644 --- a/nihav-vivo/src/codecs/siren.rs +++ b/nihav-vivo/src/codecs/siren.rs @@ -395,14 +395,14 @@ mod test { use nihav_core::codecs::RegisteredDecoders; use nihav_core::demuxers::RegisteredDemuxers; use nihav_codec_support::test::dec_video::*; - use crate::vivo_register_all_codecs; + use crate::vivo_register_all_decoders; use crate::vivo_register_all_demuxers; #[test] fn test_siren() { let mut dmx_reg = RegisteredDemuxers::new(); vivo_register_all_demuxers(&mut dmx_reg); let mut dec_reg = RegisteredDecoders::new(); - vivo_register_all_codecs(&mut dec_reg); + vivo_register_all_decoders(&mut dec_reg); let file = "assets/Misc/favmovie.viv"; //let file = "assets/Misc/gr_al.viv"; diff --git a/nihav-vivo/src/codecs/vivo.rs b/nihav-vivo/src/codecs/vivo.rs index 33de179..9963cc4 100644 --- a/nihav-vivo/src/codecs/vivo.rs +++ b/nihav-vivo/src/codecs/vivo.rs @@ -492,14 +492,14 @@ mod test { use nihav_core::codecs::RegisteredDecoders; use nihav_core::demuxers::RegisteredDemuxers; use nihav_codec_support::test::dec_video::*; - use crate::vivo_register_all_codecs; + use crate::vivo_register_all_decoders; use crate::vivo_register_all_demuxers; #[test] fn test_vivo1() { let mut dmx_reg = RegisteredDemuxers::new(); vivo_register_all_demuxers(&mut dmx_reg); let mut dec_reg = RegisteredDecoders::new(); - vivo_register_all_codecs(&mut dec_reg); + vivo_register_all_decoders(&mut dec_reg); test_file_decoding("vivo", "assets/Misc/gr_al.viv", Some(16), true, false, Some("viv1"), &dmx_reg, &dec_reg); // test_decoding("vivo", "vivo1", "assets/Misc/gr_al.viv", Some(16), @@ -510,7 +510,7 @@ test_file_decoding("vivo", "assets/Misc/gr_al.viv", Some(16), true, false, Some( let mut dmx_reg = RegisteredDemuxers::new(); vivo_register_all_demuxers(&mut dmx_reg); let mut dec_reg = RegisteredDecoders::new(); - vivo_register_all_codecs(&mut dec_reg); + vivo_register_all_decoders(&mut dec_reg); test_file_decoding("vivo", "assets/Misc/02-KimagureOrangeRoad.viv", Some(50), true, false, Some("viv2"), &dmx_reg, &dec_reg); panic!("end"); diff --git a/nihav-vivo/src/lib.rs b/nihav-vivo/src/lib.rs index 74bdb98..97a238b 100644 --- a/nihav-vivo/src/lib.rs +++ b/nihav-vivo/src/lib.rs @@ -4,5 +4,5 @@ extern crate nihav_codec_support; mod codecs; mod demuxers; -pub use crate::codecs::vivo_register_all_codecs; +pub use crate::codecs::vivo_register_all_decoders; pub use crate::demuxers::vivo_register_all_demuxers; |