[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdelibs/kio
From:       Allan Sandfeld Jensen <kde () carewolf ! com>
Date:       2004-06-06 23:23:17
Message-ID: 20040606232317.32DD9126ED () office ! kde ! org
[Download RAW message or body]

CVS commit by carewolf: 

Fixing the mpeg-audio detection and adding ISO detection from file 4.07


  M +26 -16    magic   1.77


--- kdelibs/kio/magic  #1.76:1.77
@@ -705,23 +705,26 @@
 0       belong          0x000001ba              video/mpeg
 
-# MPEG 1.0 Layer 3
-0       beshort&0xfff0  0xfff0                  audio/x-mp3
+# MPEG 1.0 audio (layer III,II,I)
+0       beshort&0xff80  0xff80
+>0      beshort&0x0006  0x0002                  audio/x-mp3
+>0      beshort&0x0006  0x0004                  audio/x-mp2
+>0      beshort&0x0006  0x0006                  audio/mpeg
+
+# MPEG 2.0 audio (layer III,II,I)
+0       beshort&0xff80  0xff00
+>0      beshort&0x0006  0x0002                  audio/x-mp3
+>0      beshort&0x0006  0x0004                  audio/x-mp2
+>0      beshort&0x0006  0x0006                  audio/mpeg
+
+# MPEG 2.5 audio (layer III,II,I)
+0       beshort&0xff80  0xf800
+>0      beshort&0x0006  0x0002                  audio/x-mp3
+>0      beshort&0x0006  0x0004                  audio/x-mp2
+>0      beshort&0x0006  0x0006                  audio/mpeg
 
-# MPEG 1.0 Layer 2
-0       beshort&0xfffe  =0xfffc                 audio/x-mp2
-
-# MPEG 2.0
-0       beshort&0xfff8  =0xfff0
-# Layer 3
->1      byte            &0x02                   audio/x-mp3
-# Layer 2
->1      byte            &0x04                   audio/x-mp2
-
-
-#From: Johan Gade <jgade@diku.dk>
-
-# MPEG-4 Advanced Audio Coding (AAC) file (perhaps also MPEG-2 ACC?)
+# MPEG-4 audio
 16      string          M4A                     audio/mp4
 
+
 # FLI animation format
 0       leshort         0xAF11                          video/x-flic
@@ -957,2 +960,9 @@
 1       string          [Program\ Neighborhood  application/x-ica
 
+#------------------------------------------------------------------------------
+# CD image files (ISO is imported from file 4.07)
+32769   string          CD001                   application/x-iso
+32633   string          CD001                   application/x-iso
+
+# CDR-wins bin-with-cue files
+#0      belong          0x00FFFFFF              application/x-cuebin


[prev in list] [next in list] [prev in thread] [next in thread]