svn commit: r1655063 - in /tika/trunk: CHANGES.txt tika-parsers/src/main/java/org/apache/tika/parser/mp4/MP4Parser.java tika-parsers/src/test/java/org/apache/tika/parser/mp4/MP4ParserTest.java

[mattmann]

Author: mattmann
Date: Tue Jan 27 15:11:55 2015
New Revision: 1655063

URL: http://svn.apache.org/r1655063
Log:
fix for TIKA-1530: Include parsed mp4 duration in metadata contributed by Oskar 
Wickström <oskar.wickst...@live.com> This closes #25.

Modified:
    tika/trunk/CHANGES.txt
    
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/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/tika/trunk/CHANGES.txt?rev=1655063&r1=1655062&r2=1655063&view=diff
==============================================================================
--- tika/trunk/CHANGES.txt (original)
+++ tika/trunk/CHANGES.txt Tue Jan 27 15:11:55 2015
@@ -1,5 +1,7 @@
 Release 1.8 - Current Development
 
+  * Include media duration in metadata parsed by MP4Parser (TIKA-1530).
+
   * Support password protected 7zip files (using a PasswordProvider,
     in keeping with the other password supporting formats) (TIKA-1521)
 

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=1655063&r1=1655062&r2=1655063&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 
Tue Jan 27 15:11:55 2015
@@ -164,6 +164,7 @@ public class MP4Parser extends AbstractP
 
                // Get the duration
                double durationSeconds = ((double)mHeader.getDuration()) / 
mHeader.getTimescale();
+               metadata.set(XMPDM.DURATION, durationSeconds);
                // TODO Use this
 
                // The timescale is normally the sampling rate

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=1655063&r1=1655062&r2=1655063&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
 Tue Jan 27 15:11:55 2015
@@ -90,6 +90,8 @@ public class MP4ParserTest {
         assertEquals("44100", metadata.get(XMPDM.AUDIO_SAMPLE_RATE));
         assertEquals("Stereo", metadata.get(XMPDM.AUDIO_CHANNEL_TYPE));
         assertEquals("M4A", metadata.get(XMPDM.AUDIO_COMPRESSOR));
+        // Only compare two decimals to avoid floating point comparison error.
+        assertEquals("0.06", metadata.get(XMPDM.DURATION).substring(0, 4));
         
         assertEquals("iTunes 10.5.3.3", metadata.get(XMP.CREATOR_TOOL));