Simplify parsing of encryption data + support SENC boxes.

Issue: #4

library/src/main/java/com/google/android/exoplayer/parser/mp4/Atom.java

@@ -54,6 +54,7 @@ import java.util.List;
   public static final int TYPE_frma = 0x66726D61;
   public static final int TYPE_saiz = 0x7361697A;
   public static final int TYPE_uuid = 0x75756964;
+  public static final int TYPE_senc = 0x73656E63;
 
   public final int type;
 

library/src/main/java/com/google/android/exoplayer/parser/mp4/FragmentedMp4Extractor.java

@@ -93,7 +93,7 @@ public final class FragmentedMp4Extractor {
   // Parser states
   private static final int STATE_READING_ATOM_HEADER = 0;
   private static final int STATE_READING_ATOM_PAYLOAD = 1;
-  private static final int STATE_READING_CENC_AUXILIARY_DATA = 2;
+  private static final int STATE_READING_ENCRYPTION_DATA = 2;
   private static final int STATE_READING_SAMPLE = 3;
 
   // Atom data offsets
@@ -130,6 +130,7 @@ public final class FragmentedMp4Extractor {
     parsedAtoms.add(Atom.TYPE_pssh);
     parsedAtoms.add(Atom.TYPE_saiz);
     parsedAtoms.add(Atom.TYPE_uuid);
+    parsedAtoms.add(Atom.TYPE_senc);
     PARSED_ATOMS = Collections.unmodifiableSet(parsedAtoms);
   }
 
@@ -162,8 +163,6 @@ public final class FragmentedMp4Extractor {
   private int atomType;
   private int atomSize;
   private ParsableByteArray atomData;
-  private ParsableByteArray cencAuxiliaryData;
-  private int cencAuxiliaryBytesRead;
 
   private int pendingSeekTimeMs;
   private int sampleIndex;
@@ -273,8 +272,8 @@ public final class FragmentedMp4Extractor {
           case STATE_READING_ATOM_PAYLOAD:
             results |= readAtomPayload(inputStream);
             break;
-          case STATE_READING_CENC_AUXILIARY_DATA:
+          case STATE_READING_ENCRYPTION_DATA:
-            results |= readCencAuxiliaryData(inputStream);
+            results |= readEncryptionData(inputStream);
             break;
           default:
               results |= readOrSkipSample(inputStream, out);
@@ -330,9 +329,6 @@ public final class FragmentedMp4Extractor {
           rootAtomBytesRead = 0;
         }
         break;
-      case STATE_READING_CENC_AUXILIARY_DATA:
-        cencAuxiliaryBytesRead = 0;
-        break;
     }
     parserState = state;
   }
@@ -354,12 +350,9 @@ public final class FragmentedMp4Extractor {
     atomType = atomHeader.readInt();
 
     if (atomType == Atom.TYPE_mdat) {
-      int cencAuxSize = fragmentRun.auxiliarySampleInfoTotalSize;
+      if (fragmentRun.sampleEncryptionDataNeedsFill) {
-      if (cencAuxSize > 0) {
+        enterState(STATE_READING_ENCRYPTION_DATA);
-        cencAuxiliaryData = new ParsableByteArray(cencAuxSize);
-        enterState(STATE_READING_CENC_AUXILIARY_DATA);
       } else {
-        cencAuxiliaryData = null;
         enterState(STATE_READING_SAMPLE);
       }
       return 0;
@@ -631,7 +624,7 @@ public final class FragmentedMp4Extractor {
       if (childAtomType == Atom.TYPE_esds) {
         initializationData = parseEsdsFromParent(parent, childStartPosition);
         // TODO: Do we really need to do this? See [redacted]
-        // Update sampleRate and sampleRate from the AudioSpecificConfig initialization data.
+        // Update sampleRate and channelCount from the AudioSpecificConfig initialization data.
         Pair<Integer, Integer> audioSpecificConfig =
             CodecSpecificDataUtil.parseAudioSpecificConfig(initializationData);
         sampleRate = audioSpecificConfig.first;
@@ -789,26 +782,38 @@ public final class FragmentedMp4Extractor {
    */
   private static void parseTraf(Track track, DefaultSampleValues extendsDefaults,
       ContainerAtom traf, TrackFragment out, int workaroundFlags) {
-    LeafAtom saiz = traf.getLeafAtomOfType(Atom.TYPE_saiz);
-    if (saiz != null) {
-      parseSaiz(saiz.getData(), out);
-    }
     LeafAtom tfdtAtom = traf.getLeafAtomOfType(Atom.TYPE_tfdt);
     long decodeTime = tfdtAtom == null ? 0
         : parseTfdt(traf.getLeafAtomOfType(Atom.TYPE_tfdt).getData());
+
     LeafAtom tfhd = traf.getLeafAtomOfType(Atom.TYPE_tfhd);
     DefaultSampleValues fragmentHeader = parseTfhd(extendsDefaults, tfhd.getData());
     out.setSampleDescriptionIndex(fragmentHeader.sampleDescriptionIndex);
 
     LeafAtom trun = traf.getLeafAtomOfType(Atom.TYPE_trun);
     parseTrun(track, fragmentHeader, decodeTime, workaroundFlags, trun.getData(), out);
+
+    TrackEncryptionBox trackEncryptionBox =
+        track.sampleDescriptionEncryptionBoxes[fragmentHeader.sampleDescriptionIndex];
+    LeafAtom saiz = traf.getLeafAtomOfType(Atom.TYPE_saiz);
+    if (saiz != null) {
+      parseSaiz(trackEncryptionBox, saiz.getData(), out);
+    }
+
+    LeafAtom senc = traf.getLeafAtomOfType(Atom.TYPE_senc);
+    if (senc != null) {
+      parseSenc(senc.getData(), out);
+    }
+
     LeafAtom uuid = traf.getLeafAtomOfType(Atom.TYPE_uuid);
     if (uuid != null) {
       parseUuid(uuid.getData(), out);
     }
   }
 
-  private static void parseSaiz(ParsableByteArray saiz, TrackFragment out) {
+  private static void parseSaiz(TrackEncryptionBox encryptionBox, ParsableByteArray saiz,
+      TrackFragment out) {
+    int vectorSize = encryptionBox.initializationVectorSize;
     saiz.setPosition(ATOM_HEADER_SIZE);
     int fullAtom = saiz.readInt();
     int flags = parseFullAtomFlags(fullAtom);
@@ -818,19 +823,20 @@ public final class FragmentedMp4Extractor {
     int defaultSampleInfoSize = saiz.readUnsignedByte();
     int sampleCount = saiz.readUnsignedIntToInt();
     int totalSize = 0;
-    int[] sampleInfoSizes = new int[sampleCount];
+    boolean[] sampleHasSubsampleEncryptionTable = new boolean[sampleCount];
     if (defaultSampleInfoSize == 0) {
       for (int i = 0; i < sampleCount; i++) {
-        sampleInfoSizes[i] = saiz.readUnsignedByte();
+        int sampleInfoSize = saiz.readUnsignedByte();
-        totalSize += sampleInfoSizes[i];
+        totalSize += sampleInfoSize;
+        sampleHasSubsampleEncryptionTable[i] = sampleInfoSize > vectorSize;
       }
     } else {
-      for (int i = 0; i < sampleCount; i++) {
+      boolean subsampleEncryption = defaultSampleInfoSize > vectorSize;
-        sampleInfoSizes[i] = defaultSampleInfoSize;
+      totalSize += defaultSampleInfoSize * sampleCount;
-        totalSize += defaultSampleInfoSize;
+      Arrays.fill(sampleHasSubsampleEncryptionTable, subsampleEncryption);
     }
-    }
+    out.setSampleEncryptionData(sampleHasSubsampleEncryptionTable,
-    out.setAuxiliarySampleInfoTables(totalSize, sampleInfoSizes);
+        new ParsableByteArray(totalSize), true);
   }
 
   /**
@@ -942,13 +948,8 @@ public final class FragmentedMp4Extractor {
       }
       sampleDecodingTimeTable[i] = (int) ((cumulativeTime * 1000) / timescale);
       sampleSizeTable[i] = sampleSize;
-      boolean isSync = ((sampleFlags >> 16) & 0x1) == 0;
+      sampleIsSyncFrameTable[i] = ((sampleFlags >> 16) & 0x1) == 0
-      if (workaroundEveryVideoFrameIsSyncFrame && i != 0) {
+          && (!workaroundEveryVideoFrameIsSyncFrame || i == 0);
-        isSync = false;
-      }
-      if (isSync) {
-        sampleIsSyncFrameTable[i] = true;
-      }
       cumulativeTime += sampleDuration;
     }
 
@@ -966,9 +967,19 @@ public final class FragmentedMp4Extractor {
       return;
     }
 
-    // See "Portable encoding of audio-video objects: The Protected Interoperable File Format
+    // Except for the extended type, this box is identical to a SENC box. See "Portable encoding of
-    // (PIFF), John A. Bocharov et al, Section 5.3.2.1."
+    // audio-video objects: The Protected Interoperable File Format (PIFF), John A. Bocharov et al,
-    int fullAtom = uuid.readInt();
+    // Section 5.3.2.1."
+    parseSenc(uuid, 16, out);
+  }
+
+  private static void parseSenc(ParsableByteArray senc, TrackFragment out) {
+    parseSenc(senc, 0, out);
+  }
+
+  private static void parseSenc(ParsableByteArray senc, int offset, TrackFragment out) {
+    senc.setPosition(ATOM_HEADER_SIZE + offset);
+    int fullAtom = senc.readInt();
     int flags = parseFullAtomFlags(fullAtom);
 
     if ((flags & 0x01 /* override_track_encryption_box_parameters */) != 0) {
@@ -977,15 +988,19 @@ public final class FragmentedMp4Extractor {
     }
 
     boolean subsampleEncryption = (flags & 0x02 /* use_subsample_encryption */) != 0;
-    int numberOfEntries = uuid.readUnsignedIntToInt();
+    int sampleCount = senc.readUnsignedIntToInt();
-    if (numberOfEntries != out.length) {
+    if (sampleCount != out.length) {
-      throw new IllegalStateException("Length mismatch: " + numberOfEntries + ", " + out.length);
+      throw new IllegalStateException("Length mismatch: " + sampleCount + ", " + out.length);
     }
 
-    int sampleEncryptionDataLength = uuid.length() - uuid.getPosition();
+    boolean[] sampleHasSubsampleEncryptionTable = new boolean[sampleCount];
+    Arrays.fill(sampleHasSubsampleEncryptionTable, subsampleEncryption);
+
+    int sampleEncryptionDataLength = senc.length() - senc.getPosition();
     ParsableByteArray sampleEncryptionData = new ParsableByteArray(sampleEncryptionDataLength);
-    uuid.readBytes(sampleEncryptionData.getData(), 0, sampleEncryptionData.length());
+    senc.readBytes(sampleEncryptionData.getData(), 0, sampleEncryptionDataLength);
-    out.setSmoothStreamingSampleEncryptionData(sampleEncryptionData, subsampleEncryption);
+
+    out.setSampleEncryptionData(sampleHasSubsampleEncryptionTable, sampleEncryptionData, false);
   }
 
   /**
@@ -1044,17 +1059,14 @@ public final class FragmentedMp4Extractor {
     return new SegmentIndex(atom.length(), sizes, offsets, durationsUs, timesUs);
   }
 
-  private int readCencAuxiliaryData(NonBlockingInputStream inputStream) {
+  private int readEncryptionData(NonBlockingInputStream inputStream) {
-    int length = cencAuxiliaryData.length();
+    ParsableByteArray sampleEncryptionData = fragmentRun.sampleEncryptionData;
-    int bytesRead = inputStream.read(cencAuxiliaryData.getData(), cencAuxiliaryBytesRead,
+    int sampleEncryptionDataLength = sampleEncryptionData.length();
-        length - cencAuxiliaryBytesRead);
+    if (inputStream.getAvailableByteCount() < sampleEncryptionDataLength) {
-    if (bytesRead == -1) {
-      return RESULT_END_OF_STREAM;
-    }
-    cencAuxiliaryBytesRead += bytesRead;
-    if (cencAuxiliaryBytesRead < length) {
       return RESULT_NEED_MORE_DATA;
     }
+    inputStream.read(sampleEncryptionData.getData(), 0, sampleEncryptionDataLength);
+    fragmentRun.sampleEncryptionDataNeedsFill = false;
     enterState(STATE_READING_SAMPLE);
     return 0;
   }
@@ -1093,15 +1105,12 @@ public final class FragmentedMp4Extractor {
   }
 
   private int skipSample(NonBlockingInputStream inputStream, int sampleSize) {
-    ParsableByteArray sampleEncryptionData = cencAuxiliaryData != null ? cencAuxiliaryData
+    ParsableByteArray sampleEncryptionData = fragmentRun.sampleEncryptionData;
-        : fragmentRun.smoothStreamingSampleEncryptionData;
     if (sampleEncryptionData != null) {
       TrackEncryptionBox encryptionBox =
           track.sampleDescriptionEncryptionBoxes[fragmentRun.sampleDescriptionIndex];
       int vectorSize = encryptionBox.initializationVectorSize;
-      boolean subsampleEncryption = cencAuxiliaryData != null
+      boolean subsampleEncryption = fragmentRun.sampleHasSubsampleEncryptionTable[sampleIndex];
-          ? fragmentRun.auxiliarySampleInfoSizeTable[sampleIndex] > vectorSize
-              : fragmentRun.smoothStreamingUsesSubsampleEncryption;
       sampleEncryptionData.skip(vectorSize);
       int subsampleCount = subsampleEncryption ? sampleEncryptionData.readUnsignedShort() : 1;
       if (subsampleEncryption) {
@@ -1128,13 +1137,11 @@ public final class FragmentedMp4Extractor {
       out.flags |= MediaExtractor.SAMPLE_FLAG_SYNC;
       lastSyncSampleIndex = sampleIndex;
     }
-    if (out.allowDataBufferReplacement
+    if (out.allowDataBufferReplacement && (out.data == null || out.data.capacity() < sampleSize)) {
-        && (out.data == null || out.data.capacity() < sampleSize)) {
       outputData = ByteBuffer.allocate(sampleSize);
       out.data = outputData;
     }
-    ParsableByteArray sampleEncryptionData = cencAuxiliaryData != null ? cencAuxiliaryData
+    ParsableByteArray sampleEncryptionData = fragmentRun.sampleEncryptionData;
-        : fragmentRun.smoothStreamingSampleEncryptionData;
     if (sampleEncryptionData != null) {
       readSampleEncryptionData(sampleEncryptionData, out);
     }
@@ -1173,9 +1180,7 @@ public final class FragmentedMp4Extractor {
     byte[] keyId = encryptionBox.keyId;
     boolean isEncrypted = encryptionBox.isEncrypted;
     int vectorSize = encryptionBox.initializationVectorSize;
-    boolean subsampleEncryption = cencAuxiliaryData != null
+    boolean subsampleEncryption = fragmentRun.sampleHasSubsampleEncryptionTable[sampleIndex];
-        ? fragmentRun.auxiliarySampleInfoSizeTable[sampleIndex] > vectorSize
-            : fragmentRun.smoothStreamingUsesSubsampleEncryption;
 
     byte[] vector = out.cryptoInfo.iv;
     if (vector == null || vector.length != 16) {

library/src/main/java/com/google/android/exoplayer/parser/mp4/TrackFragment.java

@@ -27,12 +27,10 @@ package com.google.android.exoplayer.parser.mp4;
   public int[] sampleDecodingTimeTable;
   public int[] sampleCompositionTimeOffsetTable;
   public boolean[] sampleIsSyncFrameTable;
+  public boolean[] sampleHasSubsampleEncryptionTable;
 
-  public int auxiliarySampleInfoTotalSize;
+  public ParsableByteArray sampleEncryptionData;
-  public int[] auxiliarySampleInfoSizeTable;
+  public boolean sampleEncryptionDataNeedsFill;
-
-  public boolean smoothStreamingUsesSubsampleEncryption;
-  public ParsableByteArray smoothStreamingSampleEncryptionData;
 
   public void setSampleDescriptionIndex(int sampleDescriptionIndex) {
     this.sampleDescriptionIndex = sampleDescriptionIndex;
@@ -47,16 +45,11 @@ package com.google.android.exoplayer.parser.mp4;
     this.length = sampleSizeTable.length;
   }
 
-  public void setAuxiliarySampleInfoTables(int totalAuxiliarySampleInfoSize,
+  public void setSampleEncryptionData(boolean[] sampleHasSubsampleEncryptionTable,
-      int[] auxiliarySampleInfoSizeTable) {
+      ParsableByteArray sampleEncryptionData, boolean sampleEncryptionDataNeedsFill) {
-    this.auxiliarySampleInfoTotalSize = totalAuxiliarySampleInfoSize;
+    this.sampleHasSubsampleEncryptionTable = sampleHasSubsampleEncryptionTable;
-    this.auxiliarySampleInfoSizeTable = auxiliarySampleInfoSizeTable;
+    this.sampleEncryptionData = sampleEncryptionData;
-  }
+    this.sampleEncryptionDataNeedsFill = sampleEncryptionDataNeedsFill;
-
-  public void setSmoothStreamingSampleEncryptionData(ParsableByteArray data,
-      boolean usesSubsampleEncryption) {
-    this.smoothStreamingSampleEncryptionData = data;
-    this.smoothStreamingUsesSubsampleEncryption = usesSubsampleEncryption;
   }
 
   public int getSamplePresentationTime(int index) {