diff --git a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/ads/ServerSideInsertedAdsMediaSource.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/ads/ServerSideAdInsertionMediaSource.java similarity index 97% rename from libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/ads/ServerSideInsertedAdsMediaSource.java rename to libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/ads/ServerSideAdInsertionMediaSource.java index fd5c12921e..55708bb749 100644 --- a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/ads/ServerSideInsertedAdsMediaSource.java +++ b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/ads/ServerSideAdInsertionMediaSource.java @@ -18,11 +18,11 @@ package androidx.media3.exoplayer.source.ads; import static androidx.media3.common.util.Assertions.checkArgument; import static androidx.media3.common.util.Assertions.checkNotNull; import static androidx.media3.common.util.Util.castNonNull; -import static androidx.media3.exoplayer.source.ads.ServerSideInsertedAdsUtil.getAdCountInGroup; -import static androidx.media3.exoplayer.source.ads.ServerSideInsertedAdsUtil.getMediaPeriodPositionUs; -import static androidx.media3.exoplayer.source.ads.ServerSideInsertedAdsUtil.getMediaPeriodPositionUsForAd; -import static androidx.media3.exoplayer.source.ads.ServerSideInsertedAdsUtil.getMediaPeriodPositionUsForContent; -import static androidx.media3.exoplayer.source.ads.ServerSideInsertedAdsUtil.getStreamPositionUs; +import static androidx.media3.exoplayer.source.ads.ServerSideAdInsertionUtil.getAdCountInGroup; +import static androidx.media3.exoplayer.source.ads.ServerSideAdInsertionUtil.getMediaPeriodPositionUs; +import static androidx.media3.exoplayer.source.ads.ServerSideAdInsertionUtil.getMediaPeriodPositionUsForAd; +import static androidx.media3.exoplayer.source.ads.ServerSideAdInsertionUtil.getMediaPeriodPositionUsForContent; +import static androidx.media3.exoplayer.source.ads.ServerSideAdInsertionUtil.getStreamPositionUs; import android.os.Handler; import android.util.Pair; @@ -79,7 +79,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull; * playback. */ @UnstableApi -public final class ServerSideInsertedAdsMediaSource extends BaseMediaSource +public final class ServerSideAdInsertionMediaSource extends BaseMediaSource implements MediaSource.MediaSourceCaller, MediaSourceEventListener, DrmSessionEventListener { private final MediaSource mediaSource; @@ -102,7 +102,7 @@ public final class ServerSideInsertedAdsMediaSource extends BaseMediaSource */ // Calling BaseMediaSource.createEventDispatcher from the constructor. @SuppressWarnings("nullness:method.invocation") - public ServerSideInsertedAdsMediaSource(MediaSource mediaSource) { + public ServerSideAdInsertionMediaSource(MediaSource mediaSource) { this.mediaSource = mediaSource; mediaPeriods = ArrayListMultimap.create(); adPlaybackState = AdPlaybackState.NONE; @@ -151,7 +151,7 @@ public final class ServerSideInsertedAdsMediaSource extends BaseMediaSource this.adPlaybackState = adPlaybackState; if (contentTimeline != null) { refreshSourceInfo( - new ServerSideInsertedAdsTimeline(contentTimeline, adPlaybackState)); + new ServerSideAdInsertionTimeline(contentTimeline, adPlaybackState)); } }); } @@ -196,7 +196,7 @@ public final class ServerSideInsertedAdsMediaSource extends BaseMediaSource if (AdPlaybackState.NONE.equals(adPlaybackState)) { return; } - refreshSourceInfo(new ServerSideInsertedAdsTimeline(timeline, adPlaybackState)); + refreshSourceInfo(new ServerSideAdInsertionTimeline(timeline, adPlaybackState)); } @Override @@ -902,11 +902,11 @@ public final class ServerSideInsertedAdsMediaSource extends BaseMediaSource } } - private static final class ServerSideInsertedAdsTimeline extends ForwardingTimeline { + private static final class ServerSideAdInsertionTimeline extends ForwardingTimeline { private final AdPlaybackState adPlaybackState; - public ServerSideInsertedAdsTimeline( + public ServerSideAdInsertionTimeline( Timeline contentTimeline, AdPlaybackState adPlaybackState) { super(contentTimeline); Assertions.checkState(contentTimeline.getPeriodCount() == 1); diff --git a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/ads/ServerSideInsertedAdsUtil.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/ads/ServerSideAdInsertionUtil.java similarity index 99% rename from libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/ads/ServerSideInsertedAdsUtil.java rename to libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/ads/ServerSideAdInsertionUtil.java index c9a21d1706..796a1cec55 100644 --- a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/ads/ServerSideInsertedAdsUtil.java +++ b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/ads/ServerSideAdInsertionUtil.java @@ -29,9 +29,9 @@ import androidx.media3.exoplayer.source.MediaPeriod; /** A static utility class with methods to work with server-side inserted ads. */ @UnstableApi -public final class ServerSideInsertedAdsUtil { +public final class ServerSideAdInsertionUtil { - private ServerSideInsertedAdsUtil() {} + private ServerSideAdInsertionUtil() {} /** * Adds a new server-side inserted ad group to an {@link AdPlaybackState}. diff --git a/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/source/ads/ServerSideInsertedAdMediaSourceTest.java b/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/source/ads/ServerSideAdInsertionMediaSourceTest.java similarity index 96% rename from libraries/exoplayer/src/test/java/androidx/media3/exoplayer/source/ads/ServerSideInsertedAdMediaSourceTest.java rename to libraries/exoplayer/src/test/java/androidx/media3/exoplayer/source/ads/ServerSideAdInsertionMediaSourceTest.java index 44b7311e6d..ff99372c5d 100644 --- a/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/source/ads/ServerSideInsertedAdMediaSourceTest.java +++ b/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/source/ads/ServerSideAdInsertionMediaSourceTest.java @@ -15,7 +15,7 @@ */ package androidx.media3.exoplayer.source.ads; -import static androidx.media3.exoplayer.source.ads.ServerSideInsertedAdsUtil.addAdGroupToAdPlaybackState; +import static androidx.media3.exoplayer.source.ads.ServerSideAdInsertionUtil.addAdGroupToAdPlaybackState; import static androidx.media3.test.utils.robolectric.RobolectricUtil.runMainLooperUntil; import static androidx.media3.test.utils.robolectric.TestPlayerRunHelper.playUntilPosition; import static androidx.media3.test.utils.robolectric.TestPlayerRunHelper.runUntilPendingCommandsAreFullyHandled; @@ -55,9 +55,9 @@ import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; -/** Unit test for {@link ServerSideInsertedAdsMediaSource}. */ +/** Unit test for {@link ServerSideAdInsertionMediaSource}. */ @RunWith(AndroidJUnit4.class) -public final class ServerSideInsertedAdMediaSourceTest { +public final class ServerSideAdInsertionMediaSourceTest { @Rule public ShadowMediaCodecConfig mediaCodecConfig = @@ -81,8 +81,8 @@ public final class ServerSideInsertedAdMediaSourceTest { /* defaultPositionUs= */ 3_000_000, /* windowOffsetInFirstPeriodUs= */ 42_000_000L, AdPlaybackState.NONE)); - ServerSideInsertedAdsMediaSource mediaSource = - new ServerSideInsertedAdsMediaSource(new FakeMediaSource(wrappedTimeline)); + ServerSideAdInsertionMediaSource mediaSource = + new ServerSideAdInsertionMediaSource(new FakeMediaSource(wrappedTimeline)); // Test with one ad group before the window, and the window starting within the second ad group. AdPlaybackState adPlaybackState = new AdPlaybackState( @@ -153,8 +153,8 @@ public final class ServerSideInsertedAdMediaSourceTest { player.setVideoSurface(new Surface(new SurfaceTexture(/* texName= */ 1))); PlaybackOutput playbackOutput = PlaybackOutput.register(player, renderersFactory); - ServerSideInsertedAdsMediaSource mediaSource = - new ServerSideInsertedAdsMediaSource( + ServerSideAdInsertionMediaSource mediaSource = + new ServerSideAdInsertionMediaSource( new DefaultMediaSourceFactory(context) .createMediaSource(MediaItem.fromUri(TEST_ASSET))); AdPlaybackState adPlaybackState = new AdPlaybackState(/* adsId= */ new Object()); @@ -212,8 +212,8 @@ public final class ServerSideInsertedAdMediaSourceTest { player.setVideoSurface(new Surface(new SurfaceTexture(/* texName= */ 1))); PlaybackOutput playbackOutput = PlaybackOutput.register(player, renderersFactory); - ServerSideInsertedAdsMediaSource mediaSource = - new ServerSideInsertedAdsMediaSource( + ServerSideAdInsertionMediaSource mediaSource = + new ServerSideAdInsertionMediaSource( new DefaultMediaSourceFactory(context) .createMediaSource(MediaItem.fromUri(TEST_ASSET))); AdPlaybackState adPlaybackState = new AdPlaybackState(/* adsId= */ new Object()); @@ -272,8 +272,8 @@ public final class ServerSideInsertedAdMediaSourceTest { player.setVideoSurface(new Surface(new SurfaceTexture(/* texName= */ 1))); PlaybackOutput playbackOutput = PlaybackOutput.register(player, renderersFactory); - ServerSideInsertedAdsMediaSource mediaSource = - new ServerSideInsertedAdsMediaSource( + ServerSideAdInsertionMediaSource mediaSource = + new ServerSideAdInsertionMediaSource( new DefaultMediaSourceFactory(context) .createMediaSource(MediaItem.fromUri(TEST_ASSET))); AdPlaybackState adPlaybackState = new AdPlaybackState(/* adsId= */ new Object()); @@ -326,8 +326,8 @@ public final class ServerSideInsertedAdMediaSourceTest { new ExoPlayer.Builder(context).setClock(new FakeClock(/* isAutoAdvancing= */ true)).build(); player.setVideoSurface(new Surface(new SurfaceTexture(/* texName= */ 1))); - ServerSideInsertedAdsMediaSource mediaSource = - new ServerSideInsertedAdsMediaSource( + ServerSideAdInsertionMediaSource mediaSource = + new ServerSideAdInsertionMediaSource( new DefaultMediaSourceFactory(context) .createMediaSource(MediaItem.fromUri(TEST_ASSET))); AdPlaybackState adPlaybackState = new AdPlaybackState(/* adsId= */ new Object()); diff --git a/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/source/ads/ServerSideInsertedAdsUtilTest.java b/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/source/ads/ServerSideAdInsertionUtilTest.java similarity index 97% rename from libraries/exoplayer/src/test/java/androidx/media3/exoplayer/source/ads/ServerSideInsertedAdsUtilTest.java rename to libraries/exoplayer/src/test/java/androidx/media3/exoplayer/source/ads/ServerSideAdInsertionUtilTest.java index eecdaa3084..2453caa5f9 100644 --- a/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/source/ads/ServerSideInsertedAdsUtilTest.java +++ b/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/source/ads/ServerSideAdInsertionUtilTest.java @@ -15,12 +15,12 @@ */ package androidx.media3.exoplayer.source.ads; -import static androidx.media3.exoplayer.source.ads.ServerSideInsertedAdsUtil.addAdGroupToAdPlaybackState; -import static androidx.media3.exoplayer.source.ads.ServerSideInsertedAdsUtil.getAdCountInGroup; -import static androidx.media3.exoplayer.source.ads.ServerSideInsertedAdsUtil.getMediaPeriodPositionUsForAd; -import static androidx.media3.exoplayer.source.ads.ServerSideInsertedAdsUtil.getMediaPeriodPositionUsForContent; -import static androidx.media3.exoplayer.source.ads.ServerSideInsertedAdsUtil.getStreamPositionUsForAd; -import static androidx.media3.exoplayer.source.ads.ServerSideInsertedAdsUtil.getStreamPositionUsForContent; +import static androidx.media3.exoplayer.source.ads.ServerSideAdInsertionUtil.addAdGroupToAdPlaybackState; +import static androidx.media3.exoplayer.source.ads.ServerSideAdInsertionUtil.getAdCountInGroup; +import static androidx.media3.exoplayer.source.ads.ServerSideAdInsertionUtil.getMediaPeriodPositionUsForAd; +import static androidx.media3.exoplayer.source.ads.ServerSideAdInsertionUtil.getMediaPeriodPositionUsForContent; +import static androidx.media3.exoplayer.source.ads.ServerSideAdInsertionUtil.getStreamPositionUsForAd; +import static androidx.media3.exoplayer.source.ads.ServerSideAdInsertionUtil.getStreamPositionUsForContent; import static com.google.common.truth.Truth.assertThat; import androidx.media3.common.AdPlaybackState; @@ -29,9 +29,9 @@ import androidx.test.ext.junit.runners.AndroidJUnit4; import org.junit.Test; import org.junit.runner.RunWith; -/** Unit tests for {@link ServerSideInsertedAdsUtil}. */ +/** Unit tests for {@link ServerSideAdInsertionUtil}. */ @RunWith(AndroidJUnit4.class) -public final class ServerSideInsertedAdsUtilTest { +public final class ServerSideAdInsertionUtilTest { private static final Object ADS_ID = new Object();