From e23cc756e2b5ff0c0f11c9b7c8aaf2446682dae2 Mon Sep 17 00:00:00 2001
From: kimvde <kimvde@google.com>
Date: Thu, 16 May 2024 04:17:50 -0700
Subject: [PATCH] Handle playToEndOfStream called before configuring the audio
 sink

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

PiperOrigin-RevId: 634306592
---
 .../media3/transformer/AudioGraphInputAudioSink.java      | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/AudioGraphInputAudioSink.java b/libraries/transformer/src/main/java/androidx/media3/transformer/AudioGraphInputAudioSink.java
index beb0a619ab..10902254e3 100644
--- a/libraries/transformer/src/main/java/androidx/media3/transformer/AudioGraphInputAudioSink.java
+++ b/libraries/transformer/src/main/java/androidx/media3/transformer/AudioGraphInputAudioSink.java
@@ -122,7 +122,7 @@ import java.util.Objects;
     EditedMediaItem editedMediaItem = checkStateNotNull(currentEditedMediaItemInfo).editedMediaItem;
     // TODO(b/303029969): Evaluate throwing vs ignoring for null outputChannels.
     checkArgument(outputChannels == null);
-    this.currentInputFormat = inputFormat;
+    currentInputFormat = inputFormat;
     if (outputGraphInput == null) {
       try {
         outputGraphInput = controller.getAudioGraphInput(editedMediaItem, currentInputFormat);
@@ -137,6 +137,9 @@ import java.util.Objects;
 
   @Override
   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
     // is ended.
     return inputStreamEnded
@@ -154,6 +157,9 @@ import java.util.Objects;
   @Override
   public void playToEndOfStream() {
     inputStreamEnded = true;
+    if (currentInputFormat == null) { // Sink not configured.
+      return;
+    }
     // Queue end-of-stream only if playing the last media item in the sequence.
     if (!signalledEndOfStream && checkStateNotNull(currentEditedMediaItemInfo).isLastInSequence) {
       signalledEndOfStream =