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_frma = 0x66726D61;
   public static final int TYPE_saiz = 0x7361697A;
   public static final int TYPE_saiz = 0x7361697A;
   public static final int TYPE_uuid = 0x75756964;
   public static final int TYPE_uuid = 0x75756964;
+  public static final int TYPE_senc = 0x73656E63;
 
 
   public final int type;
   public final int type;
 
 

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