mirror of
https://github.com/androidx/media.git
synced 2025-04-30 06:46:50 +08:00
Compare commits
No commits in common. "002ae1473b399002812221c0725532bd34f5fd63" and "1ea69ca7bea83a561b56a6d6f07d1c08b19f32c8" have entirely different histories.
002ae1473b
...
1ea69ca7be
@ -1,9 +1,9 @@
|
||||
[
|
||||
{
|
||||
"name": "Dogs Short -> Dogs",
|
||||
"name": "Cats -> Dogs",
|
||||
"playlist": [
|
||||
{
|
||||
"uri": "https://storage.googleapis.com/exoplayer-test-media-1/mp4/android-screens-10s.mp4"
|
||||
"uri": "https://html5demos.com/assets/dizzy.mp4"
|
||||
},
|
||||
{
|
||||
"uri": "https://storage.googleapis.com/exoplayer-test-media-1/mkv/android-screens-lavf-56.36.100-aac-avc-main-1280x720.mkv"
|
||||
|
@ -90,7 +90,6 @@ import androidx.media3.effect.TextureOverlay
|
||||
import androidx.media3.exoplayer.ExoPlayer
|
||||
import androidx.media3.ui.PlayerView
|
||||
import com.google.common.collect.ImmutableList
|
||||
import java.util.Locale
|
||||
import kotlinx.coroutines.launch
|
||||
|
||||
class EffectActivity : ComponentActivity() {
|
||||
@ -365,7 +364,7 @@ class EffectActivity : ComponentActivity() {
|
||||
Slider(
|
||||
value = effectControlsState.contrastValue,
|
||||
onValueChange = { newContrastValue ->
|
||||
val newRoundedContrastValue = "%.2f".format(Locale.ROOT, newContrastValue).toFloat()
|
||||
val newRoundedContrastValue = "%.2f".format(newContrastValue).toFloat()
|
||||
onEffectControlsStateChange(
|
||||
effectControlsState.copy(
|
||||
effectsChanged = true,
|
||||
@ -438,7 +437,7 @@ class EffectActivity : ComponentActivity() {
|
||||
Slider(
|
||||
value = effectControlsState.textOverlayAlpha,
|
||||
onValueChange = { newAlphaValue ->
|
||||
val newRoundedAlphaValue = "%.2f".format(Locale.ROOT, newAlphaValue).toFloat()
|
||||
val newRoundedAlphaValue = "%.2f".format(newAlphaValue).toFloat()
|
||||
onEffectControlsStateChange(
|
||||
effectControlsState.copy(
|
||||
effectsChanged = effectControlsState.textOverlayText != null,
|
||||
|
@ -1930,7 +1930,7 @@ public class CastPlayerTest {
|
||||
|
||||
assertThat(castPlayer.getPlaylistMetadata()).isEqualTo(metadata);
|
||||
|
||||
verify(mockListener).onPlaylistMetadataChanged(metadata);
|
||||
verify(mockListener, times(1)).onPlaylistMetadataChanged(metadata);
|
||||
}
|
||||
|
||||
@Test
|
||||
@ -1948,7 +1948,7 @@ public class CastPlayerTest {
|
||||
castPlayer.addListener(mockListener);
|
||||
castPlayer.setDeviceVolume(volumeToSet, /* flags= */ 0);
|
||||
|
||||
verify(mockListener).onDeviceVolumeChanged(volumeToSet, /* muted= */ false);
|
||||
verify(mockListener, times(1)).onDeviceVolumeChanged(volumeToSet, /* muted= */ false);
|
||||
verify(mockCastSession).setVolume((double) volumeToSet / maxVolume);
|
||||
assertThat(castPlayer.getDeviceVolume()).isEqualTo(volumeToSet);
|
||||
|
||||
@ -1957,7 +1957,7 @@ public class CastPlayerTest {
|
||||
when(mockCastSession.getVolume()).thenReturn(newCastSessionVolume);
|
||||
castListener.onVolumeChanged();
|
||||
assertThat(castPlayer.getDeviceVolume()).isEqualTo(expectedDeviceVolume);
|
||||
verify(mockListener).onDeviceVolumeChanged(volumeToSet, /* muted= */ false);
|
||||
verify(mockListener, times(1)).onDeviceVolumeChanged(volumeToSet, /* muted= */ false);
|
||||
}
|
||||
|
||||
@Test
|
||||
@ -1965,14 +1965,14 @@ public class CastPlayerTest {
|
||||
castPlayer.addListener(mockListener);
|
||||
castPlayer.setDeviceMuted(true, /* flags= */ 0);
|
||||
|
||||
verify(mockListener).onDeviceVolumeChanged(0, /* muted= */ true);
|
||||
verify(mockListener, times(1)).onDeviceVolumeChanged(0, /* muted= */ true);
|
||||
verify(mockCastSession).setMute(true);
|
||||
assertThat(castPlayer.isDeviceMuted()).isTrue();
|
||||
assertThat(castPlayer.isDeviceMuted()).isEqualTo(true);
|
||||
|
||||
when(mockCastSession.isMute()).thenReturn(false);
|
||||
castListener.onVolumeChanged();
|
||||
assertThat(castPlayer.isDeviceMuted()).isFalse();
|
||||
verify(mockListener).onDeviceVolumeChanged(0, /* muted= */ false);
|
||||
assertThat(castPlayer.isDeviceMuted()).isEqualTo(false);
|
||||
verify(mockListener, times(1)).onDeviceVolumeChanged(0, /* muted= */ false);
|
||||
}
|
||||
|
||||
private int[] createMediaQueueItemIds(int numberOfIds) {
|
||||
|
Loading…
x
Reference in New Issue
Block a user