X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-registry%2Fsrc%2Fregister.rs;h=f9f0fb298f3e4127347ac216a5170dad43466ef2;hb=HEAD;hp=330ce94f12676eab05c4adb6d4689969aa2a334c;hpb=b5e49861a84d04221ae3066bd4256fe1016b7172;p=nihav.git

diff --git a/nihav-registry/src/register.rs b/nihav-registry/src/register.rs
index 330ce94..15a3f65 100644
--- a/nihav-registry/src/register.rs
+++ b/nihav-registry/src/register.rs
@@ -147,12 +147,7 @@ macro_rules! desc {
 
 /// Returns codec description for the provided codec short name if it is found.
 pub fn get_codec_description(name: &str) -> Option<&'static CodecDescription> {
-    for reg in CODEC_REGISTER {
-        if reg.name == name {
-            return Some(reg);
-        }
-    }
-    None
+    CODEC_REGISTER.iter().find(|&reg| reg.name == name)
 }
 
 static CODEC_REGISTER: &[CodecDescription] = &[
@@ -165,6 +160,7 @@ static CODEC_REGISTER: &[CodecDescription] = &[
     desc!(video;    "indeo3", "Intel Indeo 3"),
     desc!(video;    "indeo4", "Intel Indeo 4", CODEC_CAP_REORDER | CODEC_CAP_SCALABLE),
     desc!(video;    "indeo5", "Intel Indeo 5", CODEC_CAP_REORDER | CODEC_CAP_SCALABLE),
+    desc!(video;    "indeo5s", "Intel Indeo 5 Scalable", CODEC_CAP_SCALABLE),
     desc!(video;    "intel263", "Intel I263", CODEC_CAP_REORDER),
     desc!(audio;    "iac",    "Intel Indeo audio"),
     desc!(audio;    "imc",    "Intel Music Coder"),
@@ -211,6 +207,20 @@ static CODEC_REGISTER: &[CodecDescription] = &[
     desc!(audio;    "qdesign-music2",       "QDesign Music v2"),
     desc!(audio;    "qualcomm-purevoice",   "Qualcomm PureVoice"),
 
+    desc!(video-ll; "arm_rawvideo",         "Acorn Replay Movie raw video formats"),
+    desc!(audio;    "arm_rawaudio",         "Acorn Replay Movie raw audio formats"),
+    desc!(video;    "movinglines",          "Acorn Moving Lines"),
+    desc!(video;    "movingblocks",         "Acorn Moving Blocks"),
+    desc!(video;    "movingblockshq",       "Acorn Moving Blocks HQ"),
+    desc!(video;    "supermovingblocks",    "Acorn Super Moving Blocks"),
+    desc!(video;    "linepack",             "Henrik Pedersen's LinePack"),
+    desc!(video;    "movie16_3",            "Henrik Pedersen's Movie 16:3"),
+    desc!(video;    "escape100",            "Eidos Escape 100"),
+    desc!(video;    "escape102",            "Eidos Escape 102"),
+    desc!(video;    "escape122",            "Eidos Escape 122"),
+    desc!(video;    "escape124",            "Eidos Escape 124"),
+    desc!(video;    "escape130",            "Eidos Escape 130"),
+
     desc!(video;    "truemotion1",   "TrueMotion 1"),
     desc!(video-im; "truemotionrt",  "TrueMotion RT"),
     desc!(video;    "truemotion2",   "TrueMotion 2"),
@@ -235,24 +245,35 @@ static CODEC_REGISTER: &[CodecDescription] = &[
     desc!(audio;     "asao",         "N*llym*s*r ASAO"),
     desc!(audio;     "flv-adpcm",    "Flash ADPCM"),
 
+    desc!(audio;     "mp1",          "MPEG Audio Layer I"),
+    desc!(audio;     "mp2",          "MPEG Audio Layer II"),
     desc!(audio;     "mp3",          "MPEG Audio Layer III"),
     desc!(audio;     "speex",        "Speex"),
 
     desc!(video;    "gdv-video",     "Gremlin Digital Video - video"),
     desc!(audio;    "gdv-audio",     "Gremlin Digital Video - audio"),
+    desc!(video-im; "arxel-video",   "Arxel Tribe Video"),
+    desc!(video;    "beam-fcp",      "Beam Software Animation"),
+    desc!(video;    "beam-video",    "Beam Software Video"),
     desc!(video;    "bmv-video",     "BMV video"),
     desc!(audio;    "bmv-audio",     "BMV audio"),
     desc!(video;    "bmv3-video",    "DW Noir BMV video"),
     desc!(audio;    "bmv3-audio",    "DW Noir BMV audio"),
+    desc!(video;    "dp-sga",        "Digital Pictures SGA video"),
     desc!(video;    "fable-imax",    "Fable IMAX video"),
     desc!(video;    "fst-video",     "FutureVision video"),
     desc!(audio;    "fst-audio",     "FutureVision audio"),
+    desc!(video;    "hl-fmv-video",  "Highlander FMV video"),
     desc!(video-llp; "ipma",         "Imagination Pilots Matte Animation"),
     desc!(video-llp; "ipma2",        "Imagination Pilots Matte Animation v2"),
     desc!(video;    "legend-q-video", "Legend Entertainment Q video"),
     desc!(video;    "midivid",       "MidiVid"),
     desc!(video;    "midivid3",      "MidiVid 3"),
     desc!(video-ll; "midivid-ll",    "MidiVid Lossless"),
+    desc!(video;    "smushv1",       "SMUSH Video paletted"),
+    desc!(video;    "smushv2",       "SMUSH Video 16-bit"),
+    desc!(video;    "smush-iact",    "SMUSH IACT Audio"),
+    desc!(video;    "smush-vima",    "SMUSH VIMA Audio"),
     desc!(video;    "vmd-video",     "VMD video"),
     desc!(audio;    "vmd-audio",     "VMD audio"),
     desc!(video;    "vxvideo",       "Actimagine Vx"),
@@ -280,8 +301,11 @@ static CODEC_REGISTER: &[CodecDescription] = &[
     desc!(audio-ll;  "tta",          "True Audio codec"),
     desc!(audio-hyb; "wavpack",      "WavPack"),
 
+    desc!(video-ll; "gif",           "GIF"),
     desc!(video-im; "jpeg",          "JPEG"),
     desc!(video;    "h264",          "ITU H.264", CODEC_CAP_COMPLEX_REORDER | CODEC_CAP_HYBRID),
+
+    desc!(video-im; "mwv1",          "Aware MotionWavelets"),
 ];
 
 static AVI_VIDEO_CODEC_REGISTER: &[(&[u8;4], &str)] = &[
@@ -327,6 +351,8 @@ static AVI_VIDEO_CODEC_REGISTER: &[(&[u8;4], &str)] = &[
     (b"VP62", "vp6"),
     (b"VP6A", "vp6a"),
     (b"VP70", "vp7"),
+
+    (b"MWV1", "mwv1"),
 ];
 
 static WAV_CODEC_REGISTER: &[(u16, &str)] = &[