From b2a673d521cae44496d32653c9fff4cb10d18ea6 Mon Sep 17 00:00:00 2001 From: tianyifeng Date: Sat, 9 Dec 2023 13:37:25 -0800 Subject: [PATCH] Move preload components to `androidx.media3.exoplayer.source.preload` PiperOrigin-RevId: 589455479 --- .../demo/shortform/MediaSourceManager.kt | 2 +- .../{ => preload}/PreloadMediaPeriod.java | 5 ++++- .../{ => preload}/PreloadMediaSource.java | 6 +++++- .../source/preload/package-info.java | 19 +++++++++++++++++++ .../PreloadAndPlaybackCoordinationTest.java | 4 +++- .../{ => preload}/PreloadMediaPeriodTest.java | 8 +++++++- .../{ => preload}/PreloadMediaSourceTest.java | 5 ++++- 7 files changed, 43 insertions(+), 6 deletions(-) rename libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/{ => preload}/PreloadMediaPeriod.java (97%) rename libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/{ => preload}/PreloadMediaSource.java (98%) create mode 100644 libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/preload/package-info.java rename libraries/exoplayer/src/test/java/androidx/media3/exoplayer/source/{ => preload}/PreloadAndPlaybackCoordinationTest.java (98%) rename libraries/exoplayer/src/test/java/androidx/media3/exoplayer/source/{ => preload}/PreloadMediaPeriodTest.java (98%) rename libraries/exoplayer/src/test/java/androidx/media3/exoplayer/source/{ => preload}/PreloadMediaSourceTest.java (99%) diff --git a/demos/shortform/src/main/java/androidx/media3/demo/shortform/MediaSourceManager.kt b/demos/shortform/src/main/java/androidx/media3/demo/shortform/MediaSourceManager.kt index 63b17d7392..44485ac363 100644 --- a/demos/shortform/src/main/java/androidx/media3/demo/shortform/MediaSourceManager.kt +++ b/demos/shortform/src/main/java/androidx/media3/demo/shortform/MediaSourceManager.kt @@ -29,7 +29,7 @@ import androidx.media3.exoplayer.RenderersFactory import androidx.media3.exoplayer.analytics.PlayerId import androidx.media3.exoplayer.audio.AudioRendererEventListener import androidx.media3.exoplayer.source.MediaSource -import androidx.media3.exoplayer.source.PreloadMediaSource +import androidx.media3.exoplayer.source.preload.PreloadMediaSource import androidx.media3.exoplayer.trackselection.TrackSelector import androidx.media3.exoplayer.upstream.Allocator import androidx.media3.exoplayer.upstream.BandwidthMeter diff --git a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/PreloadMediaPeriod.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/preload/PreloadMediaPeriod.java similarity index 97% rename from libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/PreloadMediaPeriod.java rename to libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/preload/PreloadMediaPeriod.java index e57c0ba9e2..fde802795d 100644 --- a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/PreloadMediaPeriod.java +++ b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/preload/PreloadMediaPeriod.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package androidx.media3.exoplayer.source; +package androidx.media3.exoplayer.source.preload; import static androidx.media3.common.util.Assertions.checkNotNull; @@ -21,6 +21,9 @@ import androidx.annotation.Nullable; import androidx.media3.common.util.NullableType; import androidx.media3.exoplayer.LoadingInfo; import androidx.media3.exoplayer.SeekParameters; +import androidx.media3.exoplayer.source.MediaPeriod; +import androidx.media3.exoplayer.source.SampleStream; +import androidx.media3.exoplayer.source.TrackGroupArray; import androidx.media3.exoplayer.trackselection.ExoTrackSelection; import androidx.media3.exoplayer.trackselection.TrackSelectorResult; import java.io.IOException; diff --git a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/PreloadMediaSource.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/preload/PreloadMediaSource.java similarity index 98% rename from libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/PreloadMediaSource.java rename to libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/preload/PreloadMediaSource.java index 7b2d88d720..d5d4cf1d6a 100644 --- a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/PreloadMediaSource.java +++ b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/preload/PreloadMediaSource.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package androidx.media3.exoplayer.source; +package androidx.media3.exoplayer.source.preload; import static androidx.media3.common.util.Assertions.checkNotNull; @@ -35,6 +35,10 @@ import androidx.media3.exoplayer.RendererCapabilities; import androidx.media3.exoplayer.RenderersFactory; import androidx.media3.exoplayer.analytics.PlayerId; import androidx.media3.exoplayer.drm.DrmSessionManagerProvider; +import androidx.media3.exoplayer.source.MediaPeriod; +import androidx.media3.exoplayer.source.MediaSource; +import androidx.media3.exoplayer.source.TrackGroupArray; +import androidx.media3.exoplayer.source.WrappingMediaSource; import androidx.media3.exoplayer.trackselection.TrackSelector; import androidx.media3.exoplayer.trackselection.TrackSelectorResult; import androidx.media3.exoplayer.upstream.Allocator; diff --git a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/preload/package-info.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/preload/package-info.java new file mode 100644 index 0000000000..ee42fd4725 --- /dev/null +++ b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/preload/package-info.java @@ -0,0 +1,19 @@ +/* + * Copyright 2023 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +@NonNullApi +package androidx.media3.exoplayer.source.preload; + +import androidx.media3.common.util.NonNullApi; diff --git a/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/source/PreloadAndPlaybackCoordinationTest.java b/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/source/preload/PreloadAndPlaybackCoordinationTest.java similarity index 98% rename from libraries/exoplayer/src/test/java/androidx/media3/exoplayer/source/PreloadAndPlaybackCoordinationTest.java rename to libraries/exoplayer/src/test/java/androidx/media3/exoplayer/source/preload/PreloadAndPlaybackCoordinationTest.java index 7ddbba0165..e531a54972 100644 --- a/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/source/PreloadAndPlaybackCoordinationTest.java +++ b/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/source/preload/PreloadAndPlaybackCoordinationTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package androidx.media3.exoplayer.source; +package androidx.media3.exoplayer.source.preload; import static androidx.media3.common.util.Assertions.checkNotNull; import static com.google.common.truth.Truth.assertThat; @@ -31,6 +31,8 @@ import androidx.media3.exoplayer.RendererCapabilities; import androidx.media3.exoplayer.RenderersFactory; import androidx.media3.exoplayer.analytics.PlayerId; import androidx.media3.exoplayer.audio.AudioRendererEventListener; +import androidx.media3.exoplayer.source.MediaPeriod; +import androidx.media3.exoplayer.source.MediaSource; import androidx.media3.exoplayer.trackselection.DefaultTrackSelector; import androidx.media3.exoplayer.trackselection.TrackSelector; import androidx.media3.exoplayer.upstream.Allocator; diff --git a/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/source/PreloadMediaPeriodTest.java b/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/source/preload/PreloadMediaPeriodTest.java similarity index 98% rename from libraries/exoplayer/src/test/java/androidx/media3/exoplayer/source/PreloadMediaPeriodTest.java rename to libraries/exoplayer/src/test/java/androidx/media3/exoplayer/source/preload/PreloadMediaPeriodTest.java index 904766e015..3d07246660 100644 --- a/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/source/PreloadMediaPeriodTest.java +++ b/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/source/preload/PreloadMediaPeriodTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package androidx.media3.exoplayer.source; +package androidx.media3.exoplayer.source.preload; import static com.google.common.truth.Truth.assertThat; import static org.mockito.ArgumentMatchers.any; @@ -35,6 +35,12 @@ import androidx.media3.common.Tracks; import androidx.media3.exoplayer.RendererConfiguration; import androidx.media3.exoplayer.drm.DrmSessionEventListener; import androidx.media3.exoplayer.drm.DrmSessionManager; +import androidx.media3.exoplayer.source.EmptySampleStream; +import androidx.media3.exoplayer.source.MediaPeriod; +import androidx.media3.exoplayer.source.MediaSource; +import androidx.media3.exoplayer.source.MediaSourceEventListener; +import androidx.media3.exoplayer.source.SampleStream; +import androidx.media3.exoplayer.source.TrackGroupArray; import androidx.media3.exoplayer.trackselection.ExoTrackSelection; import androidx.media3.exoplayer.trackselection.FixedTrackSelection; import androidx.media3.exoplayer.trackselection.TrackSelectorResult; diff --git a/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/source/PreloadMediaSourceTest.java b/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/source/preload/PreloadMediaSourceTest.java similarity index 99% rename from libraries/exoplayer/src/test/java/androidx/media3/exoplayer/source/PreloadMediaSourceTest.java rename to libraries/exoplayer/src/test/java/androidx/media3/exoplayer/source/preload/PreloadMediaSourceTest.java index 86dab7ad54..badccac29d 100644 --- a/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/source/PreloadMediaSourceTest.java +++ b/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/source/preload/PreloadMediaSourceTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package androidx.media3.exoplayer.source; +package androidx.media3.exoplayer.source.preload; import static androidx.media3.test.utils.robolectric.RobolectricUtil.runMainLooperUntil; import static com.google.common.truth.Truth.assertThat; @@ -43,6 +43,9 @@ import androidx.media3.exoplayer.RenderersFactory; import androidx.media3.exoplayer.analytics.PlayerId; import androidx.media3.exoplayer.audio.AudioRendererEventListener; import androidx.media3.exoplayer.metadata.MetadataOutput; +import androidx.media3.exoplayer.source.MediaPeriod; +import androidx.media3.exoplayer.source.MediaSource; +import androidx.media3.exoplayer.source.ProgressiveMediaSource; import androidx.media3.exoplayer.text.TextOutput; import androidx.media3.exoplayer.trackselection.DefaultTrackSelector; import androidx.media3.exoplayer.trackselection.ExoTrackSelection;