Don't try and read a trackEncryptionBox unless we actually have a saiz atom to parse.

Issue: #35
2014-09-08 11:17:21 +01:00 · 2014-09-08 11:17:21 +01:00 · 92e3208121
commit 92e3208121
parent 14048b013a
1 changed files with 2 additions and 2 deletions
--- a/library/src/main/java/com/google/android/exoplayer/parser/mp4/FragmentedMp4Extractor.java
+++ b/library/src/main/java/com/google/android/exoplayer/parser/mp4/FragmentedMp4Extractor.java
@ -781,10 +781,10 @@ public final class FragmentedMp4Extractor {
    LeafAtom trun = traf.getLeafAtomOfType(Atom.TYPE_trun);
    parseTrun(track, fragmentHeader, decodeTime, workaroundFlags, trun.data, out);

-    TrackEncryptionBox trackEncryptionBox =
-        track.sampleDescriptionEncryptionBoxes[fragmentHeader.sampleDescriptionIndex];
    LeafAtom saiz = traf.getLeafAtomOfType(Atom.TYPE_saiz);
    if (saiz != null) {
+      TrackEncryptionBox trackEncryptionBox =
+          track.sampleDescriptionEncryptionBoxes[fragmentHeader.sampleDescriptionIndex];
      parseSaiz(trackEncryptionBox, saiz.data, out);
    }