You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by ta...@apache.org on 2020/06/16 16:55:37 UTC

[tika] branch branch_1x updated: TIKA-2888 Add wmv2 codec detection for WMV files (#272)

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

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


The following commit(s) were added to refs/heads/branch_1x by this push:
     new af7adbe  TIKA-2888 Add wmv2 codec detection for WMV files (#272)
af7adbe is described below

commit af7adbe1ca2366a8e6a9d69be45a971cbd35e43a
Author: David Avendasora <gi...@avendasora.com>
AuthorDate: Tue Jun 16 12:55:26 2020 -0400

    TIKA-2888 Add wmv2 codec detection for WMV files (#272)
    
    Signed-off-by: David Avendasora <da...@ncmec.org>
    
    Co-authored-by: David Avendasora <da...@ncmec.org>
---
 .../resources/org/apache/tika/mime/tika-mimetypes.xml  |   1 +
 .../test/java/org/apache/tika/mime/TestMimeTypes.java  |   1 +
 .../src/test/resources/test-documents/testWMV_WMV2.wmv | Bin 0 -> 554297 bytes
 3 files changed, 2 insertions(+)

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 f16ae5a..869757d 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
@@ -7257,6 +7257,7 @@
     <magic priority="60">
        <match value="Windows Media Video" type="unicodeLE" offset="0:8192" />
        <match value="VC-1 Advanced Profile" type="unicodeLE" offset="0:8192" />
+       <match value="wmv2" type="unicodeLE" offset="0:8192" />
     </magic>
   </mime-type>
   <mime-type type="video/x-ms-wmx">
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 2d641b6..058410a 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
@@ -729,6 +729,7 @@ public class TestMimeTypes {
        
        assertTypeByData("video/x-ms-asf", "testASF.asf");
        assertTypeByData("video/x-ms-wmv", "testWMV.wmv");
+       assertTypeByData("video/x-ms-wmv", "testWMV_WMV2.wmv");
        assertTypeByData("audio/x-ms-wma", "testWMA.wma");
     }
     
diff --git a/tika-parsers/src/test/resources/test-documents/testWMV_WMV2.wmv b/tika-parsers/src/test/resources/test-documents/testWMV_WMV2.wmv
new file mode 100644
index 0000000..b007f4c
Binary files /dev/null and b/tika-parsers/src/test/resources/test-documents/testWMV_WMV2.wmv differ