Rename DefaultTrackOutput to SampleQueue

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

library/core/src/main/java/com/google/android/exoplayer2/source/ExtractorMediaPeriod.java

@@ -23,14 +23,13 @@ import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.FormatHolder;
 import com.google.android.exoplayer2.decoder.DecoderInputBuffer;
 import com.google.android.exoplayer2.extractor.DefaultExtractorInput;
-import com.google.android.exoplayer2.extractor.DefaultTrackOutput;
-import com.google.android.exoplayer2.extractor.DefaultTrackOutput.UpstreamFormatChangedListener;
 import com.google.android.exoplayer2.extractor.Extractor;
 import com.google.android.exoplayer2.extractor.ExtractorInput;
 import com.google.android.exoplayer2.extractor.ExtractorOutput;
 import com.google.android.exoplayer2.extractor.PositionHolder;
 import com.google.android.exoplayer2.extractor.SeekMap;
 import com.google.android.exoplayer2.extractor.TrackOutput;
+import com.google.android.exoplayer2.source.SampleQueue.UpstreamFormatChangedListener;
 import com.google.android.exoplayer2.trackselection.TrackSelection;
 import com.google.android.exoplayer2.upstream.Allocator;
 import com.google.android.exoplayer2.upstream.DataSource;
@@ -71,7 +70,7 @@ import java.io.IOException;
   private final Runnable maybeFinishPrepareRunnable;
   private final Runnable onContinueLoadingRequestedRunnable;
   private final Handler handler;
-  private final SparseArray<DefaultTrackOutput> sampleQueues;
+  private final SparseArray<SampleQueue> sampleQueues;
 
   private Callback callback;
   private SeekMap seekMap;
