Skip to content

SDK / exoplayer

Go to a project
Commit f2055396 by olly Committed by Ian Baker
Options

Use lambdas where possible 

PiperOrigin-RevId: 320960833
parent 29b12e2f
Expand all
Inline Side-by-side
Showing with 47 additions and 95 deletions
extensions/media2/src/androidTest/java/com/google/android/exoplayer2/ext/media2/SessionPlayerConnectorTest.java
...@@ -1146,7 +1146,7 @@ public class SessionPlayerConnectorTest { ...@@ -1146,7 +1146,7 @@ public class SessionPlayerConnectorTest {
assertPlayerResultSuccess(sessionPlayerConnector.prepare()); assertPlayerResultSuccess(sessionPlayerConnector.prepare());
InstrumentationRegistry.getInstrumentation() InstrumentationRegistry.getInstrumentation()
.runOnMainSync( .runOnMainSync(
() -> { () ->
simpleExoPlayer.addListener( simpleExoPlayer.addListener(
new Player.EventListener() { new Player.EventListener() {
@Override @Override
...@@ -1155,8 +1155,7 @@ public class SessionPlayerConnectorTest { ...@@ -1155,8 +1155,7 @@ public class SessionPlayerConnectorTest {
simpleExoPlayer.setPlayWhenReady(false); simpleExoPlayer.setPlayWhenReady(false);
} }
} }
}); }));
});
assertPlayerResultSuccess(sessionPlayerConnector.play()); assertPlayerResultSuccess(sessionPlayerConnector.play());
assertThat( assertThat(
......
extensions/media2/src/main/java/com/google/android/exoplayer2/ext/media2/SessionPlayerConnector.java
...@@ -149,19 +149,19 @@ public final class SessionPlayerConnector extends SessionPlayer { ...@@ -149,19 +149,19 @@ public final class SessionPlayerConnector extends SessionPlayer {
@Override @Override
public ListenableFuture<PlayerResult> play() { public ListenableFuture<PlayerResult> play() {
return playerCommandQueue.addCommand( return playerCommandQueue.addCommand(
PlayerCommandQueue.COMMAND_CODE_PLAYER_PLAY, /* command= */ () -> player.play()); PlayerCommandQueue.COMMAND_CODE_PLAYER_PLAY, /* command= */ player::play);
} }
@Override @Override
public ListenableFuture<PlayerResult> pause() { public ListenableFuture<PlayerResult> pause() {
return playerCommandQueue.addCommand( return playerCommandQueue.addCommand(
PlayerCommandQueue.COMMAND_CODE_PLAYER_PAUSE, /* command= */ () -> player.pause()); PlayerCommandQueue.COMMAND_CODE_PLAYER_PAUSE, /* command= */ player::pause);
} }
@Override @Override
public ListenableFuture<PlayerResult> prepare() { public ListenableFuture<PlayerResult> prepare() {
return playerCommandQueue.addCommand( return playerCommandQueue.addCommand(
PlayerCommandQueue.COMMAND_CODE_PLAYER_PREPARE, /* command= */ () -> player.prepare()); PlayerCommandQueue.COMMAND_CODE_PLAYER_PREPARE, /* command= */ player::prepare);
} }
@Override @Override
......
library/core/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSessionManager.java
...@@ -771,9 +771,7 @@ public class DefaultDrmSessionManager implements DrmSessionManager { ...@@ -771,9 +771,7 @@ public class DefaultDrmSessionManager implements DrmSessionManager {
keepaliveSessions.add(session); keepaliveSessions.add(session);
Assertions.checkNotNull(sessionReleasingHandler) Assertions.checkNotNull(sessionReleasingHandler)
.postAtTime( .postAtTime(
() -> { () -> session.release(/* eventDispatcher= */ null),
session.release(/* eventDispatcher= */ null);
},
session, session,
/* uptimeMillis= */ SystemClock.uptimeMillis() + sessionKeepaliveMs); /* uptimeMillis= */ SystemClock.uptimeMillis() + sessionKeepaliveMs);
} else if (newReferenceCount == 0) { } else if (newReferenceCount == 0) {
......
library/core/src/main/java/com/google/android/exoplayer2/drm/FrameworkMediaDrm.java
...@@ -156,9 +156,8 @@ public final class FrameworkMediaDrm implements ExoMediaDrm { ...@@ -156,9 +156,8 @@ public final class FrameworkMediaDrm implements ExoMediaDrm {
mediaDrm.setOnExpirationUpdateListener( mediaDrm.setOnExpirationUpdateListener(
listener == null listener == null
? null ? null
: (mediaDrm, sessionId, expirationTimeMs) -> { : (mediaDrm, sessionId, expirationTimeMs) ->
listener.onExpirationUpdate(FrameworkMediaDrm.this, sessionId, expirationTimeMs); listener.onExpirationUpdate(FrameworkMediaDrm.this, sessionId, expirationTimeMs),
},
/* handler= */ null); /* handler= */ null);
} }
......
library/core/src/test/java/com/google/android/exoplayer2/ExoPlayerTest.java
...@@ -1913,9 +1913,7 @@ public final class ExoPlayerTest { ...@@ -1913,9 +1913,7 @@ public final class ExoPlayerTest {
.waitForTimelineChanged() .waitForTimelineChanged()
.pause() .pause()
.sendMessage( .sendMessage(
(messageType, payload) -> { (messageType, payload) -> counter.getAndIncrement(),
counter.getAndIncrement();
},
/* windowIndex= */ 0, /* windowIndex= */ 0,
/* positionMs= */ 2000, /* positionMs= */ 2000,
/* deleteAfterDelivery= */ false) /* deleteAfterDelivery= */ false)
......
library/core/src/test/java/com/google/android/exoplayer2/audio/MediaCodecAudioRendererTest.java
...@@ -40,7 +40,6 @@ import com.google.android.exoplayer2.testutil.FakeSampleStream; ...@@ -40,7 +40,6 @@ import com.google.android.exoplayer2.testutil.FakeSampleStream;
import com.google.android.exoplayer2.util.MimeTypes; import com.google.android.exoplayer2.util.MimeTypes;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import java.util.Collections; import java.util.Collections;
import java.util.List;
import org.junit.Before; import org.junit.Before;
import org.junit.Rule; import org.junit.Rule;
import org.junit.Test; import org.junit.Test;
...@@ -78,11 +77,8 @@ public class MediaCodecAudioRendererTest { ...@@ -78,11 +77,8 @@ public class MediaCodecAudioRendererTest {
when(audioSink.handleBuffer(any(), anyLong(), anyInt())).thenReturn(true); when(audioSink.handleBuffer(any(), anyLong(), anyInt())).thenReturn(true);
mediaCodecSelector = mediaCodecSelector =
new MediaCodecSelector() { (mimeType, requiresSecureDecoder, requiresTunnelingDecoder) ->
@Override Collections.singletonList(
public List<MediaCodecInfo> getDecoderInfos(
String mimeType, boolean requiresSecureDecoder, boolean requiresTunnelingDecoder) {
return Collections.singletonList(
MediaCodecInfo.newInstance( MediaCodecInfo.newInstance(
/* name= */ "name", /* name= */ "name",
/* mimeType= */ mimeType, /* mimeType= */ mimeType,
...@@ -93,8 +89,6 @@ public class MediaCodecAudioRendererTest { ...@@ -93,8 +89,6 @@ public class MediaCodecAudioRendererTest {
/* vendor= */ false, /* vendor= */ false,
/* forceDisableAdaptive= */ false, /* forceDisableAdaptive= */ false,
/* forceSecure= */ false)); /* forceSecure= */ false));
}
};
mediaCodecAudioRenderer = mediaCodecAudioRenderer =
new MediaCodecAudioRenderer( new MediaCodecAudioRenderer(
......
library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
...@@ -711,19 +711,13 @@ public class DownloadManagerTest { ...@@ -711,19 +711,13 @@ public class DownloadManagerTest {
private List<Download> postGetCurrentDownloads() { private List<Download> postGetCurrentDownloads() {
AtomicReference<List<Download>> currentDownloadsReference = new AtomicReference<>(); AtomicReference<List<Download>> currentDownloadsReference = new AtomicReference<>();
runOnMainThread( runOnMainThread(() -> currentDownloadsReference.set(downloadManager.getCurrentDownloads()));
() -> {
currentDownloadsReference.set(downloadManager.getCurrentDownloads());
});
return currentDownloadsReference.get(); return currentDownloadsReference.get();
} }
private DownloadIndex postGetDownloadIndex() { private DownloadIndex postGetDownloadIndex() {
AtomicReference<DownloadIndex> downloadIndexReference = new AtomicReference<>(); AtomicReference<DownloadIndex> downloadIndexReference = new AtomicReference<>();
runOnMainThread( runOnMainThread(() -> downloadIndexReference.set(downloadManager.getDownloadIndex()));
() -> {
downloadIndexReference.set(downloadManager.getDownloadIndex());
});
return downloadIndexReference.get(); return downloadIndexReference.get();
} }
......
library/core/src/test/java/com/google/android/exoplayer2/video/MediaCodecVideoRendererTest.java
...@@ -50,7 +50,6 @@ import com.google.android.exoplayer2.testutil.FakeSampleStream.FakeSampleStreamI ...@@ -50,7 +50,6 @@ import com.google.android.exoplayer2.testutil.FakeSampleStream.FakeSampleStreamI
import com.google.android.exoplayer2.util.MimeTypes; import com.google.android.exoplayer2.util.MimeTypes;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import java.util.Collections; import java.util.Collections;
import java.util.List;
import org.junit.Before; import org.junit.Before;
import org.junit.Rule; import org.junit.Rule;
import org.junit.Test; import org.junit.Test;
...@@ -82,11 +81,8 @@ public class MediaCodecVideoRendererTest { ...@@ -82,11 +81,8 @@ public class MediaCodecVideoRendererTest {
@Before @Before
public void setUp() throws Exception { public void setUp() throws Exception {
MediaCodecSelector mediaCodecSelector = MediaCodecSelector mediaCodecSelector =
new MediaCodecSelector() { (mimeType, requiresSecureDecoder, requiresTunnelingDecoder) ->
@Override Collections.singletonList(
public List<MediaCodecInfo> getDecoderInfos(
String mimeType, boolean requiresSecureDecoder, boolean requiresTunnelingDecoder) {
return Collections.singletonList(
MediaCodecInfo.newInstance( MediaCodecInfo.newInstance(
/* name= */ "name", /* name= */ "name",
/* mimeType= */ mimeType, /* mimeType= */ mimeType,
...@@ -97,8 +93,6 @@ public class MediaCodecVideoRendererTest { ...@@ -97,8 +93,6 @@ public class MediaCodecVideoRendererTest {
/* vendor= */ false, /* vendor= */ false,
/* forceDisableAdaptive= */ false, /* forceDisableAdaptive= */ false,
/* forceSecure= */ false)); /* forceSecure= */ false));
}
};
mediaCodecVideoRenderer = mediaCodecVideoRenderer =
new MediaCodecVideoRenderer( new MediaCodecVideoRenderer(
......
library/ui/src/main/java/com/google/android/exoplayer2/ui/StyledPlayerControlView.java
...@@ -558,7 +558,7 @@ public class StyledPlayerControlView extends FrameLayout { ...@@ -558,7 +558,7 @@ public class StyledPlayerControlView extends FrameLayout {
} }
fullScreenButton = findViewById(R.id.exo_fullscreen); fullScreenButton = findViewById(R.id.exo_fullscreen);
if (fullScreenButton != null) { if (fullScreenButton != null) {
fullScreenButton.setOnClickListener(fullScreenModeChangedListener); fullScreenButton.setOnClickListener(this::onFullScreenButtonClicked);
} }
settingsButton = findViewById(R.id.exo_settings); settingsButton = findViewById(R.id.exo_settings);
if (settingsButton != null) { if (settingsButton != null) {
...@@ -648,7 +648,7 @@ public class StyledPlayerControlView extends FrameLayout { ...@@ -648,7 +648,7 @@ public class StyledPlayerControlView extends FrameLayout {
String normalSpeed = resources.getString(R.string.exo_controls_playback_speed_normal); String normalSpeed = resources.getString(R.string.exo_controls_playback_speed_normal);
selectedPlaybackSpeedIndex = playbackSpeedTextList.indexOf(normalSpeed); selectedPlaybackSpeedIndex = playbackSpeedTextList.indexOf(normalSpeed);
playbackSpeedMultBy100List = new ArrayList<Integer>(); playbackSpeedMultBy100List = new ArrayList<>();
int[] speeds = resources.getIntArray(R.array.exo_speed_multiplied_by_100); int[] speeds = resources.getIntArray(R.array.exo_speed_multiplied_by_100);
for (int speed : speeds) { for (int speed : speeds) {
playbackSpeedMultBy100List.add(speed); playbackSpeedMultBy100List.add(speed);
...@@ -699,34 +699,7 @@ public class StyledPlayerControlView extends FrameLayout { ...@@ -699,34 +699,7 @@ public class StyledPlayerControlView extends FrameLayout {
shuffleOffContentDescription = shuffleOffContentDescription =
resources.getString(R.string.exo_controls_shuffle_off_description); resources.getString(R.string.exo_controls_shuffle_off_description);
addOnLayoutChangeListener( addOnLayoutChangeListener(this::onLayoutChange);
new OnLayoutChangeListener() {
@Override
public void onLayoutChange(
View v,
int left,
int top,
int right,
int bottom,
int oldLeft,
int oldTop,
int oldRight,
int oldBottom) {
int width = right - left;
int height = bottom - top;
int oldWidth = oldRight - oldLeft;
int oldHeight = oldBottom - oldTop;
if ((width != oldWidth || height != oldHeight) && settingsWindow.isShowing()) {
updateSettingsWindowSize();
int xoff = getWidth() - settingsWindow.getWidth() - settingsWindowMargin;
int yoff = -settingsWindow.getHeight() - settingsWindowMargin;
settingsWindow.update(v, xoff, yoff, -1, -1);
}
}
});
} }
@SuppressWarnings("ResourceType") @SuppressWarnings("ResourceType")
...@@ -1545,11 +1518,7 @@ public class StyledPlayerControlView extends FrameLayout { ...@@ -1545,11 +1518,7 @@ public class StyledPlayerControlView extends FrameLayout {
return controlDispatcher.dispatchSeekTo(player, windowIndex, positionMs); return controlDispatcher.dispatchSeekTo(player, windowIndex, positionMs);
} }
private final OnClickListener fullScreenModeChangedListener = private void onFullScreenButtonClicked(View v) {
new OnClickListener() {
@Override
public void onClick(View v) {
if (onFullScreenModeChangedListener == null || fullScreenButton == null) { if (onFullScreenModeChangedListener == null || fullScreenButton == null) {
return; return;
} }
...@@ -1567,7 +1536,29 @@ public class StyledPlayerControlView extends FrameLayout { ...@@ -1567,7 +1536,29 @@ public class StyledPlayerControlView extends FrameLayout {
onFullScreenModeChangedListener.onFullScreenModeChanged(isFullScreen); onFullScreenModeChangedListener.onFullScreenModeChanged(isFullScreen);
} }
} }
};
private void onLayoutChange(
View v,
int left,
int top,
int right,
int bottom,
int oldLeft,
int oldTop,
int oldRight,
int oldBottom) {
int width = right - left;
int height = bottom - top;
int oldWidth = oldRight - oldLeft;
int oldHeight = oldBottom - oldTop;
if ((width != oldWidth || height != oldHeight) && settingsWindow.isShowing()) {
updateSettingsWindowSize();
int xOffset = getWidth() - settingsWindow.getWidth() - settingsWindowMargin;
int yOffset = -settingsWindow.getHeight() - settingsWindowMargin;
settingsWindow.update(v, xOffset, yOffset, -1, -1);
}
}
@Override @Override
public void onAttachedToWindow() { public void onAttachedToWindow() {
...@@ -1868,9 +1859,7 @@ public class StyledPlayerControlView extends FrameLayout { ...@@ -1868,9 +1859,7 @@ public class StyledPlayerControlView extends FrameLayout {
iconView = itemView.findViewById(R.id.exo_icon); iconView = itemView.findViewById(R.id.exo_icon);
itemView.setOnClickListener( itemView.setOnClickListener(
new OnClickListener() { v -> {
@Override
public void onClick(View v) {
int position = SettingsViewHolder.this.getAdapterPosition(); int position = SettingsViewHolder.this.getAdapterPosition();
if (position == RecyclerView.NO_POSITION) { if (position == RecyclerView.NO_POSITION) {
return; return;
...@@ -1887,7 +1876,6 @@ public class StyledPlayerControlView extends FrameLayout { ...@@ -1887,7 +1876,6 @@ public class StyledPlayerControlView extends FrameLayout {
} else { } else {
settingsWindow.dismiss(); settingsWindow.dismiss();
} }
}
}); });
} }
} }
...@@ -1938,9 +1926,7 @@ public class StyledPlayerControlView extends FrameLayout { ...@@ -1938,9 +1926,7 @@ public class StyledPlayerControlView extends FrameLayout {
checkView = itemView.findViewById(R.id.exo_check); checkView = itemView.findViewById(R.id.exo_check);
itemView.setOnClickListener( itemView.setOnClickListener(
new OnClickListener() { v -> {
@Override
public void onClick(View v) {
int position = SubSettingsViewHolder.this.getAdapterPosition(); int position = SubSettingsViewHolder.this.getAdapterPosition();
if (position == RecyclerView.NO_POSITION) { if (position == RecyclerView.NO_POSITION) {
return; return;
...@@ -1953,7 +1939,6 @@ public class StyledPlayerControlView extends FrameLayout { ...@@ -1953,7 +1939,6 @@ public class StyledPlayerControlView extends FrameLayout {
} }
} }
settingsWindow.dismiss(); settingsWindow.dismiss();
}
}); });
} }
} }
...@@ -2012,9 +1997,7 @@ public class StyledPlayerControlView extends FrameLayout { ...@@ -2012,9 +1997,7 @@ public class StyledPlayerControlView extends FrameLayout {
} }
holder.checkView.setVisibility(isTrackSelectionOff ? VISIBLE : INVISIBLE); holder.checkView.setVisibility(isTrackSelectionOff ? VISIBLE : INVISIBLE);
holder.itemView.setOnClickListener( holder.itemView.setOnClickListener(
new OnClickListener() { v -> {
@Override
public void onClick(View v) {
if (trackSelector != null) { if (trackSelector != null) {
ParametersBuilder parametersBuilder = trackSelector.getParameters().buildUpon(); ParametersBuilder parametersBuilder = trackSelector.getParameters().buildUpon();
for (int i = 0; i < rendererIndices.size(); i++) { for (int i = 0; i < rendererIndices.size(); i++) {
...@@ -2027,7 +2010,6 @@ public class StyledPlayerControlView extends FrameLayout { ...@@ -2027,7 +2010,6 @@ public class StyledPlayerControlView extends FrameLayout {
checkNotNull(trackSelector).setParameters(parametersBuilder); checkNotNull(trackSelector).setParameters(parametersBuilder);
settingsWindow.dismiss(); settingsWindow.dismiss();
} }
}
}); });
} }
...@@ -2065,9 +2047,7 @@ public class StyledPlayerControlView extends FrameLayout { ...@@ -2065,9 +2047,7 @@ public class StyledPlayerControlView extends FrameLayout {
} }
holder.checkView.setVisibility(hasSelectionOverride ? INVISIBLE : VISIBLE); holder.checkView.setVisibility(hasSelectionOverride ? INVISIBLE : VISIBLE);
holder.itemView.setOnClickListener( holder.itemView.setOnClickListener(
new OnClickListener() { v -> {
@Override
public void onClick(View v) {
if (trackSelector != null) { if (trackSelector != null) {
ParametersBuilder parametersBuilder = trackSelector.getParameters().buildUpon(); ParametersBuilder parametersBuilder = trackSelector.getParameters().buildUpon();
for (int i = 0; i < rendererIndices.size(); i++) { for (int i = 0; i < rendererIndices.size(); i++) {
...@@ -2080,7 +2060,6 @@ public class StyledPlayerControlView extends FrameLayout { ...@@ -2080,7 +2060,6 @@ public class StyledPlayerControlView extends FrameLayout {
SETTINGS_AUDIO_TRACK_SELECTION_POSITION, SETTINGS_AUDIO_TRACK_SELECTION_POSITION,
getResources().getString(R.string.exo_track_selection_auto)); getResources().getString(R.string.exo_track_selection_auto));
settingsWindow.dismiss(); settingsWindow.dismiss();
}
}); });
} }
...@@ -2176,9 +2155,7 @@ public class StyledPlayerControlView extends FrameLayout { ...@@ -2176,9 +2155,7 @@ public class StyledPlayerControlView extends FrameLayout {
holder.textView.setText(track.trackName); holder.textView.setText(track.trackName);
holder.checkView.setVisibility(explicitlySelected ? VISIBLE : INVISIBLE); holder.checkView.setVisibility(explicitlySelected ? VISIBLE : INVISIBLE);
holder.itemView.setOnClickListener( holder.itemView.setOnClickListener(
new OnClickListener() { v -> {
@Override
public void onClick(View v) {
if (mappedTrackInfo != null && trackSelector != null) { if (mappedTrackInfo != null && trackSelector != null) {
ParametersBuilder parametersBuilder = trackSelector.getParameters().buildUpon(); ParametersBuilder parametersBuilder = trackSelector.getParameters().buildUpon();
for (int i = 0; i < rendererIndices.size(); i++) { for (int i = 0; i < rendererIndices.size(); i++) {
...@@ -2202,7 +2179,6 @@ public class StyledPlayerControlView extends FrameLayout { ...@@ -2202,7 +2179,6 @@ public class StyledPlayerControlView extends FrameLayout {
onTrackSelection(track.trackName); onTrackSelection(track.trackName);
settingsWindow.dismiss(); settingsWindow.dismiss();
} }
}
}); });
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment