Fix offload playback readiness and presentation end handling.

Googler · copybara-github · commit 3a4987a95b4c · 2026-03-11T11:54:19.000-07:00
In DefaultAudioSink, only mark offload presentation as handled if the audio output has actually stopped. This prevents `hasPendingData` from returning false prematurely during offloaded playlist playback.

PiperOrigin-RevId: 882123651
diff --git a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/audio/DefaultAudioSink.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/audio/DefaultAudioSink.java
@@ -1939,7 +1939,13 @@ public void onOffloadPresentationEnded() {
         // Stale event.
         return;
       }
-      handledOffloadOnPresentationEnded = true;
+      // Without checking `stoppedAudioOutput`, during playlist playback with offloaded audio,
+      // `hasPendingData` could return false prematurely. We only update
+      // `handledOffloadOnPresentationEnded` to true if the audio output has actually finished
+      // playing.
+      if (stoppedAudioOutput) {
+        handledOffloadOnPresentationEnded = true;
+      }
     }
 
     @Override

Original file line number	Diff line number	Diff line change
`@@ -1939,7 +1939,13 @@ public void onOffloadPresentationEnded() {`
`1939`	`1939`	`// Stale event.`
`1940`	`1940`	`return;`
`1941`	`1941`	`}`
`1942`		`- handledOffloadOnPresentationEnded = true;`
	`1942`	+ // Without checking `stoppedAudioOutput`, during playlist playback with offloaded audio,
	`1943`	+ // `hasPendingData` could return false prematurely. We only update
	`1944`	+ // `handledOffloadOnPresentationEnded` to true if the audio output has actually finished
	`1945`	`+ // playing.`
	`1946`	`+ if (stoppedAudioOutput) {`
	`1947`	`+ handledOffloadOnPresentationEnded = true;`
	`1948`	`+ }`
`1943`	`1949`	`}`
`1944`	`1950`
`1945`	`1951`	`@Override`