loliball/media3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use SimpleExoPlayer.Builder where necessary

Browse Source 
An upcoming change will modify ExoPlayer.Builder#build() to return
ExoPlayer, so any places that explicitly need a SimpleExoPlayer
instance should be using SimpleExoPlayer.Builder.

PiperOrigin-RevId: 403028312
This commit is contained in:
ibaker 2021-10-14 09:31:13 +01:00 committed by Oliver Woodman
parent 5fe3ec59ca
commit a168c8c928
2 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
library/core/src/test/java/com/google/android/exoplayer2/SimpleExoPlayerTest.java
View File

@ -53,7 +53,7 @@ public class SimpleExoPlayerTest {
public void builder_inBackgroundThread_doesNotThrow() throws Exception { public void builder_inBackgroundThread_doesNotThrow() throws Exception {
Thread builderThread = Thread builderThread =
new Thread( new Thread(
() -> new ExoPlayer.Builder(ApplicationProvider.getApplicationContext()).build()); () -> new SimpleExoPlayer.Builder(ApplicationProvider.getApplicationContext()).build());
AtomicReference<Throwable> builderThrow = new AtomicReference<>(); AtomicReference<Throwable> builderThrow = new AtomicReference<>();
builderThread.setUncaughtExceptionHandler((thread, throwable) -> builderThrow.set(throwable)); builderThread.setUncaughtExceptionHandler((thread, throwable) -> builderThrow.set(throwable));
@ -66,7 +66,7 @@ public class SimpleExoPlayerTest {
@Test @Test
public void onPlaylistMetadataChanged_calledWhenPlaylistMetadataSet() { public void onPlaylistMetadataChanged_calledWhenPlaylistMetadataSet() {
SimpleExoPlayer player = SimpleExoPlayer player =
new ExoPlayer.Builder(ApplicationProvider.getApplicationContext()).build(); new SimpleExoPlayer.Builder(ApplicationProvider.getApplicationContext()).build();
Player.Listener playerListener = mock(Player.Listener.class); Player.Listener playerListener = mock(Player.Listener.class);
player.addListener(playerListener); player.addListener(playerListener);
AnalyticsListener analyticsListener = mock(AnalyticsListener.class); AnalyticsListener analyticsListener = mock(AnalyticsListener.class);
@ -82,7 +82,7 @@ public class SimpleExoPlayerTest {
@Test @Test
public void release_triggersAllPendingEventsInAnalyticsListeners() throws Exception { public void release_triggersAllPendingEventsInAnalyticsListeners() throws Exception {
SimpleExoPlayer player = SimpleExoPlayer player =
new ExoPlayer.Builder( new SimpleExoPlayer.Builder(
ApplicationProvider.getApplicationContext(), ApplicationProvider.getApplicationContext(),
(handler, videoListener, audioListener, textOutput, metadataOutput) -> (handler, videoListener, audioListener, textOutput, metadataOutput) ->
new Renderer[] {new FakeVideoRenderer(handler, videoListener)}) new Renderer[] {new FakeVideoRenderer(handler, videoListener)})
@ -108,7 +108,7 @@ public class SimpleExoPlayerTest {
public void releaseAfterRendererEvents_triggersPendingVideoEventsInListener() throws Exception { public void releaseAfterRendererEvents_triggersPendingVideoEventsInListener() throws Exception {
Surface surface = new Surface(new SurfaceTexture(/* texName= */ 0)); Surface surface = new Surface(new SurfaceTexture(/* texName= */ 0));
SimpleExoPlayer player = SimpleExoPlayer player =
new ExoPlayer.Builder( new SimpleExoPlayer.Builder(
ApplicationProvider.getApplicationContext(), ApplicationProvider.getApplicationContext(),
(handler, videoListener, audioListener, textOutput, metadataOutput) -> (handler, videoListener, audioListener, textOutput, metadataOutput) ->
new Renderer[] {new FakeVideoRenderer(handler, videoListener)}) new Renderer[] {new FakeVideoRenderer(handler, videoListener)})
@ -134,7 +134,7 @@ public class SimpleExoPlayerTest {
@Test @Test
public void releaseAfterVolumeChanges_triggerPendingVolumeEventInListener() throws Exception { public void releaseAfterVolumeChanges_triggerPendingVolumeEventInListener() throws Exception {
SimpleExoPlayer player = SimpleExoPlayer player =
new ExoPlayer.Builder(ApplicationProvider.getApplicationContext()).build(); new SimpleExoPlayer.Builder(ApplicationProvider.getApplicationContext()).build();
Player.Listener listener = mock(Player.Listener.class); Player.Listener listener = mock(Player.Listener.class);
player.addListener(listener); player.addListener(listener);
@ -148,7 +148,7 @@ public class SimpleExoPlayerTest {
@Test @Test
public void releaseAfterVolumeChanges_triggerPendingDeviceVolumeEventsInListener() { public void releaseAfterVolumeChanges_triggerPendingDeviceVolumeEventsInListener() {
SimpleExoPlayer player = SimpleExoPlayer player =
new ExoPlayer.Builder(ApplicationProvider.getApplicationContext()).build(); new SimpleExoPlayer.Builder(ApplicationProvider.getApplicationContext()).build();
Player.Listener listener = mock(Player.Listener.class); Player.Listener listener = mock(Player.Listener.class);
player.addListener(listener); player.addListener(listener);

11
testutils/src/main/java/com/google/android/exoplayer2/testutil/TestExoPlayerBuilder.java
View File

@ -22,7 +22,6 @@ import android.os.Looper;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.DefaultLoadControl; import com.google.android.exoplayer2.DefaultLoadControl;
import com.google.android.exoplayer2.ExoPlayer;
import com.google.android.exoplayer2.LoadControl; import com.google.android.exoplayer2.LoadControl;
import com.google.android.exoplayer2.Renderer; import com.google.android.exoplayer2.Renderer;
import com.google.android.exoplayer2.RenderersFactory; import com.google.android.exoplayer2.RenderersFactory;
@ -274,11 +273,7 @@ public class TestExoPlayerBuilder {
return seekForwardIncrementMs; return seekForwardIncrementMs;
} }
/** /** Builds an {@link SimpleExoPlayer} using the provided values or their defaults. */
* Builds an {@link SimpleExoPlayer} using the provided values or their defaults.
*
* @return The built {@link ExoPlayerTestRunner}.
*/
public SimpleExoPlayer build() { public SimpleExoPlayer build() {
Assertions.checkNotNull( Assertions.checkNotNull(
looper, "TestExoPlayer builder run on a thread without Looper and no Looper specified."); looper, "TestExoPlayer builder run on a thread without Looper and no Looper specified.");
@ -300,8 +295,8 @@ public class TestExoPlayerBuilder {
}; };
} }
ExoPlayer.Builder builder = SimpleExoPlayer.Builder builder =
new ExoPlayer.Builder(context, playerRenderersFactory) new SimpleExoPlayer.Builder(context, playerRenderersFactory)
.setTrackSelector(trackSelector) .setTrackSelector(trackSelector)
.setLoadControl(loadControl) .setLoadControl(loadControl)
.setBandwidthMeter(bandwidthMeter) .setBandwidthMeter(bandwidthMeter)