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

List:       freedesktop-xdg
Subject:    Re: shared-mime-info 0.14 released
From:       Allan Sandfeld Jensen <kde () carewolf ! com>
Date:       2004-03-31 11:57:39
Message-ID: 200403311357.39914.kde () carewolf ! com
[Download RAW message or body]

On Monday 22 March 2004 05:22, Jonathan Blandford wrote:
> A new release of shared-mime-info is now available:
>
>  

Here is a small patch which updates the multimedia MIME-types to be closer to 
KDE standard.

The following has been changed so far:
 Add and detect Ogg subtypes (vorbis, flac, speex, theora and ogm)
 Add and detect MP2 (magic from file 4.07 is used) 
 Remove detection of ID3v2 taged files (since it is now a general media tag)
 Correct Real* media-types

`Allan

["multimedia.patch" (text/x-diff)]

? multimedia.patch
Index: freedesktop.org.xml.in
===================================================================
RCS file: /cvs/mime/shared-mime-info/freedesktop.org.xml.in,v
retrieving revision 1.14
diff -u -3 -p -r1.14 freedesktop.org.xml.in
--- freedesktop.org.xml.in	23 Mar 2004 14:39:54 -0000	1.14
+++ freedesktop.org.xml.in	31 Mar 2004 11:47:32 -0000
@@ -35,7 +35,7 @@
   	type CDATA #REQUIRED>
 ]>
 
-<!-- 
+<!--
 The freedesktop.org shared MIME database (this file) was created by merging
 several existing MIME databases (all released under the GPL).
 
@@ -198,7 +198,8 @@ command to generate the output files.
     <glob pattern="*.pdb"/>
   </mime-type>
   <mime-type type="application/vnd.rn-realmedia">
-    <_comment>RealAudio/Video document</_comment>
+    <_comment>RealMedia multimedia</_comment>
+    <glob pattern="*.rm"/>
   </mime-type>
   <mime-type type="application/vnd.stardivision.calc">
     <_comment>StarCalc spreadsheet</_comment>
@@ -1067,7 +1068,7 @@ command to generate the output files.
     <glob pattern="*.o"/>
   </mime-type>
   <mime-type type="application/ogg">
-    <_comment>Ogg Vorbis audio</_comment>
+    <_comment>Ogg multimedia</_comment>
     <magic priority="50">
       <match type="string" value="OggS" offset="0"/>
     </magic>
@@ -1388,7 +1389,7 @@ command to generate the output files.
     <glob pattern="*.zip"/>
   </mime-type>
   <mime-type type="audio/ac3">
-    <_comment>Dolby Digital audio</_comment>
+    <_comment>Dolby Digital (AC3) audio</_comment>
     <glob pattern="*.ac3"/>
   </mime-type>
   <mime-type type="audio/basic">
@@ -1408,7 +1409,7 @@ command to generate the output files.
     <glob pattern="*.psid"/>
   </mime-type>
   <mime-type type="audio/vnd.rn-realaudio">
-    <_comment>RealAudio broadcast</_comment>
+    <_comment>RealAudio audio</_comment>
   </mime-type>
   <mime-type type="audio/x-adpcm">
     <_comment>PCM audio</_comment>
@@ -1457,6 +1458,9 @@ command to generate the output files.
   </mime-type>
   <mime-type type="audio/x-flac">
     <_comment>FLAC audio</_comment>
+    <magic priority="70">
+      <match type="string" value="fLaC" offset="0"/>
+    </magic>
     <glob pattern="*.flac"/>
   </mime-type>
   <mime-type type="audio/midi">
@@ -1478,12 +1482,19 @@ command to generate the output files.
     <glob pattern="*.mtm"/>
     <glob pattern="*.669"/>
   </mime-type>
+  <mime-type type="audio/x-mp2">
+    <_comment>MP2 audio</_comment>
+    <magic priority="50">
+      <match type="big16" mask="0xfffe" value="0xfffc" offset="0"/>
+      <match type="big16" mask="0xfffc" value="0xfff4" offset="0"/>
+    </magic>
+    <glob pattern="*.mp2"/>
+  </mime-type>
   <mime-type type="audio/x-mp3">
     <_comment>MP3 audio</_comment>
     <magic priority="50">
-      <match type="big32" value="0xfffb" offset="0"/>
-      <match type="string" value="ID3" offset="0"/>
-      <match type="big16" mask="0xfff0" value="0xfff0" offset="0"/>
+      <match type="big16" mask="0xfffe" value="0xfffa" offset="0"/>
+      <match type="big16" mask="0xfffa" value="0xfff2" offset="0"/>
     </magic>
     <glob pattern="*.mp3"/>
   </mime-type>
@@ -1491,28 +1502,36 @@ command to generate the output files.
     <_comment>MP3 playlist</_comment>
   </mime-type>
   <mime-type type="audio/x-mpeg">
-    <_comment>MP3 audio</_comment>
+    <_comment>MPEG audio</_comment>
   </mime-type>
   <mime-type type="audio/x-mpegurl">
-    <_comment>MP3 audio (streamed)</_comment>
+    <_comment>M3U playlist</_comment>
     <glob pattern="*.m3u"/>
   </mime-type>
   <mime-type type="audio/x-ms-asx">
-    <_comment>Playlist</_comment>
+    <_comment>ASX playlist</_comment>
     <magic priority="50">
       <match type="string" value="ASF " offset="0"/>
       <match type="string" value="&lt;ASX" offset="0"/>
       <match type="string" value="&lt;asx" offset="0"/>
     </magic>
   </mime-type>
+  <mime-type type="audio/x-oggflac">
+    <_comment>Ogg/FLAC audio</_comment>
+    <magic priority="90">
+      <match type="string" value="OggS" offset="0">
+        <match type="string" value="fLaC" offset="28"/>
+      </match>
+    </magic>
+    <!-- <glob pattern="*.ogg"/> -->
+  </mime-type>
   <mime-type type="audio/x-pn-realaudio">
-    <_comment>RealAudio broadcast</_comment>
+    <_comment>RealAudio audio</_comment>
     <magic priority="50">
       <match type="string" value=".ra\375" offset="0"/>
     </magic>
     <glob pattern="*.ra"/>
     <glob pattern="*.ram"/>
-    <glob pattern="*.rm"/>
   </mime-type>
   <mime-type type="audio/x-riff">
     <_comment>RIFF audio</_comment>
@@ -1529,6 +1548,15 @@ command to generate the output files.
     <_comment>MP3 ShoutCast playlist</_comment>
     <glob pattern="*.pls"/>
   </mime-type>
+  <mime-type type="audio/x-speex">
+    <_comment>Speex audio</_comment>
+    <magic priority="90">
+      <match type="string" value="OggS" offset="0">
+        <match type="string" value="Speex  " offset="28"/>
+      </match>
+    </magic>
+    <glob pattern="*.spx"/>
+  </mime-type>
   <mime-type type="audio/x-stm">
     <_comment>Scream Tracker audio</_comment>
     <glob pattern="*.stm"/>
@@ -1537,6 +1565,15 @@ command to generate the output files.
     <_comment>VOC audio</_comment>
     <glob pattern="*.voc"/>
   </mime-type>
+  <mime-type type="audio/x-vorbis">
+    <_comment>Ogg Vorbis audio</_comment>
+    <magic priority="90">
+      <match type="string" value="OggS" offset="0">
+        <match type="string" value="vorbis" offset="29"/>
+      </match>
+    </magic>
+    <!-- <glob pattern="*.ogg"/> -->
+  </mime-type>
   <mime-type type="audio/x-wav">
     <_comment>WAV audio</_comment>
     <magic priority="50">
@@ -2385,8 +2422,19 @@ command to generate the output files.
     <glob pattern="*.nsv"/>
     <glob pattern="*.NSV"/>
   </mime-type>
+  <mime-type type="video/x-ogm">
+    <_comment>Ogg/OGM video</_comment>
+    <magic priority="90">
+      <match type="string" value="OggS" offset="0">
+        <match type="string" value="video" offset="29"/>
+      </match>
+    </magic>
+    <glob pattern="*.ogm"/>
+    <!-- <glob pattern="*.ogg"/>  -->
+  </mime-type>
   <mime-type type="video/x-real-video">
     <_comment>RealVideo video</_comment>
+    <glob pattern="*.rv"/>
   </mime-type>
   <mime-type type="video/x-sgi-movie">
     <_comment>SGI video</_comment>
@@ -2395,4 +2443,13 @@ command to generate the output files.
     </magic>
     <glob pattern="*.movie"/>
   </mime-type>
+  <mime-type type="video/x-theora">
+    <_comment>Theora video</_comment>
+    <magic priority="90">
+      <match type="string" value="OggS" offset="0">
+        <match type="string" value="theora" offset="29"/>
+      </match>
+    </magic>
+    <!-- <glob pattern="*.ogg"/>  -->
+  </mime-type>
 </mime-info>


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

Configure | About | News | Add a list | Sponsored by KoreLogic