Refactor #6.HLS.0

Mechanical step to create a new HlsSource in the library.
Note that naming is now confusing. This will be fixed in
the next CL, when:

HlsSource -> HlsSampleSource
HlsSampleSource+HlsOutput -> HlsOutput
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=122054800

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

@@ -24,18 +24,24 @@ import com.google.android.exoplayer.MediaCodecTrackRenderer.DecoderInitializatio
 import com.google.android.exoplayer.MediaCodecUtil.DecoderQueryException;
 import com.google.android.exoplayer.MediaCodecUtil.DecoderQueryException;
 import com.google.android.exoplayer.SampleSource;
 import com.google.android.exoplayer.SampleSource;
 import com.google.android.exoplayer.TrackGroupArray;
 import com.google.android.exoplayer.TrackGroupArray;
+import com.google.android.exoplayer.dash.DashSampleSource;
 import com.google.android.exoplayer.demo.player.DemoPlayer;
 import com.google.android.exoplayer.demo.player.DemoPlayer;
-import com.google.android.exoplayer.demo.player.SourceBuilder;
 import com.google.android.exoplayer.demo.ui.TrackSelectionHelper;
 import com.google.android.exoplayer.demo.ui.TrackSelectionHelper;
 import com.google.android.exoplayer.drm.UnsupportedDrmException;
 import com.google.android.exoplayer.drm.UnsupportedDrmException;
+import com.google.android.exoplayer.extractor.ExtractorSampleSource;
+import com.google.android.exoplayer.hls.HlsSource;
 import com.google.android.exoplayer.metadata.id3.GeobFrame;
 import com.google.android.exoplayer.metadata.id3.GeobFrame;
 import com.google.android.exoplayer.metadata.id3.Id3Frame;
 import com.google.android.exoplayer.metadata.id3.Id3Frame;
 import com.google.android.exoplayer.metadata.id3.PrivFrame;
 import com.google.android.exoplayer.metadata.id3.PrivFrame;
 import com.google.android.exoplayer.metadata.id3.TxxxFrame;
 import com.google.android.exoplayer.metadata.id3.TxxxFrame;
+import com.google.android.exoplayer.smoothstreaming.SmoothStreamingSampleSource;
 import com.google.android.exoplayer.text.CaptionStyleCompat;
 import com.google.android.exoplayer.text.CaptionStyleCompat;
 import com.google.android.exoplayer.text.Cue;
 import com.google.android.exoplayer.text.Cue;
 import com.google.android.exoplayer.text.SubtitleLayout;
 import com.google.android.exoplayer.text.SubtitleLayout;
+import com.google.android.exoplayer.upstream.Allocator;
+import com.google.android.exoplayer.upstream.DataSource;
 import com.google.android.exoplayer.upstream.DataSourceFactory;
 import com.google.android.exoplayer.upstream.DataSourceFactory;
+import com.google.android.exoplayer.upstream.DefaultAllocator;
 import com.google.android.exoplayer.upstream.DefaultDataSourceFactory;
 import com.google.android.exoplayer.upstream.DefaultDataSourceFactory;
 import com.google.android.exoplayer.util.DebugTextViewHelper;
 import com.google.android.exoplayer.util.DebugTextViewHelper;
 import com.google.android.exoplayer.util.Util;
 import com.google.android.exoplayer.util.Util;
@@ -260,18 +266,25 @@ public class PlayerActivity extends Activity implements SurfaceHolder.Callback,
 
 
   // Internal methods
   // Internal methods
 
 
