You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by ni...@apache.org on 2014/03/13 10:18:29 UTC
svn commit: r1577072 - in /tika/trunk/tika-core/src:
main/resources/org/apache/tika/mime/tika-mimetypes.xml
test/java/org/apache/tika/TikaDetectionTest.java
Author: nick
Date: Thu Mar 13 09:18:28 2014
New Revision: 1577072
URL: http://svn.apache.org/r1577072
Log:
TIKA-1259 Dedicated mimetype entry for Ogg Speex
Modified:
tika/trunk/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml
tika/trunk/tika-core/src/test/java/org/apache/tika/TikaDetectionTest.java
Modified: tika/trunk/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml
URL: http://svn.apache.org/viewvc/tika/trunk/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml?rev=1577072&r1=1577071&r2=1577072&view=diff
==============================================================================
--- tika/trunk/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml (original)
+++ tika/trunk/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml Thu Mar 13 09:18:28 2014
@@ -3632,7 +3632,6 @@
</magic>
<glob pattern="*.oga"/>
<glob pattern="*.ogg"/>
- <glob pattern="*.spx"/>
<sub-class-of type="application/ogg"/>
</mime-type>
@@ -3648,6 +3647,19 @@
<sub-class-of type="application/ogg"/>
</mime-type>
+ <mime-type type="audio/speex">
+ <_comment>Ogg Speex Codec Compressed WAV File</_comment>
+ <alias type="application/x-speex"/>
+ <magic priority="60">
+ <!-- For a single stream file -->
+ <match value="OggS\000.......................Speex " type="string"
+ mask="0xFFFFFFFF00000000000000000000000000000000000000000000000000FFFFFFFFFFFFFF"
+ offset="0"/>
+ </magic>
+ <glob pattern="*.spx"/>
+ <sub-class-of type="application/ogg"/>
+ </mime-type>
+
<mime-type type="audio/parityfec"/>
<mime-type type="audio/pcma"/>
<mime-type type="audio/pcma-wb"/>
Modified: tika/trunk/tika-core/src/test/java/org/apache/tika/TikaDetectionTest.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-core/src/test/java/org/apache/tika/TikaDetectionTest.java?rev=1577072&r1=1577071&r2=1577072&view=diff
==============================================================================
--- tika/trunk/tika-core/src/test/java/org/apache/tika/TikaDetectionTest.java (original)
+++ tika/trunk/tika-core/src/test/java/org/apache/tika/TikaDetectionTest.java Thu Mar 13 09:18:28 2014
@@ -652,7 +652,8 @@ public class TikaDetectionTest {
assertEquals("audio/mpeg", tika.detect("x.m3a"));
assertEquals("audio/ogg", tika.detect("x.oga"));
assertEquals("audio/ogg", tika.detect("x.ogg"));
- assertEquals("audio/ogg", tika.detect("x.spx"));
+ // Differ from httpd - Speex more commonly uses its own mimetype
+ //assertEquals("audio/ogg", tika.detect("x.spx"));
assertEquals("audio/vnd.digital-winds", tika.detect("x.eol"));
assertEquals("audio/vnd.dts", tika.detect("x.dts"));
assertEquals("audio/vnd.dts.hd", tika.detect("x.dtshd"));