X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;ds=sidebyside;f=nihav-registry%2Fsrc%2Fdetect.rs;h=7d0633a7630d4f2ee4db12ef34cd955539b3dc10;hb=cacc0c44f6429c2acf03f9bfda5b7547614b841e;hp=44b6e54c919b074646c167cf9bc94890ff8d6a77;hpb=32f7cbe538d71574f7ac05aa51599d2678f5db3f;p=nihav.git

diff --git a/nihav-registry/src/detect.rs b/nihav-registry/src/detect.rs
index 44b6e54..7d0633a 100644
--- a/nihav-registry/src/detect.rs
+++ b/nihav-registry/src/detect.rs
@@ -198,6 +198,21 @@ const DETECTORS: &[DetectConditions] = &[
                                                                &CC::Str(b"ON2fLIST")) },
                      ]
     },
+    DetectConditions {
+        demux_name: "mov",
+        extensions: ".mov",
+        conditions: &[CheckItem{offs: 4, cond: &CC::Or(&CC::Or(&CC::Str(b"mdat"),
+                                                               &CC::Str(b"moov")),
+                                                               &CC::Str(b"ftyp")) }],
+    },
+    DetectConditions {
+        demux_name: "mov",
+        extensions: ".mov",
+        conditions: &[CheckItem{offs:  0, cond: &CC::Str(b"\x00\x00\x00\x08wide") },
+                      CheckItem{offs: 12, cond: &CC::Or(&CC::Or(&CC::Str(b"mdat"),
+                                                                &CC::Str(b"moov")),
+                                                                &CC::Str(b"ftyp")) }],
+    },
     DetectConditions {
         demux_name: "gdv",
         extensions: ".gdv",
@@ -222,8 +237,8 @@ const DETECTORS: &[DetectConditions] = &[
     DetectConditions {
         demux_name: "bink",
         extensions: ".bik,.bk2",
-        conditions: &[CheckItem{offs: 0, cond: &CC::Or(&CC::In(Arg::U32BE(0x32494B62),     // BIKb
-                                                               Arg::U32BE(0x32494B7B)),    // BIKz
+        conditions: &[CheckItem{offs: 0, cond: &CC::Or(&CC::In(Arg::U32BE(0x42494B62),     // BIKb
+                                                               Arg::U32BE(0x42494B7B)),    // BIKz
                                                        &CC::In(Arg::U32BE(0x4B423261),     // KB2a
                                                                Arg::U32BE(0x4B42327B)))}], // KB2z
     },
@@ -232,6 +247,18 @@ const DETECTORS: &[DetectConditions] = &[
         extensions: ".smk",
         conditions: &[CheckItem{offs: 0, cond: &CC::Or(&CC::Str(b"SMK2"), &CC::Str(b"SMK4"))}],
     },
+    DetectConditions {
+        demux_name: "vivo",
+        extensions: ".viv",
+        conditions: &[CheckItem{offs: 0, cond: &CC::In(Arg::U16BE(1), Arg::U16BE(0xFF))},
+                      CheckItem{offs: 2, cond: &CC::Str(b"\x0D\x0AVersion:Vivo/")}],
+    },
+    DetectConditions {
+        demux_name: "vivo",
+        extensions: ".viv",
+        conditions: &[CheckItem{offs: 0, cond: &CC::In(Arg::U16BE(1), Arg::U16BE(0xFF))},
+                      CheckItem{offs: 3, cond: &CC::Str(b"\x0D\x0AVersion:Vivo/")}],
+    },
     DetectConditions {
         demux_name: "bmv",
         extensions: ".bmv",