Implemented limited support for multi-period DASH manifests.

Limitation: Successive periods must expose the same adaptation
sets and representations.

GitHub Issue: #557

demo/src/main/java/com/google/android/exoplayer/demo/EventLogger.java

@@ -47,7 +47,7 @@ public class EventLogger implements DemoPlayer.Listener, DemoPlayer.InfoListener
 
   private long sessionStartTimeMs;
   private long[] loadStartTimeMs;
-  private long[] seekRangeValuesUs;
+  private long[] availableRangeValuesUs;
 
   public EventLogger() {
     loadStartTimeMs = new long[DemoPlayer.RENDERER_COUNT];
@@ -171,10 +171,10 @@ public class EventLogger implements DemoPlayer.Listener, DemoPlayer.InfoListener
   }
 
   @Override
-  public void onSeekRangeChanged(TimeRange seekRange) {
-    seekRangeValuesUs = seekRange.getCurrentBoundsUs(seekRangeValuesUs);
-    Log.d(TAG, "seekRange [ " + seekRange.type + ", " + seekRangeValuesUs[0] + ", "
-        + seekRangeValuesUs[1] + "]");
+  public void onAvailableRangeChanged(TimeRange availableRange) {
+    availableRangeValuesUs = availableRange.getCurrentBoundsUs(availableRangeValuesUs);
+    Log.d(TAG, "availableRange [ " + availableRange.type + ", " + availableRangeValuesUs[0] + ", "
+        + availableRangeValuesUs[1] + "]");
   }
 
   private void printInternalError(String type, Exception e) {

demo/src/main/java/com/google/android/exoplayer/demo/player/DemoPlayer.java

@@ -124,7 +124,7 @@ public class DemoPlayer implements ExoPlayer.Listener, ChunkSampleSource.EventLi
         int mediaStartTimeMs, int mediaEndTimeMs, long elapsedRealtimeMs, long loadDurationMs);
     void onDecoderInitialized(String decoderName, long elapsedRealtimeMs,
         long initializationDurationMs);
-    void onSeekRangeChanged(TimeRange seekRange);
+    void onAvailableRangeChanged(TimeRange availableRange);
   }
 
   /**
@@ -509,9 +509,9 @@ public class DemoPlayer implements ExoPlayer.Listener, ChunkSampleSource.EventLi
   }
 
   @Override
-  public void onSeekRangeChanged(TimeRange seekRange) {
+  public void onAvailableRangeChanged(TimeRange availableRange) {
     if (infoListener != null) {
-      infoListener.onSeekRangeChanged(seekRange);
+      infoListener.onAvailableRangeChanged(availableRange);
     }
   }
 

library/src/main/java/com/google/android/exoplayer/chunk/BaseMediaChunk.java

@@ -38,6 +38,13 @@ public abstract class BaseMediaChunk extends MediaChunk {
   private DefaultTrackOutput output;
   private int firstSampleIndex;
 
+  public BaseMediaChunk(DataSource dataSource, DataSpec dataSpec, int trigger, Format format,
+      long startTimeUs, long endTimeUs, int chunkIndex, boolean isLastChunk,
+      boolean isMediaFormatFinal) {
+    this(dataSource, dataSpec, trigger, format, startTimeUs, endTimeUs, chunkIndex, isLastChunk,
+        isMediaFormatFinal, Chunk.NO_PARENT_ID);
+  }
+
   /**
    * @param dataSource A {@link DataSource} for loading the data.
    * @param dataSpec Defines the data to be loaded.
@@ -51,11 +58,13 @@ public abstract class BaseMediaChunk extends MediaChunk {
    *     be called at any time to obtain the media format and drm initialization data. False if
    *     these methods are only guaranteed to return correct data after the first sample data has
    *     been output from the chunk.
+   * @param parentId Identifier for a parent from which this chunk originates.
    */
   public BaseMediaChunk(DataSource dataSource, DataSpec dataSpec, int trigger, Format format,
       long startTimeUs, long endTimeUs, int chunkIndex, boolean isLastChunk,
-      boolean isMediaFormatFinal) {
-    super(dataSource, dataSpec, trigger, format, startTimeUs, endTimeUs, chunkIndex, isLastChunk);
+      boolean isMediaFormatFinal, int parentId) {
+    super(dataSource, dataSpec, trigger, format, startTimeUs, endTimeUs, chunkIndex, isLastChunk,
+        parentId);
     this.isMediaFormatFinal = isMediaFormatFinal;
   }
 

library/src/main/java/com/google/android/exoplayer/chunk/Chunk.java

