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

Fix error where non-enabled renderers were set to final

Browse Source 
If the renderer has no stream, then it should not be called with `setCurrentStreamFinal` on it.

PiperOrigin-RevId: 695284225
This commit is contained in:
michaelkatz 2024-11-11 04:33:05 -08:00 committed by Copybara-Service
parent f84f44bf6b
commit 0c982a7994
2 changed files with 47 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libraries/exoplayer/src/main/java/androidx/media3/exoplayer/RendererHolder.java
View File

@ -92,7 +92,9 @@ import java.io.IOException;
* render until the end of the current stream.
*/
public void setCurrentStreamFinal(long streamEndPositionUs) {
setCurrentStreamFinal(renderer, streamEndPositionUs);
if (renderer.getStream() != null) {
setCurrentStreamFinal(renderer, streamEndPositionUs);
}
}
private void setCurrentStreamFinal(Renderer renderer, long streamEndPositionUs) {

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

@ -673,6 +673,50 @@ public class ExoPlayerTest {
assertThat(videoRenderer.resetCount).isEqualTo(0);
}
@Test
public void renderersLifecycle_onlyRenderersThatAreEnabled_areSetToFinal() throws Exception {
AtomicInteger videoStreamSetToFinalCount = new AtomicInteger();
final FakeRenderer videoRenderer = new FakeRenderer(C.TRACK_TYPE_VIDEO);
final FakeRenderer audioRenderer = new FakeRenderer(C.TRACK_TYPE_AUDIO);
final ForwardingRenderer forwardingVideoRenderer =
new ForwardingRenderer(videoRenderer) {
@Override
public void setCurrentStreamFinal() {
super.setCurrentStreamFinal();
videoStreamSetToFinalCount.getAndIncrement();
}
};
ExoPlayer player =
parameterizeTestExoPlayerBuilder(
new TestExoPlayerBuilder(context)
.setRenderers(forwardingVideoRenderer, audioRenderer))
.build();
// Use media sources with discontinuities so that enabled streams are set to final.
ClippingMediaSource clippedFakeAudioSource =
new ClippingMediaSource(
new FakeMediaSource(new FakeTimeline(), ExoPlayerTestRunner.AUDIO_FORMAT), 0, 300_000L);
ClippingMediaSource clippedFakeAudioVideoSource =
new ClippingMediaSource(
new FakeMediaSource(
new FakeTimeline(),
ExoPlayerTestRunner.VIDEO_FORMAT,
ExoPlayerTestRunner.AUDIO_FORMAT),
0,
300_000L);
player.setMediaSources(
ImmutableList.of(
clippedFakeAudioSource, clippedFakeAudioVideoSource, clippedFakeAudioSource));
player.prepare();
player.play();
runUntilPlaybackState(player, Player.STATE_ENDED);
player.release();
assertThat(audioRenderer.enabledCount).isEqualTo(3);
assertThat(videoRenderer.enabledCount).isEqualTo(1);
assertThat(videoStreamSetToFinalCount.get()).isEqualTo(1);
}
/**
* Tests that the player does not unnecessarily reset renderers when playing a multi-period
* source.