+  @SuppressWarnings("unused")
   private SampleSource buildSource(Uri uri, String id, String provider, int type) {
   private SampleSource buildSource(Uri uri, String id, String provider, int type) {
     switch (type) {
     switch (type) {
       case Util.TYPE_SS:
       case Util.TYPE_SS:
-        return SourceBuilder.buildSmoothStreamingSource(player, dataSourceFactory, uri,
-            new SmoothStreamingTestMediaDrmCallback());
+        // TODO: Bring back DRM support. new SmoothStreamingTestMediaDrmCallback()
+        return new SmoothStreamingSampleSource(uri, dataSourceFactory, player.getBandwidthMeter(),
+            player.getMainHandler(), player);
       case Util.TYPE_DASH:
       case Util.TYPE_DASH:
-        return SourceBuilder.buildDashSource(player, dataSourceFactory, uri,
-            new WidevineTestMediaDrmCallback(id, provider));
+        // TODO: Bring back DRM support. new WidevineTestMediaDrmCallback(id, provider)
+        return new DashSampleSource(uri, dataSourceFactory, player.getBandwidthMeter(),
+            player.getMainHandler(), player);
       case Util.TYPE_HLS:
       case Util.TYPE_HLS:
-        return SourceBuilder.buildHlsSource(player, dataSourceFactory, uri);
+        return new HlsSource(uri, dataSourceFactory, player.getBandwidthMeter(),
+            player.getMainHandler(), player);
       case Util.TYPE_OTHER:
       case Util.TYPE_OTHER:
-        return SourceBuilder.buildExtractorSource(player, dataSourceFactory, uri);
+        Allocator allocator = new DefaultAllocator(C.DEFAULT_BUFFER_SEGMENT_SIZE);
+        DataSource dataSource = dataSourceFactory.createDataSource(player.getBandwidthMeter());
+        return new ExtractorSampleSource(uri, dataSource, allocator,
+            C.DEFAULT_MUXED_BUFFER_SIZE, player.getMainHandler(), player, 0);
       default:
       default:
         throw new IllegalStateException("Unsupported type: " + type);
         throw new IllegalStateException("Unsupported type: " + type);
     }
     }

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

@@ -279,7 +279,7 @@ public class DemoPlayer implements ExoPlayer.Listener, DefaultTrackSelector.Even
     return player.getPlayWhenReady();
     return player.getPlayWhenReady();
   }
   }
 
 
-  /* package */ Handler getMainHandler() {
+  public Handler getMainHandler() {
     return mainHandler;
     return mainHandler;
   }
   }
 
 

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

