Use public ad playback state when evaluating the public stream position

PiperOrigin-RevId: 781077925

Author: marcbaechinger

libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/ads/ServerSideAdInsertionUtil.java

@@ -84,35 +84,35 @@ public static AdPlaybackState addAdGroupToAdPlaybackState(
   }
 
   /**
-   * Returns the position in the underlying server-side inserted ads stream for the current playback
-   * position in the {@link Player}.
+   * Returns the position in the underlying server-side inserted ads stream of the given ads ID for
+   * the current playback position in the {@link Player}.
    *
    * @param player The {@link Player}.
-   * @param adPlaybackState The {@link AdPlaybackState} defining the ad groups.
+   * @param adsId The ads ID of the period for which to get the stream position.
    * @return The position in the underlying server-side inserted ads stream, in microseconds, or
    *     {@link C#TIME_UNSET} if it can't be determined.
    */
-  public static long getStreamPositionUs(Player player, AdPlaybackState adPlaybackState) {
+  public static long getStreamPositionUs(Player player, Object adsId) {
     Timeline timeline = player.getCurrentTimeline();
     if (timeline.isEmpty()) {
       return C.TIME_UNSET;
     }
     Timeline.Period period =
         timeline.getPeriod(player.getCurrentPeriodIndex(), new Timeline.Period());
-    if (!Objects.equals(period.getAdsId(), adPlaybackState.adsId)) {
+    if (!Objects.equals(period.getAdsId(), adsId)) {
       return C.TIME_UNSET;
     }
     if (player.isPlayingAd()) {
       int adGroupIndex = player.getCurrentAdGroupIndex();
       int adIndexInAdGroup = player.getCurrentAdIndexInAdGroup();
       long adPositionUs = Util.msToUs(player.getCurrentPosition());
       return getStreamPositionUsForAd(
-          adPositionUs, adGroupIndex, adIndexInAdGroup, adPlaybackState);
+          adPositionUs, adGroupIndex, adIndexInAdGroup, period.adPlaybackState);
     }
     long periodPositionUs =
         Util.msToUs(player.getCurrentPosition()) - period.getPositionInWindowUs();
     return getStreamPositionUsForContent(
-        periodPositionUs, /* nextAdGroupIndex= */ C.INDEX_UNSET, adPlaybackState);
+        periodPositionUs, /* nextAdGroupIndex= */ C.INDEX_UNSET, period.adPlaybackState);
   }
 
   /**

libraries/exoplayer_ima/src/main/java/androidx/media3/exoplayer/ima/ImaServerSideAdInsertionMediaSource.java

@@ -1358,7 +1358,9 @@ public VideoProgressUpdate getContentProgress() {
         AdPlaybackState adPlaybackState = checkNotNull(adPlaybackStates.get(contentPeriod.uid));
         // Calculate the stream position from the current position and the playback state.
         streamPositionMs =
-            usToMs(ServerSideAdInsertionUtil.getStreamPositionUs(player, adPlaybackState));
+            usToMs(
+                ServerSideAdInsertionUtil.getStreamPositionUs(
+                    player, checkNotNull(adPlaybackState.adsId)));
         if (window.windowStartTimeMs != C.TIME_UNSET) {
           // Add the time since epoch at start of the window for live streams.
           streamPositionMs += window.windowStartTimeMs + period.getPositionInWindowMs();