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