Play a sequence of sources (playlists #3).

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=124713796

library/src/androidTest/java/com/google/android/exoplayer/util/UtilTest.java

@@ -144,23 +144,6 @@ public class UtilTest extends TestCase {
     assertEquals(1407322800000L, Util.parseXsDateTime("2014-08-06T11:00:00Z"));
     assertEquals(1407322800000L, Util.parseXsDateTime("2014-08-06T11:00:00Z"));
   }
   }
 
 
-  public void testLongSplitting() {
-    assertLongSplittingForValue(Long.MIN_VALUE);
-    assertLongSplittingForValue(Long.MIN_VALUE + 1);
-    assertLongSplittingForValue(-1);
-    assertLongSplittingForValue(0);
-    assertLongSplittingForValue(1);
-    assertLongSplittingForValue(Long.MAX_VALUE - 1);
-    assertLongSplittingForValue(Long.MAX_VALUE);
-  }
-
-  private static void assertLongSplittingForValue(long value) {
-    int topBits = Util.getTopInt(value);
-    int bottomBots = Util.getBottomInt(value);
-    long reconstructedValue = Util.getLong(topBits, bottomBots);
-    assertEquals(value, reconstructedValue);
-  }
-
   public void testUnescapeInvalidFileName() {
   public void testUnescapeInvalidFileName() {
     assertNull(Util.unescapeFileName("%a"));
     assertNull(Util.unescapeFileName("%a"));
     assertNull(Util.unescapeFileName("%xyz"));
     assertNull(Util.unescapeFileName("%xyz"));

library/src/main/java/com/google/android/exoplayer/TrackRenderer.java

@@ -108,6 +108,10 @@ public abstract class TrackRenderer implements ExoPlayerComponent {
   private int index;
   private int index;
   private int state;
   private int state;
   private TrackStream stream;
   private TrackStream stream;
+  private long streamOffsetUs;
+  private long maximumTimeUs;
+  private boolean readEndOfStream;
+  private boolean streamIsFinal;
 
 
   /**
   /**
    * Sets the index of this renderer within the player.
    * Sets the index of this renderer within the player.
@@ -168,14 +172,16 @@ public abstract class TrackRenderer implements ExoPlayerComponent {
    * @param stream The track stream from which the renderer should consume.
    * @param stream The track stream from which the renderer should consume.
    * @param positionUs The player's current position.
    * @param positionUs The player's current position.
    * @param joining Whether this renderer is being enabled to join an ongoing playback.
    * @param joining Whether this renderer is being enabled to join an ongoing playback.
+   * @param offsetUs The offset to be added to timestamps of buffers read from {@code stream}
+   *     before they are renderered.
    * @throws ExoPlaybackException If an error occurs.
    * @throws ExoPlaybackException If an error occurs.
    */
    */
   /* package */ final void enable(Format[] formats, TrackStream stream, long positionUs,
   /* package */ final void enable(Format[] formats, TrackStream stream, long positionUs,
-      boolean joining) throws ExoPlaybackException {
+      boolean joining, long offsetUs) throws ExoPlaybackException {
     Assertions.checkState(state == STATE_DISABLED);
     Assertions.checkState(state == STATE_DISABLED);
     state = STATE_ENABLED;
     state = STATE_ENABLED;
     onEnabled(joining);
     onEnabled(joining);
-    replaceTrackStream(formats, stream);
+    replaceTrackStream(formats, stream, offsetUs);
     onReset(positionUs, joining);
     onReset(positionUs, joining);
   }
   }
 
 
@@ -192,15 +198,20 @@ public abstract class TrackRenderer implements ExoPlayerComponent {
   }
   }
 
 
   /**
   /**
-   * Replaces the {@link TrackStream} from which samples will be consumed.
+   * Sets the {@link TrackStream} from which samples will be consumed.
    *
    *
    * @param formats The enabled formats.
    * @param formats The enabled formats.
-   * @param trackStream The track stream from which the renderer should consume.
+   * @param stream The track stream from which the renderer should consume.
+   * @param offsetUs The offset to be added to timestamps of buffers read from {@code stream} before
+   *     they are renderered.
    * @throws ExoPlaybackException If an error occurs.
    * @throws ExoPlaybackException If an error occurs.
    */
    */
-  /* package */ final void replaceTrackStream(Format[] formats, TrackStream trackStream)
+  /* package */ final void replaceTrackStream(Format[] formats, TrackStream stream, long offsetUs)
       throws ExoPlaybackException {
       throws ExoPlaybackException {
-    stream = trackStream;
+    Assertions.checkState(!streamIsFinal);
+    this.stream = stream;
+    readEndOfStream = false;
+    streamOffsetUs = offsetUs;
     onStreamChanged(formats);
     onStreamChanged(formats);
   }
   }
 
 
@@ -223,13 +234,16 @@ public abstract class TrackRenderer implements ExoPlayerComponent {
    * @throws ExoPlaybackException If an error occurs handling the reset.
    * @throws ExoPlaybackException If an error occurs handling the reset.
    */
    */
   /* package */ final void reset(long positionUs) throws ExoPlaybackException {
   /* package */ final void reset(long positionUs) throws ExoPlaybackException {
+    streamIsFinal = false;
+    maximumTimeUs = C.UNSET_TIME_US;
     onReset(positionUs, false);
     onReset(positionUs, false);
   }
   }
 
 
   /**
   /**
-   * Called when a reset is encountered, and also when the renderer is enabled.
+   * Invoked when a reset is encountered, and also when the renderer is enabled.
    * <p>
    * <p>
-   * The default implementation is a no-op.
+   * This method may be called when the renderer is in the following states:
+   * {@link #STATE_ENABLED}, {@link #STATE_STARTED}.
    *
    *
    * @param positionUs The playback position in microseconds.
    * @param positionUs The playback position in microseconds.
    * @param joining Whether this renderer is being enabled to join an ongoing playback.
    * @param joining Whether this renderer is being enabled to join an ongoing playback.
@@ -240,6 +254,29 @@ public abstract class TrackRenderer implements ExoPlayerComponent {
   }
   }
 
 
   /**
   /**
+   * Returns whether the renderer has read the current {@link TrackStream} to the end.
+   */
+  /* package */ final boolean hasReadStreamToEnd() {
+    return readEndOfStream;
+  }
+
+  /**
+   * Returns the maximum buffer timestamp read from the stream since the last reset, or
+   * {@link C#UNSET_TIME_US} if no buffers have been read.
+   */
+  /* package */ final long getMaximumTimeUs() {
+    return maximumTimeUs;
+  }
+
+  /**
+   * Signals to the renderer that the current {@link TrackStream} will be the final one supplied
+   * before it is next disabled or reset.
+   */
+  /* package */ final void setCurrentTrackStreamIsFinal() {
+    streamIsFinal = true;
+  }
+
+  /**
    * Starts the renderer, meaning that calls to {@link #render(long, long)} will cause media to be
    * Starts the renderer, meaning that calls to {@link #render(long, long)} will cause media to be
    * rendered.
    * rendered.
    *
    *
@@ -293,6 +330,7 @@ public abstract class TrackRenderer implements ExoPlayerComponent {
     onDisabled();
     onDisabled();
     TrackStream trackStream = stream;
     TrackStream trackStream = stream;
     stream = null;
     stream = null;
+    streamIsFinal = false;
     return trackStream;
     return trackStream;
   }
   }
 
 
@@ -327,7 +365,18 @@ public abstract class TrackRenderer implements ExoPlayerComponent {
    * @see TrackStream#readData(FormatHolder, DecoderInputBuffer)
    * @see TrackStream#readData(FormatHolder, DecoderInputBuffer)
    */
    */
   protected final int readSource(FormatHolder formatHolder, DecoderInputBuffer buffer) {
   protected final int readSource(FormatHolder formatHolder, DecoderInputBuffer buffer) {
-    return stream.readData(formatHolder, buffer);
+    int result = stream.readData(formatHolder, buffer);
+    if (result == TrackStream.BUFFER_READ) {
+      if (buffer.isEndOfStream()) {
+        readEndOfStream = true;
+        return streamIsFinal ? TrackStream.BUFFER_READ : TrackStream.NOTHING_READ;
+      }
+      buffer.timeUs += streamOffsetUs;
+      if (buffer.timeUs > maximumTimeUs) {
+        maximumTimeUs = buffer.timeUs;
+      }
+    }
+    return result;
   }
   }
 
 
   /**
   /**

library/src/main/java/com/google/android/exoplayer/util/Util.java

@@ -611,27 +611,6 @@ public final class Util {
   }
   }
 
 
   /**
   /**
-   * Returns the top 32 bits of a long as an integer.
-   */
-  public static int getTopInt(long value) {
-    return (int) (value >>> 32);
-  }
-
-  /**
-   * Returns the bottom 32 bits of a long as an integer.
-   */
-  public static int getBottomInt(long value) {
-    return (int) value;
-  }
-
-  /**
-   * Returns a long created by concatenating the bits of two integers.
-   */
-  public static long getLong(int topInteger, int bottomInteger) {
-    return ((long) topInteger << 32) | (bottomInteger & 0xFFFFFFFFL);
-  }
-
-  /**
    * Returns a byte array containing values parsed from the hex string provided.
    * Returns a byte array containing values parsed from the hex string provided.
    *
    *
    * @param hexString The hex string to convert to bytes.
    * @param hexString The hex string to convert to bytes.