-/*
- * Copyright (C) 2014 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.google.android.exoplayer.demo.player;
-
-import com.google.android.exoplayer.C;
-import com.google.android.exoplayer.DefaultLoadControl;
-import com.google.android.exoplayer.LoadControl;
-import com.google.android.exoplayer.MultiSampleSource;
-import com.google.android.exoplayer.SampleSource;
-import com.google.android.exoplayer.chunk.FormatEvaluator;
-import com.google.android.exoplayer.dash.DashSampleSource;
-import com.google.android.exoplayer.drm.MediaDrmCallback;
-import com.google.android.exoplayer.extractor.ExtractorSampleSource;
-import com.google.android.exoplayer.hls.HlsChunkSource;
-import com.google.android.exoplayer.hls.HlsSampleSource;
-import com.google.android.exoplayer.hls.PtsTimestampAdjusterProvider;
-import com.google.android.exoplayer.hls.playlist.HlsPlaylist;
-import com.google.android.exoplayer.hls.playlist.HlsPlaylistParser;
-import com.google.android.exoplayer.smoothstreaming.SmoothStreamingSampleSource;
-import com.google.android.exoplayer.upstream.Allocator;
-import com.google.android.exoplayer.upstream.BandwidthMeter;
-import com.google.android.exoplayer.upstream.DataSource;
-import com.google.android.exoplayer.upstream.DataSourceFactory;
-import com.google.android.exoplayer.upstream.DefaultAllocator;
-import com.google.android.exoplayer.util.ManifestFetcher;
-
-import android.net.Uri;
-import android.os.Handler;
-
-/**
- * A utility class for building {@link SampleSource} instances.
- */
-public class SourceBuilder {
-
-  private SourceBuilder() {}
-
-  // TODO[REFACTOR]: Bring back DASH DRM support.
-  // TODO[REFACTOR]: Bring back DASH UTC timing element support.
-  public static SampleSource buildDashSource(DemoPlayer player, DataSourceFactory dataSourceFactory,
-      Uri uri, MediaDrmCallback drmCallback) {
-    return new DashSampleSource(uri, dataSourceFactory, player.getBandwidthMeter(),
-        player.getMainHandler(), player);
-  }
-
-  // TODO[REFACTOR]: Bring back DRM support.
-  public static SampleSource buildSmoothStreamingSource(DemoPlayer player,
-      DataSourceFactory dataSourceFactory, Uri uri, MediaDrmCallback drmCallback) {
-    return new SmoothStreamingSampleSource(uri, dataSourceFactory, player.getBandwidthMeter(),
-        player.getMainHandler(), player);
-  }
-
-  public static SampleSource buildHlsSource(DemoPlayer player, DataSourceFactory dataSourceFactory,
-      Uri uri) {
-    HlsPlaylistParser parser = new HlsPlaylistParser();
-    DataSource manifestDataSource = dataSourceFactory.createDataSource();
-    // TODO[REFACTOR]: This needs releasing.
-    ManifestFetcher<HlsPlaylist> manifestFetcher = new ManifestFetcher<>(uri, manifestDataSource,
-        parser);
-
-    Handler mainHandler = player.getMainHandler();
-    BandwidthMeter bandwidthMeter = player.getBandwidthMeter();
-    LoadControl loadControl = new DefaultLoadControl(
-        new DefaultAllocator(C.DEFAULT_BUFFER_SEGMENT_SIZE));
-    PtsTimestampAdjusterProvider timestampAdjusterProvider = new PtsTimestampAdjusterProvider();
-
-    DataSource defaultDataSource = dataSourceFactory.createDataSource(bandwidthMeter);
-    HlsChunkSource defaultChunkSource = new HlsChunkSource(manifestFetcher, C.TRACK_TYPE_DEFAULT,
-        defaultDataSource, timestampAdjusterProvider,
-        new FormatEvaluator.AdaptiveEvaluator(bandwidthMeter));
-    HlsSampleSource defaultSampleSource = new HlsSampleSource(defaultChunkSource, loadControl,
-        C.DEFAULT_MUXED_BUFFER_SIZE, mainHandler, player, C.TRACK_TYPE_VIDEO);
-
-    DataSource audioDataSource = dataSourceFactory.createDataSource(bandwidthMeter);
-    HlsChunkSource audioChunkSource = new HlsChunkSource(manifestFetcher, C.TRACK_TYPE_AUDIO,
-        audioDataSource, timestampAdjusterProvider, null);
-    HlsSampleSource audioSampleSource = new HlsSampleSource(audioChunkSource, loadControl,
-        C.DEFAULT_AUDIO_BUFFER_SIZE, mainHandler, player, C.TRACK_TYPE_AUDIO);
-
-    DataSource subtitleDataSource = dataSourceFactory.createDataSource(bandwidthMeter);
-    HlsChunkSource subtitleChunkSource = new HlsChunkSource(manifestFetcher, C.TRACK_TYPE_TEXT,
-        subtitleDataSource, timestampAdjusterProvider, null);
-    HlsSampleSource subtitleSampleSource = new HlsSampleSource(subtitleChunkSource, loadControl,
-        C.DEFAULT_TEXT_BUFFER_SIZE, mainHandler, player, C.TRACK_TYPE_TEXT);
-
-    return new MultiSampleSource(defaultSampleSource, audioSampleSource, subtitleSampleSource);
-  }
-
-  public static SampleSource buildExtractorSource(DemoPlayer player,
-      DataSourceFactory dataSourceFactory, Uri uri) {
-    Allocator allocator = new DefaultAllocator(C.DEFAULT_BUFFER_SEGMENT_SIZE);
-    DataSource dataSource = dataSourceFactory.createDataSource(player.getBandwidthMeter());
-    return new ExtractorSampleSource(uri, dataSource, allocator,
-        C.DEFAULT_MUXED_BUFFER_SIZE, player.getMainHandler(), player, 0);
-  }
-
-}

