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/07/30 13:39:14 UTC
svn commit: r1614620 - in /tika/trunk/tika-parsers/src:
main/java/org/apache/tika/parser/mp4/MP4Parser.java
test/java/org/apache/tika/parser/mp4/MP4ParserTest.java
Author: nick
Date: Wed Jul 30 11:39:14 2014
New Revision: 1614620
URL: http://svn.apache.org/r1614620
Log:
Include the tool used to create the MP4 in the XMP output, fixes a TODO spotted while working on TIKA-1377
Modified:
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/mp4/MP4Parser.java
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/mp4/MP4ParserTest.java
Modified: tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/mp4/MP4Parser.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/mp4/MP4Parser.java?rev=1614620&r1=1614619&r2=1614620&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/mp4/MP4Parser.java (original)
+++ tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/mp4/MP4Parser.java Wed Jul 30 11:39:14 2014
@@ -31,6 +31,7 @@ import org.apache.tika.io.TikaInputStrea
import org.apache.tika.metadata.Metadata;
import org.apache.tika.metadata.Property;
import org.apache.tika.metadata.TikaCoreProperties;
+import org.apache.tika.metadata.XMP;
import org.apache.tika.metadata.XMPDM;
import org.apache.tika.mime.MediaType;
import org.apache.tika.parser.AbstractParser;
@@ -267,7 +268,9 @@ public class MP4Parser extends AbstractP
// Encoder
AppleEncoderBox encoder = getOrNull(apple, AppleEncoderBox.class);
- // addMetadata(XMPDM.???, metadata, encoder); // TODO
+ if (encoder != null) {
+ metadata.set(XMP.CREATOR_TOOL, encoder.getValue());
+ }
// As text
Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/mp4/MP4ParserTest.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/mp4/MP4ParserTest.java?rev=1614620&r1=1614619&r2=1614620&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/mp4/MP4ParserTest.java (original)
+++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/mp4/MP4ParserTest.java Wed Jul 30 11:39:14 2014
@@ -24,6 +24,7 @@ import java.io.InputStream;
import org.apache.tika.io.TikaInputStream;
import org.apache.tika.metadata.Metadata;
import org.apache.tika.metadata.TikaCoreProperties;
+import org.apache.tika.metadata.XMP;
import org.apache.tika.metadata.XMPDM;
import org.apache.tika.parser.AutoDetectParser;
import org.apache.tika.parser.ParseContext;
@@ -90,6 +91,8 @@ public class MP4ParserTest {
//assertEquals("Stereo", metadata.get(XMPDM.AUDIO_CHANNEL_TYPE)); // TODO Extract
assertEquals("M4A", metadata.get(XMPDM.AUDIO_COMPRESSOR));
+ assertEquals("iTunes 10.5.3.3", metadata.get(XMP.CREATOR_TOOL));
+
// Check again by file, rather than stream
TikaInputStream tstream = TikaInputStream.get(