more magic.

diff --git a/magic/Magdir/amigaos b/magic/Magdir/amigaos
index 2665a6e0d1ac5ed1c6021a9ea21380138f3d007e..f12d49648659a43699789da406d72db05962459b 100644 (file)
--- a/magic/Magdir/amigaos
+++ b/magic/Magdir/amigaos
@@ -53,3 +53,5 @@
 >35    byte            1               os: OS/2
 >35    byte            2               os: Win32
 >35    byte            3               os: Unix
+
+0      belong          0x000003fa      AmigaOS shared library

diff --git a/magic/Magdir/audio b/magic/Magdir/audio
index a4a707d7e8a83dbef8fe272f16076148b7d5dfaa..ed4c5bdd1ad349304eb4a09b26bea7402fba0954 100644 (file)
--- a/magic/Magdir/audio
+++ b/magic/Magdir/audio
@@ -43,8 +43,12 @@
 
 # Creative Labs AUDIO stuff
 0      string  MThd                    Standard MIDI data
->9     byte    >0                      (format %d)
->11    byte    >1                      using %d tracks
+>8     beshort x                       (format %d)
+>10    beshort x                       using %d track
+>10    beshort         >1              \bs
+>12    beshort&0x7fff  x               at 1/%d
+>12    beshort&0x8000  >0              SMPTE
+
 0      string  CTMF                    Creative Music (CMF) data
 0      string  SBI                     SoundBlaster instrument data
 0      string  Creative\ Voice\ File   Creative Labs voice data

diff --git a/magic/Magdir/iff b/magic/Magdir/iff
index 68d1b79bd86c86aed7da678b021ce0beed663edc..319e71689543138a598cbbdf4a88fd6c029e269e 100644 (file)
--- a/magic/Magdir/iff
+++ b/magic/Magdir/iff
@@ -16,6 +16,8 @@
 >8     string          AIFC            \b, AIFF-C compressed audio
 >8     string          8SVX            \b, 8SVX 8-bit sampled sound voice
 >8     string          SAMP            \b, SAMP sampled audio
+>8     string          DTYP            \b, DTYP datatype description
+>8     string          PTCH            \b, PTCH binary patch
 # image formats
 >8     string          ILBMBMHD        \b, ILBM interleaved image
 >>20   beshort         x               \b, %d x

diff --git a/magic/Magdir/riff b/magic/Magdir/riff
index 509933e81d57e95e696b94b5eb37aae1a35c7cc0..f1074c408e026324d59f59121e6e8faf2c8595a8 100644 (file)
--- a/magic/Magdir/riff
+++ b/magic/Magdir/riff
@@ -5,13 +5,7 @@
 #
 #      http://www.seanet.com/users/matts/riffmci/riffmci.htm
 #
-# and
-#
-#      http://www.ora.com/centers/gff/formats/micriff/index.htm
-#
-# and
-#
-#      http://www.jtauber.com/music/encoding/niff/spec/
+# AVI section extended by Patrik Rådman <patrik+file-magic@iki.fi>
 #
 0      string          RIFF            RIFF (little-endian) data
 # RIFF Palette format
@@ -56,10 +50,119 @@
 >8     string          CDRA            \b, Corel Draw Picture
 # AVI == Audio Video Interleave
 >8     string          AVI\040         \b, AVI
