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 2017/12/23 14:14:04 UTC

[tika] branch master updated (700b38a -> cadbc40)

This is an automated email from the ASF dual-hosted git repository.

nick pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tika.git.


    from 700b38a  TIKA-1141 Few more well-known JS library headers
     new 1bddca4  Test AC3 and EAC3 files, produced by ffmpeg from testWAV.wav
     new 10cd205  Mime magic for AC3 and EAC3 files
     new 9820037  Changelog update
     new cadbc40  AC3 magic detection tests

The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 CHANGES.txt                                        |   2 +
 .../org/apache/tika/mime/tika-mimetypes.xml        |  42 ++++++++++++++++++++-
 .../java/org/apache/tika/mime/TestMimeTypes.java   |  11 ++++++
 .../src/test/resources/test-documents/testAC3.ac3  | Bin 0 -> 768 bytes
 .../src/test/resources/test-documents/testEAC3.ac3 | Bin 0 -> 768 bytes
 5 files changed, 53 insertions(+), 2 deletions(-)
 create mode 100644 tika-parsers/src/test/resources/test-documents/testAC3.ac3
 create mode 100644 tika-parsers/src/test/resources/test-documents/testEAC3.ac3

-- 
To stop receiving notification emails like this one, please contact
['"commits@tika.apache.org" <co...@tika.apache.org>'].

[tika] 04/04: AC3 magic detection tests

Posted by ni...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

nick pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tika.git

commit cadbc405519e5adbada1ddb6d2d4beff1f953072
Author: Nick Burch <ni...@gagravarr.org>
AuthorDate: Sat Dec 23 14:13:48 2017 +0000

    AC3 magic detection tests
---
 .../src/test/java/org/apache/tika/mime/TestMimeTypes.java     | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/tika-parsers/src/test/java/org/apache/tika/mime/TestMimeTypes.java b/tika-parsers/src/test/java/org/apache/tika/mime/TestMimeTypes.java
index e423fdd..1974b5f 100644
--- a/tika-parsers/src/test/java/org/apache/tika/mime/TestMimeTypes.java
+++ b/tika-parsers/src/test/java/org/apache/tika/mime/TestMimeTypes.java
@@ -1149,6 +1149,17 @@ public class TestMimeTypes {
     }
 
     @Test
