Fix build

10b24be6 · Oliver Woodman · e759462a · 10b24be6 · 10b24be6 · 10b24be6
Commit 10b24be6 authored Dec 12, 2017 by Oliver Woodman
Showing with 34 additions and 45 deletions
library/core/src/main/java/com/google/android/exoplayer2/source/DeferredMediaPeriod.java
library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaSource.java
library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaSource.java
library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaSource.java
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/DeferredMediaPeriod.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/DeferredMediaPeriod.java
@@ -95,8 +95,8 @@ public final class DeferredMediaPeriod implements MediaPeriod, MediaPeriod.Callb
  }
  @Override
-  public void discardBuffer(long positionUs, boolean toKeyframe) {
+  public void discardBuffer(long positionUs) {
-    mediaPeriod.discardBuffer(positionUs, toKeyframe);
+    mediaPeriod.discardBuffer(positionUs);
  }
  @Override

--- a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaSource.java
+++ b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaSource.java
@@ -26,9 +26,9 @@ import com.google.android.exoplayer2.ExoPlayer;
 import com.google.android.exoplayer2.ExoPlayerLibraryInfo;
 import com.google.android.exoplayer2.ParserException;
 import com.google.android.exoplayer2.Timeline;
-import com.google.android.exoplayer2.source.AdaptiveMediaSourceEventListener;
 import com.google.android.exoplayer2.source.MediaPeriod;
 import com.google.android.exoplayer2.source.MediaSource;
+import com.google.android.exoplayer2.source.MediaSourceEventListener;
 import com.google.android.exoplayer2.source.MediaSourceEventListener.EventDispatcher;
 import com.google.android.exoplayer2.source.dash.manifest.DashManifest;
 import com.google.android.exoplayer2.source.dash.manifest.DashManifestParser;
@@ -69,7 +69,7 @@ public final class DashMediaSource implements MediaSource {
    private final DashChunkSource.Factory chunkSourceFactory;
    private ParsingLoadable.Parser<? extends DashManifest> manifestParser;
-    private AdaptiveMediaSourceEventListener eventListener;
+    private MediaSourceEventListener eventListener;
    private Handler eventHandler;
    private int minLoadableRetryCount;
@@ -151,8 +151,7 @@ public final class DashMediaSource implements MediaSource {
     * @param eventListener A listener of events.
     * @return This builder.
     */
-    public Builder setEventListener(Handler eventHandler,
+    public Builder setEventListener(Handler eventHandler, MediaSourceEventListener eventListener) {
-        AdaptiveMediaSourceEventListener eventListener) {
      this.eventHandler = eventHandler;
      this.eventListener = eventListener;
      return this;
@@ -261,7 +260,7 @@ public final class DashMediaSource implements MediaSource {
   */
  @Deprecated
  public DashMediaSource(DashManifest manifest, DashChunkSource.Factory chunkSourceFactory,
-      Handler eventHandler, AdaptiveMediaSourceEventListener eventListener) {
+      Handler eventHandler, MediaSourceEventListener eventListener) {
    this(manifest, chunkSourceFactory, DEFAULT_MIN_LOADABLE_RETRY_COUNT, eventHandler,
        eventListener);
  }
@@ -278,8 +277,7 @@ public final class DashMediaSource implements MediaSource {
   */
  @Deprecated
  public DashMediaSource(DashManifest manifest, DashChunkSource.Factory chunkSourceFactory,
-      int minLoadableRetryCount, Handler eventHandler, AdaptiveMediaSourceEventListener
+      int minLoadableRetryCount, Handler eventHandler, MediaSourceEventListener eventListener) {
-      eventListener) {
    this(manifest, null, null, null, chunkSourceFactory, minLoadableRetryCount,
        DEFAULT_LIVE_PRESENTATION_DELAY_PREFER_MANIFEST_MS, eventHandler, eventListener);
  }
@@ -299,7 +297,7 @@ public final class DashMediaSource implements MediaSource {
  @Deprecated
  public DashMediaSource(Uri manifestUri, DataSource.Factory manifestDataSourceFactory,
      DashChunkSource.Factory chunkSourceFactory, Handler eventHandler,
-      AdaptiveMediaSourceEventListener eventListener) {
+      MediaSourceEventListener eventListener) {
    this(manifestUri, manifestDataSourceFactory, chunkSourceFactory,
        DEFAULT_MIN_LOADABLE_RETRY_COUNT, DEFAULT_LIVE_PRESENTATION_DELAY_PREFER_MANIFEST_MS,
        eventHandler, eventListener);
@@ -325,8 +323,7 @@ public final class DashMediaSource implements MediaSource {
  @Deprecated
  public DashMediaSource(Uri manifestUri, DataSource.Factory manifestDataSourceFactory,
      DashChunkSource.Factory chunkSourceFactory, int minLoadableRetryCount,
-      long livePresentationDelayMs, Handler eventHandler,
+      long livePresentationDelayMs, Handler eventHandler, MediaSourceEventListener eventListener) {
-      AdaptiveMediaSourceEventListener eventListener) {
    this(manifestUri, manifestDataSourceFactory, new DashManifestParser(), chunkSourceFactory,
        minLoadableRetryCount, livePresentationDelayMs, eventHandler, eventListener);
  }
@@ -353,8 +350,7 @@ public final class DashMediaSource implements MediaSource {
  public DashMediaSource(Uri manifestUri, DataSource.Factory manifestDataSourceFactory,
      ParsingLoadable.Parser<? extends DashManifest> manifestParser,
      DashChunkSource.Factory chunkSourceFactory, int minLoadableRetryCount,
-      long livePresentationDelayMs, Handler eventHandler,
+      long livePresentationDelayMs, Handler eventHandler, MediaSourceEventListener eventListener) {
-      AdaptiveMediaSourceEventListener eventListener) {
    this(null, manifestUri, manifestDataSourceFactory, manifestParser, chunkSourceFactory,
        minLoadableRetryCount, livePresentationDelayMs, eventHandler, eventListener);
  }
@@ -363,8 +359,7 @@ public final class DashMediaSource implements MediaSource {
      DataSource.Factory manifestDataSourceFactory,
      ParsingLoadable.Parser<? extends DashManifest> manifestParser,
      DashChunkSource.Factory chunkSourceFactory, int minLoadableRetryCount,
-      long livePresentationDelayMs, Handler eventHandler,
+      long livePresentationDelayMs, Handler eventHandler, MediaSourceEventListener eventListener) {
-      AdaptiveMediaSourceEventListener eventListener) {
    this.manifest = manifest;
    this.manifestUri = manifestUri;
    this.manifestDataSourceFactory = manifestDataSourceFactory;

--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaSource.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaSource.java
@@ -21,9 +21,9 @@ import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.ExoPlayer;
 import com.google.android.exoplayer2.ExoPlayerLibraryInfo;
 import com.google.android.exoplayer2.extractor.Extractor;
-import com.google.android.exoplayer2.source.AdaptiveMediaSourceEventListener;
 import com.google.android.exoplayer2.source.MediaPeriod;
 import com.google.android.exoplayer2.source.MediaSource;
+import com.google.android.exoplayer2.source.MediaSourceEventListener;
 import com.google.android.exoplayer2.source.MediaSourceEventListener.EventDispatcher;
 import com.google.android.exoplayer2.source.SinglePeriodTimeline;
 import com.google.android.exoplayer2.source.hls.playlist.HlsMediaPlaylist;
@@ -57,7 +57,7 @@ public final class HlsMediaSource implements MediaSource,
    private HlsExtractorFactory extractorFactory;
    private ParsingLoadable.Parser<HlsPlaylist> playlistParser;
-    private AdaptiveMediaSourceEventListener eventListener;
+    private MediaSourceEventListener eventListener;
    private Handler eventHandler;
    private int minLoadableRetryCount;
    private boolean isBuildCalled;
@@ -132,7 +132,7 @@ public final class HlsMediaSource implements MediaSource,
     * @return This builder.
     */
    public Builder setEventListener(Handler eventHandler,
-        AdaptiveMediaSourceEventListener eventListener) {
+        MediaSourceEventListener eventListener) {
      this.eventHandler = eventHandler;
      this.eventListener = eventListener;
      return this;
@@ -193,13 +193,13 @@ public final class HlsMediaSource implements MediaSource,
   * @param dataSourceFactory An {@link HlsDataSourceFactory} for {@link DataSource}s for manifests,
   *     segments and keys.
   * @param eventHandler A handler for events. May be null if delivery of events is not required.
-   * @param eventListener An {@link AdaptiveMediaSourceEventListener}. May be null if delivery of
+   * @param eventListener An {@link MediaSourceEventListener}. May be null if delivery of events is
-   *     events is not required.
+   *     not required.
   * @deprecated Use {@link Builder} instead.
   */
  @Deprecated
  public HlsMediaSource(Uri manifestUri, DataSource.Factory dataSourceFactory, Handler eventHandler,
-      AdaptiveMediaSourceEventListener eventListener) {
+      MediaSourceEventListener eventListener) {
    this(manifestUri, dataSourceFactory, DEFAULT_MIN_LOADABLE_RETRY_COUNT, eventHandler,
        eventListener);
  }
@@ -211,14 +211,13 @@ public final class HlsMediaSource implements MediaSource,
   * @param minLoadableRetryCount The minimum number of times loads must be retried before
   *     errors are propagated.
   * @param eventHandler A handler for events. May be null if delivery of events is not required.
-   * @param eventListener An {@link AdaptiveMediaSourceEventListener}. May be null if delivery of
+   * @param eventListener An {@link MediaSourceEventListener}. May be null if delivery of events is
-   *     events is not required.
+   *     not required.
   * @deprecated Use {@link Builder} instead.
   */
  @Deprecated
  public HlsMediaSource(Uri manifestUri, DataSource.Factory dataSourceFactory,
-      int minLoadableRetryCount, Handler eventHandler,
+      int minLoadableRetryCount, Handler eventHandler, MediaSourceEventListener eventListener) {
-      AdaptiveMediaSourceEventListener eventListener) {
    this(manifestUri, new DefaultHlsDataSourceFactory(dataSourceFactory),
        HlsExtractorFactory.DEFAULT, minLoadableRetryCount, eventHandler, eventListener,
        new HlsPlaylistParser());
@@ -232,16 +231,15 @@ public final class HlsMediaSource implements MediaSource,
   * @param minLoadableRetryCount The minimum number of times loads must be retried before
   *     errors are propagated.
   * @param eventHandler A handler for events. May be null if delivery of events is not required.
-   * @param eventListener An {@link AdaptiveMediaSourceEventListener}. May be null if delivery of
+   * @param eventListener An {@link MediaSourceEventListener}. May be null if delivery of events is
-   *     events is not required.
+   *     not required.
   * @param playlistParser A {@link ParsingLoadable.Parser} for HLS playlists.
   * @deprecated Use {@link Builder} instead.
   */
  @Deprecated
  public HlsMediaSource(Uri manifestUri, HlsDataSourceFactory dataSourceFactory,
      HlsExtractorFactory extractorFactory, int minLoadableRetryCount, Handler eventHandler,
-      AdaptiveMediaSourceEventListener eventListener,
+      MediaSourceEventListener eventListener, ParsingLoadable.Parser<HlsPlaylist> playlistParser) {
-      ParsingLoadable.Parser<HlsPlaylist> playlistParser) {
    this.manifestUri = manifestUri;
    this.dataSourceFactory = dataSourceFactory;
    this.extractorFactory = extractorFactory;

--- a/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaSource.java
+++ b/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaSource.java
@@ -24,9 +24,9 @@ import com.google.android.exoplayer2.ExoPlayer;
 import com.google.android.exoplayer2.ExoPlayerLibraryInfo;
 import com.google.android.exoplayer2.ParserException;
 import com.google.android.exoplayer2.Timeline;
-import com.google.android.exoplayer2.source.AdaptiveMediaSourceEventListener;
 import com.google.android.exoplayer2.source.MediaPeriod;
 import com.google.android.exoplayer2.source.MediaSource;
+import com.google.android.exoplayer2.source.MediaSourceEventListener;
 import com.google.android.exoplayer2.source.MediaSourceEventListener.EventDispatcher;
 import com.google.android.exoplayer2.source.SinglePeriodTimeline;
 import com.google.android.exoplayer2.source.smoothstreaming.manifest.SsManifest;
@@ -63,7 +63,7 @@ public final class SsMediaSource implements MediaSource,
    private final SsChunkSource.Factory chunkSourceFactory;
    private ParsingLoadable.Parser<? extends SsManifest> manifestParser;
-    private AdaptiveMediaSourceEventListener eventListener;
+    private MediaSourceEventListener eventListener;
    private Handler eventHandler;
    private int minLoadableRetryCount;
@@ -143,8 +143,7 @@ public final class SsMediaSource implements MediaSource,
     * @param eventListener A listener of events.
     * @return This builder.
     */
-    public Builder setEventListener(Handler eventHandler,
+    public Builder setEventListener(Handler eventHandler, MediaSourceEventListener eventListener) {
-        AdaptiveMediaSourceEventListener eventListener) {
      this.eventHandler = eventHandler;
      this.eventListener = eventListener;
      return this;
@@ -233,9 +232,9 @@ public final class SsMediaSource implements MediaSource,
   */
  @Deprecated
  public SsMediaSource(SsManifest manifest, SsChunkSource.Factory chunkSourceFactory,
-      Handler eventHandler, AdaptiveMediaSourceEventListener eventListener) {
+      Handler eventHandler, MediaSourceEventListener eventListener) {
-    this(manifest, chunkSourceFactory, DEFAULT_MIN_LOADABLE_RETRY_COUNT,
+    this(manifest, chunkSourceFactory, DEFAULT_MIN_LOADABLE_RETRY_COUNT, eventHandler,
-        eventHandler, eventListener);
+        eventListener);
  }
  /**
@@ -250,8 +249,7 @@ public final class SsMediaSource implements MediaSource,
   */
  @Deprecated
  public SsMediaSource(SsManifest manifest, SsChunkSource.Factory chunkSourceFactory,
-      int minLoadableRetryCount, Handler eventHandler,
+      int minLoadableRetryCount, Handler eventHandler, MediaSourceEventListener eventListener) {
-      AdaptiveMediaSourceEventListener eventListener) {
    this(manifest, null, null, null, chunkSourceFactory, minLoadableRetryCount,
        DEFAULT_LIVE_PRESENTATION_DELAY_MS, eventHandler, eventListener);
  }
@@ -271,7 +269,7 @@ public final class SsMediaSource implements MediaSource,
  @Deprecated
  public SsMediaSource(Uri manifestUri, DataSource.Factory manifestDataSourceFactory,
      SsChunkSource.Factory chunkSourceFactory, Handler eventHandler,
-      AdaptiveMediaSourceEventListener eventListener) {
+      MediaSourceEventListener eventListener) {
    this(manifestUri, manifestDataSourceFactory, chunkSourceFactory,
        DEFAULT_MIN_LOADABLE_RETRY_COUNT, DEFAULT_LIVE_PRESENTATION_DELAY_MS, eventHandler,
        eventListener);
@@ -295,8 +293,7 @@ public final class SsMediaSource implements MediaSource,
  @Deprecated
  public SsMediaSource(Uri manifestUri, DataSource.Factory manifestDataSourceFactory,
      SsChunkSource.Factory chunkSourceFactory, int minLoadableRetryCount,
-      long livePresentationDelayMs, Handler eventHandler,
+      long livePresentationDelayMs, Handler eventHandler, MediaSourceEventListener eventListener) {
-      AdaptiveMediaSourceEventListener eventListener) {
    this(manifestUri, manifestDataSourceFactory, new SsManifestParser(), chunkSourceFactory,
        minLoadableRetryCount, livePresentationDelayMs, eventHandler, eventListener);
  }
@@ -321,8 +318,7 @@ public final class SsMediaSource implements MediaSource,
  public SsMediaSource(Uri manifestUri, DataSource.Factory manifestDataSourceFactory,
      ParsingLoadable.Parser<? extends SsManifest> manifestParser,
      SsChunkSource.Factory chunkSourceFactory, int minLoadableRetryCount,
-      long livePresentationDelayMs, Handler eventHandler,
+      long livePresentationDelayMs, Handler eventHandler, MediaSourceEventListener eventListener) {
-      AdaptiveMediaSourceEventListener eventListener) {
    this(null, manifestUri, manifestDataSourceFactory, manifestParser, chunkSourceFactory,
        minLoadableRetryCount, livePresentationDelayMs, eventHandler, eventListener);
  }
@@ -332,7 +328,7 @@ public final class SsMediaSource implements MediaSource,
      ParsingLoadable.Parser<? extends SsManifest> manifestParser,
      SsChunkSource.Factory chunkSourceFactory, int minLoadableRetryCount,
      long livePresentationDelayMs, Handler eventHandler,
-      AdaptiveMediaSourceEventListener eventListener) {
+      MediaSourceEventListener eventListener) {
    Assertions.checkState(manifest == null || !manifest.isLive);
    this.manifest = manifest;
    this.manifestUri = manifestUri == null ? null