+>>12    string          LIST
+>>>20   string          hdrlavih
+>>>>&36 lelong          x               \b, %lu x
+>>>>&40 lelong          x               %lu,
+>>>>&4  lelong          >1000000        <1 fps,
+>>>>&4  lelong          1000000         1.00 fps,
+>>>>&4  lelong          500000          2.00 fps,
+>>>>&4  lelong          333333          3.00 fps,
+>>>>&4  lelong          250000          4.00 fps,
+>>>>&4  lelong          200000          5.00 fps,
+>>>>&4  lelong          166667          6.00 fps,
+>>>>&4  lelong          142857          7.00 fps,
+>>>>&4  lelong          125000          8.00 fps,
+>>>>&4  lelong          111111          9.00 fps,
+>>>>&4  lelong          100000          10.00 fps,
+# ]9.9,10.1[
+>>>>&4  lelong          <101010
+>>>>>&-4        lelong  >99010
+>>>>>>&-4       lelong  !100000         ~10 fps,
+>>>>&4  lelong          83333           12.00 fps,
+# ]11.9,12.1[
+>>>>&4  lelong          <84034
+>>>>>&-4        lelong  >82645
+>>>>>>&-4       lelong  !83333          ~12 fps,
+>>>>&4  lelong          66667           15.00 fps,
+# ]14.9,15.1[
+>>>>&4  lelong          <67114
+>>>>>&-4        lelong  >66225
+>>>>>>&-4       lelong  !66667          ~15 fps,
+>>>>&4  lelong          50000           20.00 fps,
+>>>>&4  lelong          41708           23.98 fps,
+>>>>&4  lelong          41667           24.00 fps,
+# ]23.9,24.1[
+>>>>&4  lelong          <41841
+>>>>>&-4        lelong  >41494
+>>>>>>&-4       lelong  !41708
+>>>>>>>&-4      lelong  !41667          ~24 fps,
+>>>>&4  lelong          40000           25.00 fps,
+# ]24.9,25.1[
+>>>>&4  lelong          <40161
+>>>>>&-4        lelong  >39841
+>>>>>>&-4       lelong  !40000          ~25 fps,
+>>>>&4  lelong          33367           29.97 fps,
+>>>>&4  lelong          33333           30.00 fps,
+# ]29.9,30.1[
+>>>>&4  lelong          <33445
+>>>>>&-4        lelong  >33223
+>>>>>>&-4       lelong  !33367
+>>>>>>>&-4      lelong  !33333          ~30 fps,
+>>>>&4  lelong          <32224          >30 fps,
+##>>>>&4  lelong          x               (%lu)
+##>>>>&20 lelong          x               %lu frames,
+# Note: The tests below assume that the AVI has 1 or 2 streams,
+#       "vids" optionally followed by "auds".
+#       (Should cover 99.9% of all AVIs.)
+# assuming avih length = 56
+>>>88   string  LIST
+>>>>96  string  strlstrh
+>>>>>108        string  vids    video:
+>>>>>>&0        lelong  0               uncompressed
+# skip past vids strh
+>>>>>>(104.l+108)       string  strf
+>>>>>>>(104.l+132)      lelong          1       RLE 8bpp
+>>>>>>>(104.l+132)      string/c        cvid    Cinepak
+>>>>>>>(104.l+132)      string/c        i263    Intel I.263
+>>>>>>>(104.l+132)      string/c        iv32    Indeo 3.2
+>>>>>>>(104.l+132)      string/c        iv41    Indeo 4.1
+>>>>>>>(104.l+132)      string/c        iv50    Indeo 5.0
+>>>>>>>(104.l+132)      string/c        mp42    Microsoft MPEG-4 v2
+>>>>>>>(104.l+132)      string/c        mp43    Microsoft MPEG-4 v3
+>>>>>>>(104.l+132)      string/c        mjpg    Motion JPEG
+>>>>>>>(104.l+132)      string/c        div3    DivX 3
+>>>>>>>>112             string/c        div3    Low-Motion
+>>>>>>>>112             string/c        div4    Fast-Motion
+>>>>>>>(104.l+132)      string/c        divx    DivX 4
+>>>>>>>(104.l+132)      string/c        dx50    DivX 5
+>>>>>>>(104.l+132)      string/c        xvid    XviD
+>>>>>>>(104.l+132)      lelong  0
+##>>>>>>>(104.l+132)      string  x       (%.4s)
+# skip past first (video) LIST
+>>>>(92.l+96)   string  LIST
+>>>>>(92.l+104) string  strlstrh
+>>>>>>(92.l+116)        string          auds    \b, audio:
+# auds strh length = 56:
+>>>>>>>(92.l+172)       string          strf
+>>>>>>>>(92.l+180)      leshort 0x0001  uncompressed PCM
+>>>>>>>>(92.l+180)      leshort 0x0002  ADPCM
+>>>>>>>>(92.l+180)      leshort 0x0055  MPEG-1 Layer 3
+>>>>>>>>(92.l+180)      leshort 0x2000  Dolby AC3
+>>>>>>>>(92.l+180)      leshort 0x0161  DivX
+##>>>>>>>>(92.l+180)      leshort x       (0x%.4x)
+>>>>>>>>(92.l+182)      leshort 1       (mono,
+>>>>>>>>(92.l+182)      leshort 2       (stereo,
+>>>>>>>>(92.l+182)      leshort >2      (%d channels,
+>>>>>>>>(92.l+184)      lelong  x       %d Hz)
+# auds strh length = 64:
+>>>>>>>(92.l+180)       string          strf
+>>>>>>>>(92.l+188)      leshort 0x0001  uncompressed PCM
+>>>>>>>>(92.l+188)      leshort 0x0002  ADPCM
+>>>>>>>>(92.l+188)      leshort 0x0055  MPEG-1 Layer 3
+>>>>>>>>(92.l+188)      leshort 0x2000  Dolby AC3
+>>>>>>>>(92.l+188)      leshort 0x0161  DivX
+##>>>>>>>>(92.l+188)      leshort x       (0x%.4x)
+>>>>>>>>(92.l+190)      leshort 1       (mono,
+>>>>>>>>(92.l+190)      leshort 2       (stereo,
+>>>>>>>>(92.l+190)      leshort >2      (%d channels,
+>>>>>>>>(92.l+192)      lelong  x       %d Hz)
 # Animated Cursor format
 >8     string          ACON            \b, animated cursor
 # SoundFont 2 <mpruett@sgi.com>
 >8     string          sfbk            SoundFont/Bank
+# MPEG-1 wrapped in a RIFF, apparently
+>8      string          CDXA            \b, wrapped MPEG-1 (CDXA)
 
 #
 # XXX - some of the below may only appear in little-endian form.

diff --git a/magic/Magdir/sysex b/magic/Magdir/sysex
index 9a3fe2ec246ad9c95f7e32e726134d61495c21f2..e2a4bd827d2e243d5341316bcf78a66cc3f28c5a 100644 (file)
--- a/magic/Magdir/sysex
+++ b/magic/Magdir/sysex
@@ -4,13 +4,63 @@
 # 
 0      byte                    0xF0            SysEx File -
 
+# North American Group
+>1     byte                    0x01            Sequential
+>1     byte                    0x02            IDP
+>1     byte                    0x03            OctavePlateau
+>1     byte                    0x04            Moog
+>1     byte                    0x05            Passport
+>1     byte                    0x06            Lexicon
+>1     byte                    0x07            Kurzweil
+>1     byte                    0x08            Fender
+>1     byte                    0x09            Gulbransen
+>1     byte                    0x0a            AKG
+>1     byte                    0x0b            Voyce
+>1     byte                    0x0c            Waveframe
+>1     byte                    0x0d            ADA
+>1     byte                    0x0e            Garfield
+>1     byte                    0x0f            Ensoniq
+>1     byte                    0x10            Oberheim
+>1     byte                    0x11            Apple
+>1     byte                    0x12            GreyMatter
+>1     byte                    0x14            PalmTree
+>1     byte                    0x15            JLCooper
+>1     byte                    0x16            Lowrey
+>1     byte                    0x17            AdamsSmith
+>1     byte                    0x18            E-mu
+>1     byte                    0x19            Harmony
+>1     byte                    0x1a            ART
+>1     byte                    0x1b            Baldwin
+>1     byte                    0x1c            Eventide
+>1     byte                    0x1d            Inventronics
+>1     byte                    0x1f            Clarity
+
+# European Group
+>1     byte                    0x21            SIEL
+>1     byte                    0x22            Synthaxe
+>1     byte                    0x24            Hohner
+>1     byte                    0x25            Twister
+>1     byte                    0x26            Solton
+>1     byte                    0x27            Jellinghaus
+>1     byte                    0x28            Southworth
+>1     byte                    0x29            PPG
+>1     byte                    0x2a            JEN
+>1     byte                    0x2b            SSL
+>1     byte                    0x2c            AudioVertrieb
+
 >1     byte                    0x2f            ELKA
 >>3    byte                    0x09            EK-44
 
+>1     byte                    0x30            Dynacord
+>1     byte                    0x33            Clavia
+>1     byte                    0x39            Soundcraft
+
 >1     byte                    0x3e            Waldorf
 >>3    byte                    0x7f            Microwave I
 
+# Japanese Group
 >1     byte                    0x40            Kawai
+>>3    byte                    0x20            K1
 >>3    byte                    0x22            K4
 
 >1     byte                    0x41            Roland
@@ -26,6 +76,7 @@
 >1     byte                    0x46            Kamiya
 >1     byte                    0x47            Akai
 >1     byte                    0x48            Victor
+>1     byte                    0x49            Mesosha
 >1     byte                    0x4b            Fujitsu
 >1     byte                    0x4c            Sony
 >1     byte                    0x4e            Teac