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
Inline Side-by-side
Showing with 265 additions and 323 deletions
extensions/media2/src/androidTest/java/com/google/android/exoplayer2/ext/media2/SessionPlayerConnectorTest.java
...@@ -1146,17 +1146,16 @@ public class SessionPlayerConnectorTest { ...@@ -1146,17 +1146,16 @@ 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
public void onPlayWhenReadyChanged(boolean playWhenReady, int reason) { public void onPlayWhenReadyChanged(boolean playWhenReady, int reason) {
if (playWhenReady) { if (playWhenReady) {
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,29 +1518,47 @@ public class StyledPlayerControlView extends FrameLayout { ...@@ -1545,29 +1518,47 @@ 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() { if (onFullScreenModeChangedListener == null || fullScreenButton == null) {
return;
}
@Override isFullScreen = !isFullScreen;
public void onClick(View v) { if (isFullScreen) {
if (onFullScreenModeChangedListener == null || fullScreenButton == null) { fullScreenButton.setImageDrawable(fullScreenExitDrawable);
return; fullScreenButton.setContentDescription(fullScreenExitContentDescription);
} } else {
fullScreenButton.setImageDrawable(fullScreenEnterDrawable);
fullScreenButton.setContentDescription(fullScreenEnterContentDescription);
}
isFullScreen = !isFullScreen; if (onFullScreenModeChangedListener != null) {
if (isFullScreen) { onFullScreenModeChangedListener.onFullScreenModeChanged(isFullScreen);
fullScreenButton.setImageDrawable(fullScreenExitDrawable); }
fullScreenButton.setContentDescription(fullScreenExitContentDescription); }
} else {
fullScreenButton.setImageDrawable(fullScreenEnterDrawable);
fullScreenButton.setContentDescription(fullScreenEnterContentDescription);
}
if (onFullScreenModeChangedListener != null) { private void onLayoutChange(
onFullScreenModeChangedListener.onFullScreenModeChanged(isFullScreen); 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,25 +1859,22 @@ public class StyledPlayerControlView extends FrameLayout { ...@@ -1868,25 +1859,22 @@ 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 int position = SettingsViewHolder.this.getAdapterPosition();
public void onClick(View v) { if (position == RecyclerView.NO_POSITION) {
int position = SettingsViewHolder.this.getAdapterPosition(); return;
if (position == RecyclerView.NO_POSITION) { }
return;
}
if (position == SETTINGS_PLAYBACK_SPEED_POSITION) { if (position == SETTINGS_PLAYBACK_SPEED_POSITION) {
subSettingsAdapter.setTexts(playbackSpeedTextList); subSettingsAdapter.setTexts(playbackSpeedTextList);
subSettingsAdapter.setCheckPosition(selectedPlaybackSpeedIndex); subSettingsAdapter.setCheckPosition(selectedPlaybackSpeedIndex);
selectedMainSettingsPosition = SETTINGS_PLAYBACK_SPEED_POSITION; selectedMainSettingsPosition = SETTINGS_PLAYBACK_SPEED_POSITION;
displaySettingsWindow(subSettingsAdapter); displaySettingsWindow(subSettingsAdapter);
} else if (position == SETTINGS_AUDIO_TRACK_SELECTION_POSITION) { } else if (position == SETTINGS_AUDIO_TRACK_SELECTION_POSITION) {
selectedMainSettingsPosition = SETTINGS_AUDIO_TRACK_SELECTION_POSITION; selectedMainSettingsPosition = SETTINGS_AUDIO_TRACK_SELECTION_POSITION;
displaySettingsWindow(audioTrackSelectionAdapter); displaySettingsWindow(audioTrackSelectionAdapter);
} else { } else {
settingsWindow.dismiss(); settingsWindow.dismiss();
}
} }
}); });
} }
...@@ -1938,22 +1926,19 @@ public class StyledPlayerControlView extends FrameLayout { ...@@ -1938,22 +1926,19 @@ 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 int position = SubSettingsViewHolder.this.getAdapterPosition();
public void onClick(View v) { if (position == RecyclerView.NO_POSITION) {
int position = SubSettingsViewHolder.this.getAdapterPosition(); return;
if (position == RecyclerView.NO_POSITION) { }
return;
}
if (selectedMainSettingsPosition == SETTINGS_PLAYBACK_SPEED_POSITION) { if (selectedMainSettingsPosition == SETTINGS_PLAYBACK_SPEED_POSITION) {
if (position != selectedPlaybackSpeedIndex) { if (position != selectedPlaybackSpeedIndex) {
float speed = playbackSpeedMultBy100List.get(position) / 100.0f; float speed = playbackSpeedMultBy100List.get(position) / 100.0f;
setPlaybackSpeed(speed); setPlaybackSpeed(speed);
}
} }
settingsWindow.dismiss();
} }
settingsWindow.dismiss();
}); });
} }
} }
...@@ -2012,21 +1997,18 @@ public class StyledPlayerControlView extends FrameLayout { ...@@ -2012,21 +1997,18 @@ 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 if (trackSelector != null) {
public void onClick(View v) { ParametersBuilder parametersBuilder = trackSelector.getParameters().buildUpon();
if (trackSelector != null) { for (int i = 0; i < rendererIndices.size(); i++) {
ParametersBuilder parametersBuilder = trackSelector.getParameters().buildUpon(); int rendererIndex = rendererIndices.get(i);
for (int i = 0; i < rendererIndices.size(); i++) { parametersBuilder =
int rendererIndex = rendererIndices.get(i); parametersBuilder
parametersBuilder = .clearSelectionOverrides(rendererIndex)
parametersBuilder .setRendererDisabled(rendererIndex, true);
.clearSelectionOverrides(rendererIndex)
.setRendererDisabled(rendererIndex, true);
}
checkNotNull(trackSelector).setParameters(parametersBuilder);
settingsWindow.dismiss();
} }
checkNotNull(trackSelector).setParameters(parametersBuilder);
settingsWindow.dismiss();
} }
}); });
} }
...@@ -2065,22 +2047,19 @@ public class StyledPlayerControlView extends FrameLayout { ...@@ -2065,22 +2047,19 @@ 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 if (trackSelector != null) {
public void onClick(View v) { ParametersBuilder parametersBuilder = trackSelector.getParameters().buildUpon();
if (trackSelector != null) { for (int i = 0; i < rendererIndices.size(); i++) {
ParametersBuilder parametersBuilder = trackSelector.getParameters().buildUpon(); int rendererIndex = rendererIndices.get(i);
for (int i = 0; i < rendererIndices.size(); i++) { parametersBuilder = parametersBuilder.clearSelectionOverrides(rendererIndex);
int rendererIndex = rendererIndices.get(i);
parametersBuilder = parametersBuilder.clearSelectionOverrides(rendererIndex);
}
checkNotNull(trackSelector).setParameters(parametersBuilder);
} }
settingsAdapter.updateSubTexts( checkNotNull(trackSelector).setParameters(parametersBuilder);
SETTINGS_AUDIO_TRACK_SELECTION_POSITION,
getResources().getString(R.string.exo_track_selection_auto));
settingsWindow.dismiss();
} }
settingsAdapter.updateSubTexts(
SETTINGS_AUDIO_TRACK_SELECTION_POSITION,
getResources().getString(R.string.exo_track_selection_auto));
settingsWindow.dismiss();
}); });
} }
...@@ -2176,32 +2155,29 @@ public class StyledPlayerControlView extends FrameLayout { ...@@ -2176,32 +2155,29 @@ 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 if (mappedTrackInfo != null && trackSelector != null) {
public void onClick(View v) { ParametersBuilder parametersBuilder = trackSelector.getParameters().buildUpon();
if (mappedTrackInfo != null && trackSelector != null) { for (int i = 0; i < rendererIndices.size(); i++) {
ParametersBuilder parametersBuilder = trackSelector.getParameters().buildUpon(); int rendererIndex = rendererIndices.get(i);
for (int i = 0; i < rendererIndices.size(); i++) { if (rendererIndex == track.rendererIndex) {
int rendererIndex = rendererIndices.get(i); parametersBuilder =
if (rendererIndex == track.rendererIndex) { parametersBuilder
parametersBuilder = .setSelectionOverride(
parametersBuilder rendererIndex,
.setSelectionOverride( checkNotNull(mappedTrackInfo).getTrackGroups(rendererIndex),
rendererIndex, new SelectionOverride(track.groupIndex, track.trackIndex))
checkNotNull(mappedTrackInfo).getTrackGroups(rendererIndex), .setRendererDisabled(rendererIndex, false);
new SelectionOverride(track.groupIndex, track.trackIndex)) } else {
.setRendererDisabled(rendererIndex, false); parametersBuilder =
} else { parametersBuilder
parametersBuilder = .clearSelectionOverrides(rendererIndex)
parametersBuilder .setRendererDisabled(rendererIndex, true);
.clearSelectionOverrides(rendererIndex)
.setRendererDisabled(rendererIndex, true);
}
} }
checkNotNull(trackSelector).setParameters(parametersBuilder);
onTrackSelection(track.trackName);
settingsWindow.dismiss();
} }
checkNotNull(trackSelector).setParameters(parametersBuilder);
onTrackSelection(track.trackName);
settingsWindow.dismiss();
} }
}); });
} }
......
library/ui/src/main/java/com/google/android/exoplayer2/ui/StyledPlayerControlViewLayoutManager.java
...@@ -22,15 +22,14 @@ import android.animation.ObjectAnimator; ...@@ -22,15 +22,14 @@ import android.animation.ObjectAnimator;
import android.animation.ValueAnimator; import android.animation.ValueAnimator;
import android.content.res.Resources; import android.content.res.Resources;
import android.view.View; import android.view.View;
import android.view.View.OnClickListener; import android.view.View.OnLayoutChangeListener;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.view.ViewGroup.MarginLayoutParams; import android.view.ViewGroup.MarginLayoutParams;
import android.view.animation.LinearInterpolator; import android.view.animation.LinearInterpolator;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import java.util.ArrayList; import java.util.ArrayList;
/* package */ final class StyledPlayerControlViewLayoutManager /* package */ final class StyledPlayerControlViewLayoutManager {
implements View.OnLayoutChangeListener {
private static final long ANIMATION_INTERVAL_MS = 2_000; private static final long ANIMATION_INTERVAL_MS = 2_000;
private static final long DURATION_FOR_HIDING_ANIMATION_MS = 250; private static final long DURATION_FOR_HIDING_ANIMATION_MS = 250;
private static final long DURATION_FOR_SHOWING_ANIMATION_MS = 250; private static final long DURATION_FOR_SHOWING_ANIMATION_MS = 250;
...@@ -47,6 +46,13 @@ import java.util.ArrayList; ...@@ -47,6 +46,13 @@ import java.util.ArrayList;
// Int for defining the UX state where the views are being animated to be shown. // Int for defining the UX state where the views are being animated to be shown.
private static final int UX_STATE_ANIMATING_SHOW = 4; private static final int UX_STATE_ANIMATING_SHOW = 4;
private final Runnable showAllBarsRunnable;
private final Runnable hideAllBarsRunnable;
private final Runnable hideProgressBarRunnable;
private final Runnable hideMainBarsRunnable;
private final Runnable hideControllerRunnable;
private final OnLayoutChangeListener onLayoutChangeListener;
private int uxState = UX_STATE_ALL_VISIBLE; private int uxState = UX_STATE_ALL_VISIBLE;
private boolean isMinimalMode; private boolean isMinimalMode;
private boolean needToShowBars; private boolean needToShowBars;
...@@ -73,7 +79,16 @@ import java.util.ArrayList; ...@@ -73,7 +79,16 @@ import java.util.ArrayList;
@Nullable private ValueAnimator overflowShowAnimator; @Nullable private ValueAnimator overflowShowAnimator;
@Nullable private ValueAnimator overflowHideAnimator; @Nullable private ValueAnimator overflowHideAnimator;
void show() { public StyledPlayerControlViewLayoutManager() {
showAllBarsRunnable = this::showAllBars;
hideAllBarsRunnable = this::hideAllBars;
hideProgressBarRunnable = this::hideProgressBar;
hideMainBarsRunnable = this::hideMainBars;
hideControllerRunnable = this::hideController;
onLayoutChangeListener = this::onLayoutChange;
}
public void show() {
if (this.styledPlayerControlView == null) { if (this.styledPlayerControlView == null) {
return; return;
} }
...@@ -83,10 +98,10 @@ import java.util.ArrayList; ...@@ -83,10 +98,10 @@ import java.util.ArrayList;
styledPlayerControlView.updateAll(); styledPlayerControlView.updateAll();
styledPlayerControlView.requestPlayPauseFocus(); styledPlayerControlView.requestPlayPauseFocus();
} }
styledPlayerControlView.post(showAllBars); styledPlayerControlView.post(showAllBarsRunnable);
} }
void hide() { public void hide() {
if (styledPlayerControlView == null if (styledPlayerControlView == null
|| uxState == UX_STATE_ANIMATING_HIDE || uxState == UX_STATE_ANIMATING_HIDE
|| uxState == UX_STATE_NONE_VISIBLE) { || uxState == UX_STATE_NONE_VISIBLE) {
...@@ -94,23 +109,23 @@ import java.util.ArrayList; ...@@ -94,23 +109,23 @@ import java.util.ArrayList;
} }
removeHideCallbacks(); removeHideCallbacks();
if (!animationEnabled) { if (!animationEnabled) {
postDelayedRunnable(hideController, 0); postDelayedRunnable(hideControllerRunnable, 0);
} else if (uxState == UX_STATE_ONLY_PROGRESS_VISIBLE) { } else if (uxState == UX_STATE_ONLY_PROGRESS_VISIBLE) {
postDelayedRunnable(hideProgressBar, 0); postDelayedRunnable(hideProgressBarRunnable, 0);
} else { } else {
postDelayedRunnable(hideAllBars, 0); postDelayedRunnable(hideAllBarsRunnable, 0);
} }
} }
void setAnimationEnabled(boolean animationEnabled) { public void setAnimationEnabled(boolean animationEnabled) {
this.animationEnabled = animationEnabled; this.animationEnabled = animationEnabled;
} }
boolean isAnimationEnabled() { public boolean isAnimationEnabled() {
return animationEnabled; return animationEnabled;
} }
void resetHideCallbacks() { public void resetHideCallbacks() {
if (uxState == UX_STATE_ANIMATING_HIDE) { if (uxState == UX_STATE_ANIMATING_HIDE) {
return; return;
} }
...@@ -119,29 +134,29 @@ import java.util.ArrayList; ...@@ -119,29 +134,29 @@ import java.util.ArrayList;
styledPlayerControlView != null ? styledPlayerControlView.getShowTimeoutMs() : 0; styledPlayerControlView != null ? styledPlayerControlView.getShowTimeoutMs() : 0;
if (showTimeoutMs > 0) { if (showTimeoutMs > 0) {
if (!animationEnabled) { if (!animationEnabled) {
postDelayedRunnable(hideController, showTimeoutMs); postDelayedRunnable(hideControllerRunnable, showTimeoutMs);
} else if (uxState == UX_STATE_ONLY_PROGRESS_VISIBLE) { } else if (uxState == UX_STATE_ONLY_PROGRESS_VISIBLE) {
postDelayedRunnable(hideProgressBar, ANIMATION_INTERVAL_MS); postDelayedRunnable(hideProgressBarRunnable, ANIMATION_INTERVAL_MS);
} else { } else {
postDelayedRunnable(hideMainBars, showTimeoutMs); postDelayedRunnable(hideMainBarsRunnable, showTimeoutMs);
} }
} }
} }
void removeHideCallbacks() { public void removeHideCallbacks() {
if (styledPlayerControlView == null) { if (styledPlayerControlView == null) {
return; return;
} }
styledPlayerControlView.removeCallbacks(hideController); styledPlayerControlView.removeCallbacks(hideControllerRunnable);
styledPlayerControlView.removeCallbacks(hideAllBars); styledPlayerControlView.removeCallbacks(hideAllBarsRunnable);
styledPlayerControlView.removeCallbacks(hideMainBars); styledPlayerControlView.removeCallbacks(hideMainBarsRunnable);
styledPlayerControlView.removeCallbacks(hideProgressBar); styledPlayerControlView.removeCallbacks(hideProgressBarRunnable);
} }
void onViewAttached(StyledPlayerControlView v) { public void onViewAttached(StyledPlayerControlView v) {
styledPlayerControlView = v; styledPlayerControlView = v;
v.addOnLayoutChangeListener(this); v.addOnLayoutChangeListener(onLayoutChangeListener);
// Relating to Title Bar View // Relating to Title Bar View
ViewGroup titleBar = v.findViewById(R.id.exo_title_bar); ViewGroup titleBar = v.findViewById(R.id.exo_title_bar);
...@@ -167,8 +182,8 @@ import java.util.ArrayList; ...@@ -167,8 +182,8 @@ import java.util.ArrayList;
overflowShowButton = v.findViewById(R.id.exo_overflow_show); overflowShowButton = v.findViewById(R.id.exo_overflow_show);
View overflowHideButton = v.findViewById(R.id.exo_overflow_hide); View overflowHideButton = v.findViewById(R.id.exo_overflow_hide);
if (overflowShowButton != null && overflowHideButton != null) { if (overflowShowButton != null && overflowHideButton != null) {
overflowShowButton.setOnClickListener(overflowListener); overflowShowButton.setOnClickListener(this::onOverflowButtonClick);
overflowHideButton.setOnClickListener(overflowListener); overflowHideButton.setOnClickListener(this::onOverflowButtonClick);
} }
this.titleBar = titleBar; this.titleBar = titleBar;
...@@ -256,7 +271,7 @@ import java.util.ArrayList; ...@@ -256,7 +271,7 @@ import java.util.ArrayList;
setUxState(UX_STATE_ONLY_PROGRESS_VISIBLE); setUxState(UX_STATE_ONLY_PROGRESS_VISIBLE);
if (needToShowBars) { if (needToShowBars) {
if (styledPlayerControlView != null) { if (styledPlayerControlView != null) {
styledPlayerControlView.post(showAllBars); styledPlayerControlView.post(showAllBarsRunnable);
} }
needToShowBars = false; needToShowBars = false;
} }
...@@ -282,7 +297,7 @@ import java.util.ArrayList; ...@@ -282,7 +297,7 @@ import java.util.ArrayList;
setUxState(UX_STATE_NONE_VISIBLE); setUxState(UX_STATE_NONE_VISIBLE);
if (needToShowBars) { if (needToShowBars) {
if (styledPlayerControlView != null) { if (styledPlayerControlView != null) {
styledPlayerControlView.post(showAllBars); styledPlayerControlView.post(showAllBarsRunnable);
} }
needToShowBars = false; needToShowBars = false;
} }
...@@ -306,7 +321,7 @@ import java.util.ArrayList; ...@@ -306,7 +321,7 @@ import java.util.ArrayList;
setUxState(UX_STATE_NONE_VISIBLE); setUxState(UX_STATE_NONE_VISIBLE);
if (needToShowBars) { if (needToShowBars) {
if (styledPlayerControlView != null) { if (styledPlayerControlView != null) {
styledPlayerControlView.post(showAllBars); styledPlayerControlView.post(showAllBarsRunnable);
} }
needToShowBars = false; needToShowBars = false;
} }
...@@ -403,11 +418,11 @@ import java.util.ArrayList; ...@@ -403,11 +418,11 @@ import java.util.ArrayList;
}); });
} }
void onViewDetached(StyledPlayerControlView v) { public void onViewDetached(StyledPlayerControlView v) {
v.removeOnLayoutChangeListener(this); v.removeOnLayoutChangeListener(onLayoutChangeListener);
} }
boolean isFullyVisible() { public boolean isFullyVisible() {
if (styledPlayerControlView == null) { if (styledPlayerControlView == null) {
return false; return false;
} }
...@@ -432,80 +447,91 @@ import java.util.ArrayList; ...@@ -432,80 +447,91 @@ import java.util.ArrayList;
} }
} }
private final Runnable showAllBars = private void onLayoutChange(
new Runnable() { View v,
@Override int left,
public void run() { int top,
if (!animationEnabled) { int right,
setUxState(UX_STATE_ALL_VISIBLE); int bottom,
resetHideCallbacks(); int oldLeft,
return; int oldTop,
} int oldRight,
int oldBottom) {
switch (uxState) { boolean shouldBeMinimalMode = shouldBeMinimalMode();
case UX_STATE_NONE_VISIBLE: if (isMinimalMode != shouldBeMinimalMode) {
if (showAllBarsAnimator != null) { isMinimalMode = shouldBeMinimalMode;
showAllBarsAnimator.start(); v.post(this::updateLayoutForSizeChange);
} }
break; boolean widthChanged = (right - left) != (oldRight - oldLeft);
case UX_STATE_ONLY_PROGRESS_VISIBLE: if (!isMinimalMode && widthChanged) {
if (showMainBarsAnimator != null) { v.post(this::onLayoutWidthChanged);
showMainBarsAnimator.start(); }
} }
break;
case UX_STATE_ANIMATING_HIDE: private void onOverflowButtonClick(View v) {
needToShowBars = true; resetHideCallbacks();
break; if (v.getId() == R.id.exo_overflow_show && overflowShowAnimator != null) {
case UX_STATE_ANIMATING_SHOW: overflowShowAnimator.start();
return; } else if (v.getId() == R.id.exo_overflow_hide && overflowHideAnimator != null) {
default: overflowHideAnimator.start();
break; }
} }
resetHideCallbacks();
} private void showAllBars() {
}; if (!animationEnabled) {
setUxState(UX_STATE_ALL_VISIBLE);
private final Runnable hideAllBars = resetHideCallbacks();
new Runnable() { return;
@Override }
public void run() {
if (hideAllBarsAnimator == null) { switch (uxState) {
return; case UX_STATE_NONE_VISIBLE:
} if (showAllBarsAnimator != null) {
hideAllBarsAnimator.start(); showAllBarsAnimator.start();
}
};
private final Runnable hideMainBars =
new Runnable() {
@Override
public void run() {
if (hideMainBarsAnimator == null) {
return;
}
hideMainBarsAnimator.start();
postDelayedRunnable(hideProgressBar, ANIMATION_INTERVAL_MS);
} }
}; break;
case UX_STATE_ONLY_PROGRESS_VISIBLE:
private final Runnable hideProgressBar = if (showMainBarsAnimator != null) {
new Runnable() { showMainBarsAnimator.start();
@Override
public void run() {
if (hideProgressBarAnimator == null) {
return;
}
hideProgressBarAnimator.start();
} }
}; break;
case UX_STATE_ANIMATING_HIDE:
needToShowBars = true;
break;
case UX_STATE_ANIMATING_SHOW:
return;
default:
break;
}
resetHideCallbacks();
}
private final Runnable hideController = private void hideAllBars() {
new Runnable() { if (hideAllBarsAnimator == null) {
@Override return;
public void run() { }
setUxState(UX_STATE_NONE_VISIBLE); hideAllBarsAnimator.start();
} }
};
private void hideProgressBar() {
if (hideProgressBarAnimator == null) {
return;
}
hideProgressBarAnimator.start();
}
private void hideMainBars() {
if (hideMainBarsAnimator == null) {
return;
}
hideMainBarsAnimator.start();
postDelayedRunnable(hideProgressBarRunnable, ANIMATION_INTERVAL_MS);
}
private void hideController() {
setUxState(UX_STATE_NONE_VISIBLE);
}
private static ObjectAnimator ofTranslationY(float startValue, float endValue, View target) { private static ObjectAnimator ofTranslationY(float startValue, float endValue, View target) {
return ObjectAnimator.ofFloat(target, "translationY", startValue, endValue); return ObjectAnimator.ofFloat(target, "translationY", startValue, endValue);
...@@ -532,50 +558,6 @@ import java.util.ArrayList; ...@@ -532,50 +558,6 @@ import java.util.ArrayList;
} }
} }
private final OnClickListener overflowListener =
new OnClickListener() {
@Override
public void onClick(View v) {
resetHideCallbacks();
if (v.getId() == R.id.exo_overflow_show && overflowShowAnimator != null) {
overflowShowAnimator.start();
} else if (v.getId() == R.id.exo_overflow_hide && overflowHideAnimator != null) {
overflowHideAnimator.start();
}
}
};
@Override
public void onLayoutChange(
View v,
int left,
int top,
int right,
int bottom,
int oldLeft,
int oldTop,
int oldRight,
int oldBottom) {
boolean shouldBeMinimalMode = shouldBeMinimalMode();
if (isMinimalMode != shouldBeMinimalMode) {
isMinimalMode = shouldBeMinimalMode;
v.post(() -> updateLayoutForSizeChange());
}
boolean widthChanged = (right - left) != (oldRight - oldLeft);
if (!isMinimalMode && widthChanged) {
v.post(() -> onLayoutWidthChanged());
}
}
private static int getWidth(@Nullable View v) {
return (v != null ? v.getWidth() : 0);
}
private static int getHeight(@Nullable View v) {
return (v != null ? v.getHeight() : 0);
}
private boolean shouldBeMinimalMode() { private boolean shouldBeMinimalMode() {
if (this.styledPlayerControlView == null) { if (this.styledPlayerControlView == null) {
return isMinimalMode; return isMinimalMode;
...@@ -733,4 +715,12 @@ import java.util.ArrayList; ...@@ -733,4 +715,12 @@ import java.util.ArrayList;
} }
} }
} }
private static int getWidth(@Nullable View v) {
return (v != null ? v.getWidth() : 0);
}
private static int getHeight(@Nullable View v) {
return (v != null ? v.getHeight() : 0);
}
} }
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