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 2012/01/28 22:02:04 UTC
svn commit: r1237164 -
/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/mp4/MP4Parser.java
Author: nick
Date: Sat Jan 28 21:02:04 2012
New Revision: 1237164
URL: http://svn.apache.org/viewvc?rev=1237164&view=rev
Log:
TIKA-852 MP4 files can be very large, so avoid trying to buffer them in memory
Modified:
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/mp4/MP4Parser.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=1237164&r1=1237163&r2=1237164&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 Sat Jan 28 21:02:04 2012
@@ -27,7 +27,6 @@ import java.util.Map;
import java.util.Set;
import org.apache.tika.exception.TikaException;
-import org.apache.tika.io.IOUtils;
import org.apache.tika.io.TikaInputStream;
import org.apache.tika.metadata.Metadata;
import org.apache.tika.metadata.Property;
@@ -106,16 +105,12 @@ public class MP4Parser extends AbstractP
InputStream stream, ContentHandler handler,
Metadata metadata, ParseContext context)
throws IOException, SAXException, TikaException {
- IsoBufferWrapper isoBufferWrapper = null;
- TikaInputStream tstream = TikaInputStream.cast(stream);
-
- // Have MP4Parser process the stream / file
- if (tstream != null && tstream.hasFile()) {
- isoBufferWrapper = new IsoBufferWrapperImpl(tstream.getFile());
- } else {
- isoBufferWrapper = new IsoBufferWrapperImpl(
- IOUtils.toByteArray(stream));
- }
+ // The MP4Parser library accepts either a File, or a byte array
+ // As MP4 video files are typically large, always use a file to
+ // avoid OOMs that may occur with in-memory buffering
+ TikaInputStream tstream = TikaInputStream.get(stream);
+ IsoBufferWrapper isoBufferWrapper =
+ new IsoBufferWrapperImpl(tstream.getFile());
IsoFile isoFile = new IsoFile(isoBufferWrapper);
isoFile.parse();