library/src/main/java/com/google/android/exoplayer/hls/HlsSampleSource.java

@@ -45,7 +45,7 @@ import java.util.List;
 /**
 /**
  * A {@link SampleSource} for HLS streams.
  * A {@link SampleSource} for HLS streams.
  */
  */
-public final class HlsSampleSource implements SampleSource, Loader.Callback {
+public final class HlsSampleSource implements Loader.Callback {
 
 
   /**
   /**
    * The default minimum number of times to retry loading data prior to failing.
    * The default minimum number of times to retry loading data prior to failing.
@@ -139,9 +139,6 @@ public final class HlsSampleSource implements SampleSource, Loader.Callback {
     pendingResetPositionUs = C.UNSET_TIME_US;
     pendingResetPositionUs = C.UNSET_TIME_US;
   }
   }
 
 
-  // SampleSource implementation.
-
-  @Override
   public boolean prepare(long positionUs) throws IOException {
   public boolean prepare(long positionUs) throws IOException {
     if (prepared) {
     if (prepared) {
       return true;
       return true;
@@ -173,17 +170,14 @@ public final class HlsSampleSource implements SampleSource, Loader.Callback {
     return false;
     return false;
   }
   }
 
 
-  @Override
   public long getDurationUs() {
   public long getDurationUs() {
     return chunkSource.getDurationUs();
     return chunkSource.getDurationUs();
   }
   }
 
 
-  @Override
   public TrackGroupArray getTrackGroups() {
   public TrackGroupArray getTrackGroups() {
     return trackGroups;
     return trackGroups;
   }
   }
 
 
-  @Override
   public TrackStream[] selectTracks(List<TrackStream> oldStreams,
   public TrackStream[] selectTracks(List<TrackStream> oldStreams,
       List<TrackSelection> newSelections, long positionUs) {
       List<TrackSelection> newSelections, long positionUs) {
     Assertions.checkState(prepared);
     Assertions.checkState(prepared);
@@ -233,7 +227,6 @@ public final class HlsSampleSource implements SampleSource, Loader.Callback {
     return newStreams;
     return newStreams;
   }
   }
 
 
-  @Override
   public void continueBuffering(long playbackPositionUs) {
   public void continueBuffering(long playbackPositionUs) {
     downstreamPositionUs = playbackPositionUs;
     downstreamPositionUs = playbackPositionUs;
     discardSamplesForDisabledTracks();
     discardSamplesForDisabledTracks();
@@ -242,7 +235,6 @@ public final class HlsSampleSource implements SampleSource, Loader.Callback {
     }
     }
   }
   }
 
 
-  @Override
   public long readReset() {
   public long readReset() {
     if (notifyReset) {
     if (notifyReset) {
       notifyReset = false;
       notifyReset = false;
@@ -251,7 +243,6 @@ public final class HlsSampleSource implements SampleSource, Loader.Callback {
     return C.UNSET_TIME_US;
     return C.UNSET_TIME_US;
   }
   }
 
 
-  @Override
   public long getBufferedPositionUs() {
   public long getBufferedPositionUs() {
     if (loadingFinished) {
     if (loadingFinished) {
       return C.END_OF_SOURCE_US;
       return C.END_OF_SOURCE_US;
@@ -273,12 +264,10 @@ public final class HlsSampleSource implements SampleSource, Loader.Callback {
     }
     }
   }
   }
 
 
-  @Override
   public void seekToUs(long positionUs) {
   public void seekToUs(long positionUs) {
     seekToInternal(positionUs);
     seekToInternal(positionUs);
   }
   }
 
 
-  @Override
   public void release() {
   public void release() {
     if (enabledTrackCount > 0) {
     if (enabledTrackCount > 0) {
       loadControl.unregister(this);
       loadControl.unregister(this);