codec_support/h263: fix some cases related to Vivo 2.0

[nihav.git] / nihav-registry / src / detect.rs

diff --git a/nihav-registry/src/detect.rs b/nihav-registry/src/detect.rs
index 44b6e54c919b074646c167cf9bc94890ff8d6a77..aeaa06d408be4996865e7e75732f17825a1aa3f5 100644 (file)
--- 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
     },