+    public void testDolbyDigitalAC3() throws Exception {
+        // By name, both come as AC3, as same extension
+        assertTypeByName("audio/ac3", "testAC3.ac3");
+        assertTypeByName("audio/ac3", "testEAC3.ac3");
+
+        // With data can detect EAC3 subtype
+        assertTypeByData("audio/ac3", "testAC3.ac3");
+        assertTypeByData("audio/eac3", "testEAC3.ac3");
+    }
+
+    @Test
     public void testNLS() throws Exception {
         assertTypeByData("application/x-ms-nls", "testNLS1.nls");
         assertTypeByData("application/x-ms-nls", "testNLS2.nls");

-- 
To stop receiving notification emails like this one, please contact
"commits@tika.apache.org" <co...@tika.apache.org>.

[tika] 01/04: Test AC3 and EAC3 files, produced by ffmpeg from testWAV.wav

Posted by ni...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

nick pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tika.git

commit 1bddca4c382c40dc12a4f3ad674ecec08f9a4347
Author: Nick Burch <ni...@gagravarr.org>
AuthorDate: Sat Dec 23 14:05:26 2017 +0000

    Test AC3 and EAC3 files, produced by ffmpeg from testWAV.wav
---
 .../src/test/resources/test-documents/testAC3.ac3         | Bin 0 -> 768 bytes
 .../src/test/resources/test-documents/testEAC3.ac3        | Bin 0 -> 768 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/tika-parsers/src/test/resources/test-documents/testAC3.ac3 b/tika-parsers/src/test/resources/test-documents/testAC3.ac3
new file mode 100644
index 0000000..224a3a5
Binary files /dev/null and b/tika-parsers/src/test/resources/test-documents/testAC3.ac3 differ
diff --git a/tika-parsers/src/test/resources/test-documents/testEAC3.ac3 b/tika-parsers/src/test/resources/test-documents/testEAC3.ac3
new file mode 100644
index 0000000..afc1975
Binary files /dev/null and b/tika-parsers/src/test/resources/test-documents/testEAC3.ac3 differ

-- 
To stop receiving notification emails like this one, please contact
"commits@tika.apache.org" <co...@tika.apache.org>.

[tika] 03/04: Changelog update

Posted by ni...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

nick pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tika.git

commit 982003761bdadfc1dcf32b105800d59e5b622c83
Author: Nick Burch <ni...@gagravarr.org>
AuthorDate: Sat Dec 23 14:11:18 2017 +0000

    Changelog update
---
 CHANGES.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 6f76fb4..6645a9f 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,8 @@ Release 2.0.0 - ???
 
    * Add a parser for XPS (TIKA-2524).
 
+   * Mime magic for Dolby Digital AC3 and EAC3 files
+
 Release 1.17 - 12/8/2017
 
   ***NOTE: THIS IS THE LAST VERSION OF TIKA THAT WILL RUN

-- 
To stop receiving notification emails like this one, please contact
"commits@tika.apache.org" <co...@tika.apache.org>.

[tika] 02/04: Mime magic for AC3 and EAC3 files

Posted by ni...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

nick pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tika.git

commit 10cd2055b43c6983aa4e7d95da53680355f39bac
Author: Nick Burch <ni...@gagravarr.org>
AuthorDate: Sat Dec 23 14:05:46 2017 +0000

    Mime magic for AC3 and EAC3 files
---
 .../org/apache/tika/mime/tika-mimetypes.xml        | 42 ++++++++++++++++++++--
 1 file changed, 40 insertions(+), 2 deletions(-)

diff --git a/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml b/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml
index 4bbaff1..98c77ee 100644
--- a/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml
+++ b/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml
@@ -4457,7 +4457,46 @@
   <mime-type type="audio/32kadpcm"/>
   <mime-type type="audio/3gpp"/>
   <mime-type type="audio/3gpp2"/>
-  <mime-type type="audio/ac3"/>
+
+  <mime-type type="audio/ac3">
+    <acronym>AC3</acronym>
+    <_comment>Dolby Digital Audio Compression File</_comment>
+    <magic priority="40">
+      <!-- AC3 Syncword -->
+      <match value="0x0b77" type="string" offset="0"/>
+    </magic>
+    <magic priority="50">
+      <match value="0x0b77" type="string" offset="0">
+         <!-- BSID 0-8 = AC3, BSID=byte5>>3 -->
+         <match value="0x00" type="string" mask="0xF8" offset="5"/>
+         <match value="0x08" type="string" mask="0xF8" offset="5"/>
+         <match value="0x10" type="string" mask="0xF8" offset="5"/>
+         <match value="0x18" type="string" mask="0xF8" offset="5"/>
+         <match value="0x20" type="string" mask="0xF8" offset="5"/>
+         <match value="0x28" type="string" mask="0xF8" offset="5"/>
+         <match value="0x30" type="string" mask="0xF8" offset="5"/>
+         <match value="0x38" type="string" mask="0xF8" offset="5"/>
+         <match value="0x40" type="string" mask="0xF8" offset="5"/>
+      </match>
+    </magic>
+    <glob pattern="*.ac3"/>
+  </mime-type>
+  <mime-type type="audio/eac3">
+    <acronym>EAC3</acronym>
+    <magic priority="50">
+      <match value="0x0b77" type="string" offset="0">
+         <!-- BSID 11-16 = EAC3, BSID=byte5>>3 -->
+         <match value="0x58" type="string" mask="0xF8" offset="5"/>
+         <match value="0x60" type="string" mask="0xF8" offset="5"/>
+         <match value="0x68" type="string" mask="0xF8" offset="5"/>
+         <match value="0x70" type="string" mask="0xF8" offset="5"/>
+         <match value="0x78" type="string" mask="0xF8" offset="5"/>
+         <match value="0x80" type="string" mask="0xF8" offset="5"/>
+      </match>
+    </magic>
+    <sub-class-of type="audio/ac3" />
+  </mime-type>
+
   <mime-type type="audio/adpcm">
     <glob pattern="*.adp"/>
   </mime-type>
@@ -4513,7 +4552,6 @@
   <mime-type type="audio/dsr-es202211"/>
   <mime-type type="audio/dsr-es202212"/>
   <mime-type type="audio/dvi4"/>
-  <mime-type type="audio/eac3"/>
   <mime-type type="audio/evrc"/>
   <mime-type type="audio/evrc-qcp"/>
   <mime-type type="audio/evrc0"/>

-- 
To stop receiving notification emails like this one, please contact
"commits@tika.apache.org" <co...@tika.apache.org>.