loliball/media
1
0
Fork 0
mirror of https://github.com/androidx/media.git synced 2025-04-30 06:46:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Send renderer settings messages to secondary renderers in ExoPlayer

Browse Source 
They are currently only sent to the primary renderer.

PiperOrigin-RevId: 726864595
This commit is contained in:
tonihei 2025-02-14 04:02:35 -08:00 committed by Copybara-Service
parent 12afdfbaea
commit cd6e61d856
2 changed files with 113 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libraries/exoplayer/src/main/java/androidx/media3/exoplayer/ExoPlayerImpl.java
View File

@ -2875,6 +2875,11 @@ import java.util.concurrent.CopyOnWriteArraySet;
createMessageInternal(renderer).setType(messageType).setPayload(payload).send(); createMessageInternal(renderer).setType(messageType).setPayload(payload).send();
} }
} }
for (@Nullable Renderer renderer : secondaryRenderers) {
if (renderer != null && (trackType == -1 || renderer.getTrackType() == trackType)) {
createMessageInternal(renderer).setType(messageType).setPayload(payload).send();
}
}
} }
private void updatePriorityTaskManagerForIsLoadingChange(boolean isLoading) { private void updatePriorityTaskManagerForIsLoadingChange(boolean isLoading) {

108
libraries/exoplayer/src/test/java/androidx/media3/exoplayer/ExoPlayerTest.java
View File

@ -16356,6 +16356,114 @@ public class ExoPlayerTest {
verify(listener).onAudioSessionIdChanged(audioSessionId); verify(listener).onAudioSessionIdChanged(audioSessionId);
} }
@Test
public void setVideoScalingMode_isSetOnPrimaryAndSecondaryVideoRenderers() throws Exception {
AtomicBoolean videoScalingSetOnAudioRenderer = new AtomicBoolean();
AtomicBoolean videoScalingSetOnVideoRenderer1 = new AtomicBoolean();
AtomicBoolean videoScalingSetOnVideoRenderer2 = new AtomicBoolean();
AtomicBoolean videoScalingSetOnSecondaryAudioRenderer = new AtomicBoolean();
AtomicBoolean videoScalingSetOnSecondaryVideoRenderer = new AtomicBoolean();
ExoPlayer player =
new ExoPlayer.Builder(context)
.setRenderersFactory(
new RenderersFactory() {
private boolean secondaryRendererCreated = false;
@Override
public Renderer[] createRenderers(
Handler handler,
VideoRendererEventListener videoRendererEventListener,
AudioRendererEventListener audioRendererEventListener,
TextOutput textRendererOutput,
MetadataOutput metadataRendererOutput) {
return new Renderer[] {
new FakeRenderer(C.TRACK_TYPE_AUDIO) {
@Override
public void handleMessage(
@MessageType int messageType, @Nullable Object message)
throws ExoPlaybackException {
if (messageType == Renderer.MSG_SET_SCALING_MODE) {
videoScalingSetOnAudioRenderer.set(true);
}
super.handleMessage(messageType, message);
}
},
new FakeRenderer(C.TRACK_TYPE_VIDEO) {
@Override
public void handleMessage(
@MessageType int messageType, @Nullable Object message)
throws ExoPlaybackException {
if (messageType == Renderer.MSG_SET_SCALING_MODE) {
videoScalingSetOnVideoRenderer1.set(true);
}
super.handleMessage(messageType, message);
}
},
new FakeRenderer(C.TRACK_TYPE_VIDEO) {
@Override
public void handleMessage(
@MessageType int messageType, @Nullable Object message)
throws ExoPlaybackException {
if (messageType == Renderer.MSG_SET_SCALING_MODE) {
videoScalingSetOnVideoRenderer2.set(true);
}
super.handleMessage(messageType, message);
}
}
};
}
@Nullable
@Override
public Renderer createSecondaryRenderer(
Renderer renderer,
Handler eventHandler,
VideoRendererEventListener videoRendererEventListener,
AudioRendererEventListener audioRendererEventListener,
TextOutput textRendererOutput,
MetadataOutput metadataRendererOutput) {
if (renderer.getTrackType() == C.TRACK_TYPE_AUDIO) {
return new FakeRenderer(C.TRACK_TYPE_AUDIO) {
@Override
public void handleMessage(
@MessageType int messageType, @Nullable Object message)
throws ExoPlaybackException {
if (messageType == Renderer.MSG_SET_SCALING_MODE) {
videoScalingSetOnSecondaryAudioRenderer.set(true);
}
super.handleMessage(messageType, message);
}
};
}
if (!secondaryRendererCreated) {
secondaryRendererCreated = true;
return new FakeRenderer(C.TRACK_TYPE_VIDEO) {
@Override
public void handleMessage(
@MessageType int messageType, @Nullable Object message)
throws ExoPlaybackException {
if (messageType == Renderer.MSG_SET_SCALING_MODE) {
videoScalingSetOnSecondaryVideoRenderer.set(true);
}
super.handleMessage(messageType, message);
}
};
}
return null;
}
})
.build();
player.setVideoScalingMode(C.VIDEO_SCALING_MODE_SCALE_TO_FIT_WITH_CROPPING);
advance(player).untilPendingCommandsAreFullyHandled();
assertThat(videoScalingSetOnAudioRenderer.get()).isFalse();
assertThat(videoScalingSetOnVideoRenderer1.get()).isTrue();
assertThat(videoScalingSetOnVideoRenderer2.get()).isTrue();
assertThat(videoScalingSetOnSecondaryAudioRenderer.get()).isFalse();
assertThat(videoScalingSetOnSecondaryVideoRenderer.get()).isTrue();
}
// Internal methods. // Internal methods.
private void addWatchAsSystemFeature() { private void addWatchAsSystemFeature() {