loliball/media3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Handle playToEndOfStream called before configuring the audio sink

Browse Source 
ExoPlayer sometimes calls AudioSink.playToEndOfStream before configuring
the sink. Before this CL, the composition player was failing if this
happened.

PiperOrigin-RevId: 634306592
This commit is contained in:
kimvde 2024-05-16 04:17:50 -07:00 committed by Copybara-Service
parent a4faf4db6f
commit e23cc756e2
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libraries/transformer/src/main/java/androidx/media3/transformer/AudioGraphInputAudioSink.java
View File

@ -122,7 +122,7 @@ import java.util.Objects;
EditedMediaItem editedMediaItem = checkStateNotNull(currentEditedMediaItemInfo).editedMediaItem; EditedMediaItem editedMediaItem = checkStateNotNull(currentEditedMediaItemInfo).editedMediaItem;
// TODO(b/303029969): Evaluate throwing vs ignoring for null outputChannels. // TODO(b/303029969): Evaluate throwing vs ignoring for null outputChannels.
checkArgument(outputChannels == null); checkArgument(outputChannels == null);
this.currentInputFormat = inputFormat; currentInputFormat = inputFormat;
if (outputGraphInput == null) { if (outputGraphInput == null) {
try { try {
outputGraphInput = controller.getAudioGraphInput(editedMediaItem, currentInputFormat); outputGraphInput = controller.getAudioGraphInput(editedMediaItem, currentInputFormat);
@ -137,6 +137,9 @@ import java.util.Objects;
@Override @Override
public boolean isEnded() { public boolean isEnded() {
if (currentInputFormat == null) { // Sink not configured.
return inputStreamEnded;
}
// If we are playing the last media item in the sequence, we must also check that the controller // If we are playing the last media item in the sequence, we must also check that the controller
// is ended. // is ended.
return inputStreamEnded return inputStreamEnded
@ -154,6 +157,9 @@ import java.util.Objects;
@Override @Override
public void playToEndOfStream() { public void playToEndOfStream() {
inputStreamEnded = true; inputStreamEnded = true;
if (currentInputFormat == null) { // Sink not configured.
return;
}
// Queue end-of-stream only if playing the last media item in the sequence. // Queue end-of-stream only if playing the last media item in the sequence.
if (!signalledEndOfStream && checkStateNotNull(currentEditedMediaItemInfo).isLastInSequence) { if (!signalledEndOfStream && checkStateNotNull(currentEditedMediaItemInfo).isLastInSequence) {
signalledEndOfStream = signalledEndOfStream =