Add positions and new reasons to onPositionDiscontinuity

PiperOrigin-RevId: 364861539

Author: marcbaechinger

RELEASENOTES.md

@@ -2,6 +2,17 @@
 
 ### dev-v2 (not yet released)
 
+*   Core Library:
+    *   Add position info of the old and the new position as arguments to
+        `EventListener.onPositionDiscontinuity`. Add the new reasons
+        `DISCONTINUITY_REASON_SKIP` and `DISCONTINUITY_REASON_REMOVE` and rename
+        `DISCONTINUITY_REASON_PERIOD_TRANSITION` to
+        `DISCONTINUITY_REASON_AUTO_TRANSITION`. Remove
+        `DISCONTINUITY_REASON_AD_INSERTION` for which
+        `DISCONTINUITY_REASON_AUTO_TRANSITION` is used instead. Deprecate the
+        `onPositionDiscontinuity(int)` callback
+        ([#6163](https://github.com/google/ExoPlayer/issues/6163),
+        [#4768](https://github.com/google/ExoPlayer/issues/4768)).
 *   UI:
     *   Add builder for `PlayerNotificationManager`.
     *   Add group setting to `PlayerNotificationManager`.

extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastPlayer.java

@@ -460,6 +460,7 @@ public void seekTo(int windowIndex, long positionMs) {
       pendingSeekCount++;
       pendingSeekWindowIndex = windowIndex;
       pendingSeekPositionMs = positionMs;
+      // TODO(b/181262841): call new onPositionDiscontinuity callback
       listeners.queueEvent(
           Player.EVENT_POSITION_DISCONTINUITY,
           listener -> listener.onPositionDiscontinuity(DISCONTINUITY_REASON_SEEK));
@@ -630,6 +631,8 @@ public long getContentBufferedPosition() {
 
   // Internal methods.
 
+  // Call deprecated callbacks.
+  @SuppressWarnings("deprecation")
   private void updateInternalStateAndNotifyIfChanged() {
     if (remoteMediaClient == null) {
       // There is no session. We leave the state of the player as it is now.
@@ -648,9 +651,10 @@ private void updateInternalStateAndNotifyIfChanged() {
     int currentWindowIndex = fetchCurrentWindowIndex(remoteMediaClient, currentTimeline);
     if (this.currentWindowIndex != currentWindowIndex && pendingSeekCount == 0) {
       this.currentWindowIndex = currentWindowIndex;
+      // TODO(b/181262841): call new onPositionDiscontinuity callback
       listeners.queueEvent(
           Player.EVENT_POSITION_DISCONTINUITY,
-          listener -> listener.onPositionDiscontinuity(DISCONTINUITY_REASON_PERIOD_TRANSITION));
+          listener -> listener.onPositionDiscontinuity(DISCONTINUITY_REASON_AUTO_TRANSITION));
       listeners.queueEvent(
           Player.EVENT_MEDIA_ITEM_TRANSITION,
           listener ->

extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/AdTagLoader.java

@@ -468,7 +468,10 @@ public void onTimelineChanged(Timeline timeline, @Player.TimelineChangeReason in
   }
 
   @Override
-  public void onPositionDiscontinuity(@Player.DiscontinuityReason int reason) {
+  public void onPositionDiscontinuity(
+      Player.PositionInfo oldPosition,
+      Player.PositionInfo newPosition,
+      @Player.DiscontinuityReason int reason) {
     handleTimelineOrPositionChanged();
   }
 

extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaAdsLoader.java

@@ -613,7 +613,10 @@ public void onTimelineChanged(Timeline timeline, @Player.TimelineChangeReason in
   }
 
   @Override
-  public void onPositionDiscontinuity(@Player.DiscontinuityReason int reason) {
+  public void onPositionDiscontinuity(
+      Player.PositionInfo oldPosition,
+      Player.PositionInfo newPosition,
+      @Player.DiscontinuityReason int reason) {
     maybeUpdateCurrentAdTagLoader();
     maybePreloadNextPeriodAds();
   }

extensions/ima/src/test/java/com/google/android/exoplayer2/ext/ima/FakePlayer.java

@@ -29,6 +29,8 @@
 
   private final ListenerSet<EventListener> listeners;
   private final Timeline.Period period;
+  private final Object windowUid = new Object();
+  private final Object periodUid = new Object();
 
   private Timeline timeline;
   @Player.State private int state;
@@ -65,16 +67,38 @@ public void updateTimeline(Timeline timeline, @TimelineChangeReason int reason)
    */
   public void setPlayingContentPosition(int periodIndex, long positionMs) {
     boolean notify = isPlayingAd;
+    PositionInfo oldPosition =
+        new PositionInfo(
+            windowUid,
+            /* windowIndex= */ 0,
+            periodUid,
+            /* periodIndex= */ 0,
+            this.positionMs,
+            this.contentPositionMs,
+            this.adGroupIndex,
+            this.adIndexInAdGroup);
     isPlayingAd = false;
     adGroupIndex = C.INDEX_UNSET;
     adIndexInAdGroup = C.INDEX_UNSET;
     this.periodIndex = periodIndex;
     this.positionMs = positionMs;
     contentPositionMs = positionMs;
     if (notify) {
+      PositionInfo newPosition =
+          new PositionInfo(
+              windowUid,
+              /* windowIndex= */ 0,
+              periodUid,
+              /* periodIndex= */ 0,
+              positionMs,
+              this.contentPositionMs,
+              this.adGroupIndex,
+              this.adIndexInAdGroup);
       listeners.sendEvent(
           Player.EVENT_POSITION_DISCONTINUITY,
-          listener -> listener.onPositionDiscontinuity(DISCONTINUITY_REASON_AD_INSERTION));
+          listener ->
+              listener.onPositionDiscontinuity(
+                  oldPosition, newPosition, DISCONTINUITY_REASON_AUTO_TRANSITION));
     }
   }
 
@@ -90,16 +114,38 @@ public void setPlayingAdPosition(
       long positionMs,
       long contentPositionMs) {
     boolean notify = !isPlayingAd || this.adIndexInAdGroup != adIndexInAdGroup;
+    PositionInfo oldPosition =
+        new PositionInfo(
+            windowUid,
+            /* windowIndex= */ 0,
+            periodUid,
+            /* periodIndex= */ 0,
+            this.positionMs,
+            this.contentPositionMs,
+            this.adGroupIndex,
+            this.adIndexInAdGroup);
     isPlayingAd = true;
     this.periodIndex = periodIndex;
     this.adGroupIndex = adGroupIndex;
     this.adIndexInAdGroup = adIndexInAdGroup;
     this.positionMs = positionMs;
     this.contentPositionMs = contentPositionMs;
     if (notify) {
+      PositionInfo newPosition =
+          new PositionInfo(
+              windowUid,
+              /* windowIndex= */ 0,
+              periodUid,
+              /* periodIndex= */ 0,
+              positionMs,
+              contentPositionMs,
+              adGroupIndex,
+              adIndexInAdGroup);
       listeners.sendEvent(
           EVENT_POSITION_DISCONTINUITY,
-          listener -> listener.onPositionDiscontinuity(DISCONTINUITY_REASON_AD_INSERTION));
+          listener ->
+              listener.onPositionDiscontinuity(
+                  oldPosition, newPosition, DISCONTINUITY_REASON_AUTO_TRANSITION));
     }
   }
 

extensions/ima/src/test/java/com/google/android/exoplayer2/ext/ima/ImaAdsLoaderTest.java

@@ -281,7 +281,26 @@ public void startAndCallbacksAfterRelease() {
     videoAdPlayer.pauseAd(TEST_AD_MEDIA_INFO);
     videoAdPlayer.stopAd(TEST_AD_MEDIA_INFO);
     imaAdsLoader.onPlayerError(ExoPlaybackException.createForSource(new IOException()));
-    imaAdsLoader.onPositionDiscontinuity(Player.DISCONTINUITY_REASON_SEEK);
+    imaAdsLoader.onPositionDiscontinuity(
+        new Player.PositionInfo(
+            /* windowUid= */ new Object(),
+            /* windowIndex= */ 0,
+            /* periodUid= */ new Object(),
+            /* periodIndex= */ 0,
+            /* positionMs= */ 10_000,
+            /* contentPositionMs= */ 0,
+            /* adGroupIndex= */ -1,
+            /* adIndexInAdGroup= */ -1),
+        new Player.PositionInfo(
+            /* windowUid= */ new Object(),
+            /* windowIndex= */ 1,
+            /* periodUid= */ new Object(),
+            /* periodIndex= */ 0,
+            /* positionMs= */ 20_000,
+            /* contentPositionMs= */ 0,
+            /* adGroupIndex= */ -1,
+            /* adIndexInAdGroup= */ -1),
+        Player.DISCONTINUITY_REASON_SEEK);
     adEventListener.onAdEvent(getAdEvent(AdEventType.CONTENT_RESUME_REQUESTED, /* ad= */ null));
     imaAdsLoader.handlePrepareError(
         adsMediaSource, /* adGroupIndex= */ 0, /* adIndexInAdGroup= */ 0, new IOException());

extensions/leanback/src/main/java/com/google/android/exoplayer2/ext/leanback/LeanbackPlayerAdapter.java

@@ -306,7 +306,10 @@ public void onTimelineChanged(Timeline timeline, @TimelineChangeReason int reaso
     }
 
     @Override
-    public void onPositionDiscontinuity(@DiscontinuityReason int reason) {
+    public void onPositionDiscontinuity(
+        Player.PositionInfo oldPosition,
+        Player.PositionInfo newPosition,
+        @DiscontinuityReason int reason) {
       Callback callback = getCallback();
       callback.onCurrentPositionChanged(LeanbackPlayerAdapter.this);
       callback.onBufferedPositionChanged(LeanbackPlayerAdapter.this);

extensions/media2/src/main/java/com/google/android/exoplayer2/ext/media2/PlayerWrapper.java

@@ -437,7 +437,7 @@ private void handlePlayerStateChanged() {
       case Player.STATE_READY:
         if (!prepared) {
           prepared = true;
-          handlePositionDiscontinuity(Player.DISCONTINUITY_REASON_PERIOD_TRANSITION);
+          handlePositionDiscontinuity(Player.DISCONTINUITY_REASON_AUTO_TRANSITION);
           listener.onPrepared(
               Assertions.checkNotNull(getCurrentMediaItem()), player.getBufferedPercentage());
         }
@@ -517,9 +517,11 @@ private void handlePositionDiscontinuity(@Player.DiscontinuityReason int reason)
     int currentWindowIndex = getCurrentMediaItemIndex();
     if (this.currentWindowIndex != currentWindowIndex) {
       this.currentWindowIndex = currentWindowIndex;
-      androidx.media2.common.MediaItem currentMediaItem =
-          Assertions.checkNotNull(getCurrentMediaItem());
-      listener.onCurrentMediaItemChanged(currentMediaItem);
+      if (currentWindowIndex != C.INDEX_UNSET) {
+        androidx.media2.common.MediaItem currentMediaItem =
+            Assertions.checkNotNull(getCurrentMediaItem());
+        listener.onCurrentMediaItemChanged(currentMediaItem);
+      }
     } else {
       listener.onSeekCompleted();
     }
@@ -597,7 +599,10 @@ public void onPlaybackStateChanged(@Player.State int state) {
     }
 
     @Override
-    public void onPositionDiscontinuity(@Player.DiscontinuityReason int reason) {
+    public void onPositionDiscontinuity(
+        Player.PositionInfo oldPosition,
+        Player.PositionInfo newPosition,
+        @Player.DiscontinuityReason int reason) {
       handlePositionDiscontinuity(reason);
     }