Migrate usages of MediaItem.ClippingProperties to ClippingConfiguration

PiperOrigin-RevId: 399471555

demos/main/src/main/java/com/google/android/exoplayer2/demo/IntentUtil.java

@@ -94,8 +94,8 @@ public class IntentUtil {
         intent.putExtra(TITLE_EXTRA, mediaItem.mediaMetadata.title);
       }
       addPlaybackPropertiesToIntent(localConfiguration, intent, /* extrasKeySuffix= */ "");
-      addClippingPropertiesToIntent(
-          mediaItem.clippingProperties, intent, /* extrasKeySuffix= */ "");
+      addClippingConfigurationToIntent(
+          mediaItem.clippingConfiguration, intent, /* extrasKeySuffix= */ "");
     } else {
       intent.setAction(ACTION_VIEW_LIST);
       for (int i = 0; i < mediaItems.size(); i++) {
@@ -104,8 +104,8 @@ public class IntentUtil {
             checkNotNull(mediaItem.localConfiguration);
         intent.putExtra(URI_EXTRA + ("_" + i), localConfiguration.uri.toString());
         addPlaybackPropertiesToIntent(localConfiguration, intent, /* extrasKeySuffix= */ "_" + i);
-        addClippingPropertiesToIntent(
-            mediaItem.clippingProperties, intent, /* extrasKeySuffix= */ "_" + i);
+        addClippingConfigurationToIntent(
+            mediaItem.clippingConfiguration, intent, /* extrasKeySuffix= */ "_" + i);
         if (mediaItem.mediaMetadata.title != null) {
           intent.putExtra(TITLE_EXTRA + ("_" + i), mediaItem.mediaMetadata.title);
         }
@@ -236,15 +236,17 @@ public class IntentUtil {
     }
   }
 
-  private static void addClippingPropertiesToIntent(
-      MediaItem.ClippingProperties clippingProperties, Intent intent, String extrasKeySuffix) {
-    if (clippingProperties.startPositionMs != 0) {
+  private static void addClippingConfigurationToIntent(
+      MediaItem.ClippingConfiguration clippingConfiguration,
+      Intent intent,
+      String extrasKeySuffix) {
+    if (clippingConfiguration.startPositionMs != 0) {
       intent.putExtra(
-          CLIP_START_POSITION_MS_EXTRA + extrasKeySuffix, clippingProperties.startPositionMs);
+          CLIP_START_POSITION_MS_EXTRA + extrasKeySuffix, clippingConfiguration.startPositionMs);
     }
-    if (clippingProperties.endPositionMs != C.TIME_END_OF_SOURCE) {
+    if (clippingConfiguration.endPositionMs != C.TIME_END_OF_SOURCE) {
       intent.putExtra(
-          CLIP_END_POSITION_MS_EXTRA + extrasKeySuffix, clippingProperties.endPositionMs);
+          CLIP_END_POSITION_MS_EXTRA + extrasKeySuffix, clippingConfiguration.endPositionMs);
     }
   }
 }

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

@@ -105,8 +105,8 @@ public class DefaultMediaItemConverter implements MediaItemConverter {
     }
 
     androidx.media2.common.MediaMetadata metadata = getMetadata(exoPlayerMediaItem);
-    long startPositionMs = exoPlayerMediaItem.clippingProperties.startPositionMs;
-    long endPositionMs = exoPlayerMediaItem.clippingProperties.endPositionMs;
+    long startPositionMs = exoPlayerMediaItem.clippingConfiguration.startPositionMs;
+    long endPositionMs = exoPlayerMediaItem.clippingConfiguration.endPositionMs;
     if (endPositionMs == C.TIME_END_OF_SOURCE) {
       endPositionMs = androidx.media2.common.MediaItem.POSITION_UNKNOWN;
     }

library/core/src/androidTest/java/com/google/android/exoplayer2/ClippedPlaybackTest.java

@@ -33,8 +33,8 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 
 /**
- * Instrumentation tests for playback of clipped items using {@link MediaItem#clippingProperties} or
- * {@link ClippingMediaSource} directly.
+ * Instrumentation tests for playback of clipped items using {@link MediaItem#clippingConfiguration}
+ * or {@link ClippingMediaSource} directly.
  */
 @RunWith(AndroidJUnit4.class)
 public final class ClippedPlaybackTest {

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

@@ -419,18 +419,18 @@ public final class DefaultMediaSourceFactory implements MediaSourceFactory {
   // internal methods
 
   private static MediaSource maybeClipMediaSource(MediaItem mediaItem, MediaSource mediaSource) {
-    if (mediaItem.clippingProperties.startPositionMs == 0
-        && mediaItem.clippingProperties.endPositionMs == C.TIME_END_OF_SOURCE
-        && !mediaItem.clippingProperties.relativeToDefaultPosition) {
+    if (mediaItem.clippingConfiguration.startPositionMs == 0
+        && mediaItem.clippingConfiguration.endPositionMs == C.TIME_END_OF_SOURCE
+        && !mediaItem.clippingConfiguration.relativeToDefaultPosition) {
       return mediaSource;
     }
     return new ClippingMediaSource(
         mediaSource,
-        C.msToUs(mediaItem.clippingProperties.startPositionMs),
-        C.msToUs(mediaItem.clippingProperties.endPositionMs),
-        /* enableInitialDiscontinuity= */ !mediaItem.clippingProperties.startsAtKeyFrame,
-        /* allowDynamicClippingUpdates= */ mediaItem.clippingProperties.relativeToLiveWindow,
-        mediaItem.clippingProperties.relativeToDefaultPosition);
+        C.msToUs(mediaItem.clippingConfiguration.startPositionMs),
+        C.msToUs(mediaItem.clippingConfiguration.endPositionMs),
+        /* enableInitialDiscontinuity= */ !mediaItem.clippingConfiguration.startsAtKeyFrame,
+        /* allowDynamicClippingUpdates= */ mediaItem.clippingConfiguration.relativeToLiveWindow,
+        mediaItem.clippingConfiguration.relativeToDefaultPosition);
   }
 
   private MediaSource maybeWrapWithAdsMediaSource(MediaItem mediaItem, MediaSource mediaSource) {