@@ -75,6 +75,10 @@ public abstract class Chunk implements Loadable {
    * Implementations may define custom {@link #trigger} codes greater than or equal to this value.
    */
   public static final int TRIGGER_CUSTOM_BASE = 10000;
+  /**
+   * Value of {@link #parentId} if no parent id need be specified.
+   */
+  public static final int NO_PARENT_ID = -1;
 
   /**
    * The type of the chunk. For reporting only.
@@ -93,9 +97,17 @@ public abstract class Chunk implements Loadable {
    * The {@link DataSpec} that defines the data to be loaded.
    */
   public final DataSpec dataSpec;
+  /**
+   * Optional identifier for a parent from which this chunk originates.
+   */
+  public final int parentId;
 
   protected final DataSource dataSource;
 
+  public Chunk(DataSource dataSource, DataSpec dataSpec, int type, int trigger, Format format) {
+    this(dataSource, dataSpec, type, trigger, format, NO_PARENT_ID);
+  }
+
   /**
    * @param dataSource The source from which the data should be loaded.
    * @param dataSpec Defines the data to be loaded. {@code dataSpec.length} must not exceed
@@ -105,13 +117,16 @@ public abstract class Chunk implements Loadable {
    * @param type See {@link #type}.
    * @param trigger See {@link #trigger}.
    * @param format See {@link #format}.
+   * @param parentId See {@link #parentId}.
    */
-  public Chunk(DataSource dataSource, DataSpec dataSpec, int type, int trigger, Format format) {
+  public Chunk(DataSource dataSource, DataSpec dataSpec, int type, int trigger, Format format,
+      int parentId) {
     this.dataSource = Assertions.checkNotNull(dataSource);
     this.dataSpec = Assertions.checkNotNull(dataSpec);
     this.type = type;
     this.trigger = trigger;
     this.format = format;
+    this.parentId = parentId;
   }
 
   /**

library/src/main/java/com/google/android/exoplayer/chunk/ContainerMediaChunk.java

@@ -43,6 +43,15 @@ public class ContainerMediaChunk extends BaseMediaChunk implements SingleTrackOu
   private volatile int bytesLoaded;
   private volatile boolean loadCanceled;
 
+  public ContainerMediaChunk(DataSource dataSource, DataSpec dataSpec, int trigger, Format format,
+      long startTimeUs, long endTimeUs, int chunkIndex, boolean isLastChunk, long sampleOffsetUs,
+      ChunkExtractorWrapper extractorWrapper, MediaFormat mediaFormat, DrmInitData drmInitData,
+      boolean isMediaFormatFinal) {
+    this(dataSource, dataSpec, trigger, format, startTimeUs, endTimeUs, chunkIndex, isLastChunk,
+        sampleOffsetUs, extractorWrapper, mediaFormat, drmInitData, isMediaFormatFinal,
+        Chunk.NO_PARENT_ID);
+  }
+
   /**
    * @param dataSource A {@link DataSource} for loading the data.
    * @param dataSpec Defines the data to be loaded.
@@ -60,13 +69,14 @@ public class ContainerMediaChunk extends BaseMediaChunk implements SingleTrackOu
    *     protected. May also be null if the data is known to define its own initialization data.
    * @param isMediaFormatFinal True if {@code mediaFormat} and {@code drmInitData} are known to be
    *     correct and final. False if the data may define its own format or initialization data.
+   * @param parentId Identifier for a parent from which this chunk originates.
    */
   public ContainerMediaChunk(DataSource dataSource, DataSpec dataSpec, int trigger, Format format,
       long startTimeUs, long endTimeUs, int chunkIndex, boolean isLastChunk, long sampleOffsetUs,
       ChunkExtractorWrapper extractorWrapper, MediaFormat mediaFormat, DrmInitData drmInitData,
-      boolean isMediaFormatFinal) {
+      boolean isMediaFormatFinal, int parentId) {
     super(dataSource, dataSpec, trigger, format, startTimeUs, endTimeUs, chunkIndex, isLastChunk,
-        isMediaFormatFinal);
+        isMediaFormatFinal, parentId);
     this.extractorWrapper = extractorWrapper;
     this.sampleOffsetUs = sampleOffsetUs;
     this.mediaFormat = getAdjustedMediaFormat(mediaFormat, sampleOffsetUs);

library/src/main/java/com/google/android/exoplayer/chunk/InitializationChunk.java

@@ -46,6 +46,11 @@ public final class InitializationChunk extends Chunk implements SingleTrackOutpu
   private volatile int bytesLoaded;
   private volatile boolean loadCanceled;
 
+  public InitializationChunk(DataSource dataSource, DataSpec dataSpec, int trigger, Format format,
+      ChunkExtractorWrapper extractorWrapper) {
+    this(dataSource, dataSpec, trigger, format, extractorWrapper, Chunk.NO_PARENT_ID);
+  }
+
   /**
    * Constructor for a chunk of media samples.
    *
@@ -54,10 +59,11 @@ public final class InitializationChunk extends Chunk implements SingleTrackOutpu
    * @param trigger The reason for this chunk being selected.
    * @param format The format of the stream to which this chunk belongs.
    * @param extractorWrapper A wrapped extractor to use for parsing the initialization data.
+   * @param parentId Identifier for a parent from which this chunk originates.
    */
   public InitializationChunk(DataSource dataSource, DataSpec dataSpec, int trigger, Format format,
-      ChunkExtractorWrapper extractorWrapper) {
-    super(dataSource, dataSpec, Chunk.TYPE_MEDIA_INITIALIZATION, trigger, format);
+      ChunkExtractorWrapper extractorWrapper, int parentId) {
+    super(dataSource, dataSpec, Chunk.TYPE_MEDIA_INITIALIZATION, trigger, format, parentId);
     this.extractorWrapper = extractorWrapper;
   }
 

library/src/main/java/com/google/android/exoplayer/chunk/MediaChunk.java

@@ -41,6 +41,12 @@ public abstract class MediaChunk extends Chunk {
    */
   public final boolean isLastChunk;
 
+  public MediaChunk(DataSource dataSource, DataSpec dataSpec, int trigger, Format format,
+      long startTimeUs, long endTimeUs, int chunkIndex, boolean isLastChunk) {
+    this(dataSource, dataSpec, trigger, format, startTimeUs, endTimeUs, chunkIndex, isLastChunk,
+        Chunk.NO_PARENT_ID);
+  }
+
   /**
    * @param dataSource A {@link DataSource} for loading the data.
    * @param dataSpec Defines the data to be loaded.
@@ -50,10 +56,11 @@ public abstract class MediaChunk extends Chunk {
    * @param endTimeUs The end time of the media contained by the chunk, in microseconds.
    * @param chunkIndex The index of the chunk.
    * @param isLastChunk True if this is the last chunk in the media. False otherwise.
+   * @param parentId Identifier for a parent from which this chunk originates.
    */
   public MediaChunk(DataSource dataSource, DataSpec dataSpec, int trigger, Format format,
-      long startTimeUs, long endTimeUs, int chunkIndex, boolean isLastChunk) {
-    super(dataSource, dataSpec, Chunk.TYPE_MEDIA, trigger, format);
+      long startTimeUs, long endTimeUs, int chunkIndex, boolean isLastChunk, int parentId) {
+    super(dataSource, dataSpec, Chunk.TYPE_MEDIA, trigger, format, parentId);
     Assertions.checkNotNull(format);
     this.startTimeUs = startTimeUs;
     this.endTimeUs = endTimeUs;

library/src/main/java/com/google/android/exoplayer/chunk/SingleSampleMediaChunk.java

@@ -35,6 +35,13 @@ public final class SingleSampleMediaChunk extends BaseMediaChunk {
   private volatile int bytesLoaded;
   private volatile boolean loadCanceled;
 
+  public SingleSampleMediaChunk(DataSource dataSource, DataSpec dataSpec, int trigger,
+      Format format, long startTimeUs, long endTimeUs, int chunkIndex, boolean isLastChunk,
+      MediaFormat sampleFormat, DrmInitData sampleDrmInitData) {
+    this(dataSource, dataSpec, trigger, format, startTimeUs, endTimeUs, chunkIndex, isLastChunk,
+        sampleFormat, sampleDrmInitData, Chunk.NO_PARENT_ID);
+  }
+
   /**
    * @param dataSource A {@link DataSource} for loading the data.
    * @param dataSpec Defines the data to be loaded.
@@ -47,12 +54,13 @@ public final class SingleSampleMediaChunk extends BaseMediaChunk {
    * @param sampleFormat The format of the sample.
    * @param sampleDrmInitData The {@link DrmInitData} for the sample. Null if the sample is not drm
    *     protected.
+   * @param parentId Identifier for a parent from which this chunk originates.
    */
   public SingleSampleMediaChunk(DataSource dataSource, DataSpec dataSpec, int trigger,
       Format format, long startTimeUs, long endTimeUs, int chunkIndex, boolean isLastChunk,
-      MediaFormat sampleFormat, DrmInitData sampleDrmInitData) {
+      MediaFormat sampleFormat, DrmInitData sampleDrmInitData, int parentId) {
     super(dataSource, dataSpec, trigger, format, startTimeUs, endTimeUs, chunkIndex, isLastChunk,
-        true);
+        true, parentId);
     this.sampleFormat = sampleFormat;
     this.sampleDrmInitData = sampleDrmInitData;
   }