@@ -345,7 +344,7 @@ import java.io.IOException;
   }
 
   /* package */ void skipData(int track, long positionUs) {
-    DefaultTrackOutput sampleQueue = sampleQueues.valueAt(track);
+    SampleQueue sampleQueue = sampleQueues.valueAt(track);
     if (loadingFinished && positionUs > sampleQueue.getLargestQueuedTimestampUs()) {
       sampleQueue.skipAll();
     } else {
@@ -402,9 +401,9 @@ import java.io.IOException;
 
   @Override
   public TrackOutput track(int id, int type) {
-    DefaultTrackOutput trackOutput = sampleQueues.get(id);
+    SampleQueue trackOutput = sampleQueues.get(id);
     if (trackOutput == null) {
-      trackOutput = new DefaultTrackOutput(allocator);
+      trackOutput = new SampleQueue(allocator);
       trackOutput.setUpstreamFormatChangeListener(this);
       sampleQueues.put(id, trackOutput);
     }

library/core/src/main/java/com/google/android/exoplayer2/extractor/SampleMetadataQueue.java → library/core/src/main/java/com/google/android/exoplayer2/source/SampleMetadataQueue.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.android.exoplayer2.extractor;
+package com.google.android.exoplayer2.source;
 
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;

library/core/src/main/java/com/google/android/exoplayer2/extractor/DefaultTrackOutput.java → library/core/src/main/java/com/google/android/exoplayer2/source/SampleQueue.java

@@ -13,14 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.android.exoplayer2.extractor;
+package com.google.android.exoplayer2.source;
 
 import android.support.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.FormatHolder;
 import com.google.android.exoplayer2.decoder.DecoderInputBuffer;
-import com.google.android.exoplayer2.extractor.SampleMetadataQueue.SampleExtrasHolder;
+import com.google.android.exoplayer2.extractor.ExtractorInput;
+import com.google.android.exoplayer2.extractor.TrackOutput;
+import com.google.android.exoplayer2.source.SampleMetadataQueue.SampleExtrasHolder;
 import com.google.android.exoplayer2.upstream.Allocation;
 import com.google.android.exoplayer2.upstream.Allocator;
 import com.google.android.exoplayer2.util.ParsableByteArray;
@@ -30,10 +32,9 @@ import java.nio.ByteBuffer;
 import java.util.concurrent.atomic.AtomicInteger;
 
 /**
- * A {@link TrackOutput} that buffers extracted samples in a queue and allows for consumption from
- * that queue.
+ * A queue of media samples.
  */
-public final class DefaultTrackOutput implements TrackOutput {
+public final class SampleQueue implements TrackOutput {
 
   /**
    * A listener for changes to the upstream format.
@@ -81,7 +82,7 @@ public final class DefaultTrackOutput implements TrackOutput {
   /**
    * @param allocator An {@link Allocator} from which allocations for sample data can be obtained.
    */
-  public DefaultTrackOutput(Allocator allocator) {
+  public SampleQueue(Allocator allocator) {
     this.allocator = allocator;
     allocationLength = allocator.getIndividualAllocationLength();
     metadataQueue = new SampleMetadataQueue();

library/core/src/main/java/com/google/android/exoplayer2/source/chunk/BaseMediaChunkOutput.java

@@ -16,9 +16,9 @@
 package com.google.android.exoplayer2.source.chunk;
 
 import android.util.Log;
-import com.google.android.exoplayer2.extractor.DefaultTrackOutput;
 import com.google.android.exoplayer2.extractor.DummyTrackOutput;
 import com.google.android.exoplayer2.extractor.TrackOutput;
+import com.google.android.exoplayer2.source.SampleQueue;
 import com.google.android.exoplayer2.source.chunk.ChunkExtractorWrapper.TrackOutputProvider;
 
 /**
@@ -29,22 +29,22 @@ import com.google.android.exoplayer2.source.chunk.ChunkExtractorWrapper.TrackOut
   private static final String TAG = "BaseMediaChunkOutput";
 
   private final int[] trackTypes;
-  private final DefaultTrackOutput[] trackOutputs;
+  private final SampleQueue[] sampleQueues;
 
   /**
    * @param trackTypes The track types of the individual track outputs.
-   * @param trackOutputs The individual track outputs.
+   * @param sampleQueues The individual sample queues.
    */
-  public BaseMediaChunkOutput(int[] trackTypes, DefaultTrackOutput[] trackOutputs) {
+  public BaseMediaChunkOutput(int[] trackTypes, SampleQueue[] sampleQueues) {
     this.trackTypes = trackTypes;
-    this.trackOutputs = trackOutputs;
+    this.sampleQueues = sampleQueues;
   }
 
   @Override
   public TrackOutput track(int id, int type) {
     for (int i = 0; i < trackTypes.length; i++) {
       if (type == trackTypes[i]) {
-        return trackOutputs[i];
+        return sampleQueues[i];
       }
     }
     Log.e(TAG, "Unmatched track of type: " + type);
@@ -52,13 +52,13 @@ import com.google.android.exoplayer2.source.chunk.ChunkExtractorWrapper.TrackOut
   }
 
   /**
-   * Returns the current absolute write indices of the individual track outputs.
+   * Returns the current absolute write indices of the individual sample queues.
    */
   public int[] getWriteIndices() {
-    int[] writeIndices = new int[trackOutputs.length];
-    for (int i = 0; i < trackOutputs.length; i++) {
-      if (trackOutputs[i] != null) {
-        writeIndices[i] = trackOutputs[i].getWriteIndex();
+    int[] writeIndices = new int[sampleQueues.length];
+    for (int i = 0; i < sampleQueues.length; i++) {
+      if (sampleQueues[i] != null) {
+        writeIndices[i] = sampleQueues[i].getWriteIndex();
       }
     }
     return writeIndices;
@@ -66,12 +66,12 @@ import com.google.android.exoplayer2.source.chunk.ChunkExtractorWrapper.TrackOut
 
   /**
    * Sets an offset that will be added to the timestamps (and sub-sample timestamps) of samples
-   * subsequently written to the track outputs.
+   * subsequently written to the sample queues.
    */
   public void setSampleOffsetUs(long sampleOffsetUs) {
-    for (DefaultTrackOutput trackOutput : trackOutputs) {
-      if (trackOutput != null) {
-        trackOutput.setSampleOffsetUs(sampleOffsetUs);
+    for (SampleQueue sampleQueue : sampleQueues) {
+      if (sampleQueue != null) {
+        sampleQueue.setSampleOffsetUs(sampleOffsetUs);
       }
     }
   }

library/core/src/main/java/com/google/android/exoplayer2/source/chunk/ChunkSampleStream.java

@@ -19,8 +19,8 @@ import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.FormatHolder;
 import com.google.android.exoplayer2.decoder.DecoderInputBuffer;
-import com.google.android.exoplayer2.extractor.DefaultTrackOutput;
 import com.google.android.exoplayer2.source.AdaptiveMediaSourceEventListener.EventDispatcher;
+import com.google.android.exoplayer2.source.SampleQueue;
 import com.google.android.exoplayer2.source.SampleStream;
 import com.google.android.exoplayer2.source.SequenceableLoader;
 import com.google.android.exoplayer2.upstream.Allocator;
@@ -49,8 +49,8 @@ public class ChunkSampleStream<T extends ChunkSource> implements SampleStream, S
   private final ChunkHolder nextChunkHolder;
   private final LinkedList<BaseMediaChunk> mediaChunks;
   private final List<BaseMediaChunk> readOnlyMediaChunks;
-  private final DefaultTrackOutput primarySampleQueue;
-  private final DefaultTrackOutput[] embeddedSampleQueues;
+  private final SampleQueue primarySampleQueue;
+  private final SampleQueue[] embeddedSampleQueues;
   private final BaseMediaChunkOutput mediaChunkOutput;
 
   private Format primaryDownstreamTrackFormat;
@@ -85,19 +85,19 @@ public class ChunkSampleStream<T extends ChunkSource> implements SampleStream, S
     readOnlyMediaChunks = Collections.unmodifiableList(mediaChunks);
 
     int embeddedTrackCount = embeddedTrackTypes == null ? 0 : embeddedTrackTypes.length;
-    embeddedSampleQueues = new DefaultTrackOutput[embeddedTrackCount];
+    embeddedSampleQueues = new SampleQueue[embeddedTrackCount];
     embeddedTracksSelected = new boolean[embeddedTrackCount];
     int[] trackTypes = new int[1 + embeddedTrackCount];
-    DefaultTrackOutput[] sampleQueues = new DefaultTrackOutput[1 + embeddedTrackCount];
+    SampleQueue[] sampleQueues = new SampleQueue[1 + embeddedTrackCount];
 
-    primarySampleQueue = new DefaultTrackOutput(allocator);
+    primarySampleQueue = new SampleQueue(allocator);
     trackTypes[0] = primaryTrackType;
     sampleQueues[0] = primarySampleQueue;
 
     for (int i = 0; i < embeddedTrackCount; i++) {
-      DefaultTrackOutput trackOutput = new DefaultTrackOutput(allocator);
-      embeddedSampleQueues[i] = trackOutput;
-      sampleQueues[i + 1] = trackOutput;
+      SampleQueue sampleQueue = new SampleQueue(allocator);
+      embeddedSampleQueues[i] = sampleQueue;
+      sampleQueues[i + 1] = sampleQueue;
       trackTypes[i + 1] = embeddedTrackTypes[i];
     }
 
@@ -192,7 +192,7 @@ public class ChunkSampleStream<T extends ChunkSource> implements SampleStream, S
       }
       // TODO: For this to work correctly, the embedded streams must not discard anything from their
       // sample queues beyond the current read position of the primary stream.
-      for (DefaultTrackOutput embeddedSampleQueue : embeddedSampleQueues) {
+      for (SampleQueue embeddedSampleQueue : embeddedSampleQueues) {
         embeddedSampleQueue.skipToKeyframeBefore(positionUs, true);
       }
     } else {
@@ -204,7 +204,7 @@ public class ChunkSampleStream<T extends ChunkSource> implements SampleStream, S
         loader.cancelLoading();
       } else {
         primarySampleQueue.reset(true);
-        for (DefaultTrackOutput embeddedSampleQueue : embeddedSampleQueues) {
+        for (SampleQueue embeddedSampleQueue : embeddedSampleQueues) {
           embeddedSampleQueue.reset(true);
         }
       }
@@ -218,7 +218,7 @@ public class ChunkSampleStream<T extends ChunkSource> implements SampleStream, S
    */
   public void release() {
     primarySampleQueue.disable();
-    for (DefaultTrackOutput embeddedSampleQueue : embeddedSampleQueues) {
+    for (SampleQueue embeddedSampleQueue : embeddedSampleQueues) {
       embeddedSampleQueue.disable();
     }
     loader.release();
@@ -280,7 +280,7 @@ public class ChunkSampleStream<T extends ChunkSource> implements SampleStream, S
         loadable.bytesLoaded());
     if (!released) {
       primarySampleQueue.reset(true);
-      for (DefaultTrackOutput embeddedSampleQueue : embeddedSampleQueues) {
+      for (SampleQueue embeddedSampleQueue : embeddedSampleQueues) {
         embeddedSampleQueue.reset(true);
       }
       callback.onContinueLoadingRequested(this);
@@ -439,10 +439,10 @@ public class ChunkSampleStream<T extends ChunkSource> implements SampleStream, S
 
     public final ChunkSampleStream<T> parent;
 
-    private final DefaultTrackOutput sampleQueue;
+    private final SampleQueue sampleQueue;
     private final int index;
 
-    public EmbeddedSampleStream(ChunkSampleStream<T> parent, DefaultTrackOutput sampleQueue,
+    public EmbeddedSampleStream(ChunkSampleStream<T> parent, SampleQueue sampleQueue,
         int index) {
       this.parent = parent;
       this.sampleQueue = sampleQueue;

library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsSampleStreamWrapper.java

@@ -22,11 +22,11 @@ import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.FormatHolder;
 import com.google.android.exoplayer2.decoder.DecoderInputBuffer;
-import com.google.android.exoplayer2.extractor.DefaultTrackOutput;
-import com.google.android.exoplayer2.extractor.DefaultTrackOutput.UpstreamFormatChangedListener;
 import com.google.android.exoplayer2.extractor.ExtractorOutput;
 import com.google.android.exoplayer2.extractor.SeekMap;
 import com.google.android.exoplayer2.source.AdaptiveMediaSourceEventListener.EventDispatcher;
+import com.google.android.exoplayer2.source.SampleQueue;
+import com.google.android.exoplayer2.source.SampleQueue.UpstreamFormatChangedListener;
 import com.google.android.exoplayer2.source.SampleStream;
 import com.google.android.exoplayer2.source.SequenceableLoader;
 import com.google.android.exoplayer2.source.TrackGroup;
@@ -81,7 +81,7 @@ import java.util.LinkedList;
   private final Loader loader;
   private final EventDispatcher eventDispatcher;
   private final HlsChunkSource.HlsChunkHolder nextChunkHolder;
-  private final SparseArray<DefaultTrackOutput> sampleQueues;
+  private final SparseArray<SampleQueue> sampleQueues;
   private final LinkedList<HlsMediaChunk> mediaChunks;
   private final Runnable maybeFinishPrepareRunnable;
   private final Handler handler;
@@ -315,7 +315,7 @@ import java.util.LinkedList;
   }
 
   /* package */ void skipData(int group, long positionUs) {
-    DefaultTrackOutput sampleQueue = sampleQueues.valueAt(group);
+    SampleQueue sampleQueue = sampleQueues.valueAt(group);
     if (loadingFinished && positionUs > sampleQueue.getLargestQueuedTimestampUs()) {
       sampleQueue.skipAll();
     } else {
@@ -471,15 +471,15 @@ import java.util.LinkedList;
   // ExtractorOutput implementation. Called by the loading thread.
 
   @Override
-  public DefaultTrackOutput track(int id, int type) {
+  public SampleQueue track(int id, int type) {
     if (sampleQueues.indexOfKey(id) >= 0) {
       return sampleQueues.get(id);
     }
-    DefaultTrackOutput trackOutput = new DefaultTrackOutput(allocator);
-    trackOutput.setUpstreamFormatChangeListener(this);
-    trackOutput.sourceId(upstreamChunkUid);
-    sampleQueues.put(id, trackOutput);
-    return trackOutput;
+    SampleQueue sampleQueue = new SampleQueue(allocator);
+    sampleQueue.setUpstreamFormatChangeListener(this);
+    sampleQueue.sourceId(upstreamChunkUid);
+    sampleQueues.put(id, sampleQueue);
+    return sampleQueue;
   }
 
   @Override