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

Use the onPresentationEnded callback to detect end of offloaded audio

Browse Source 
In offloaded audio playback, the `DefaultAudioSink` should use the `AudioTrack.StreamEventCallback` `onPresentationEnded` to note whether the AudioTrack has completed playing all pending data.

PiperOrigin-RevId: 622885399
This commit is contained in:
michaelkatz 2024-04-08 10:20:48 -07:00 committed by Copybara-Service
parent fad3257072
commit 5e85823ea0
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
RELEASENOTES.md
View File

@ -154,6 +154,8 @@ This release includes the following changes since the
* Audio:
* Allow renderer recovery by disabling offload if audio track fails to
initialize in offload mode.
* For offloaded playback, use the `AudioTrack.StreamEventCallback` method
`onPresentationEnded` to identify when all pending data has been played.
* Video:
* Add workaround for a device issue on Galaxy Tab S7 FE, Chromecast with
Google TV, and Lenovo M10 FHD Plus that causes 60fps H265 streams to be

14
libraries/exoplayer/src/main/java/androidx/media3/exoplayer/audio/DefaultAudioSink.java
View File

@ -543,6 +543,7 @@ public final class DefaultAudioSink implements AudioSink {
private int preV21OutputBufferOffset;
private boolean handledEndOfStream;
private boolean stoppedAudioTrack;
private boolean handledOffloadOnPresentationEnded;
private boolean playing;
private boolean externalAudioSessionIdProvided;
@ -1298,6 +1299,9 @@ public final class DefaultAudioSink implements AudioSink {
@Override
public boolean hasPendingData() {
return isAudioTrackInitialized()
&& (Util.SDK_INT < 29
|| !audioTrack.isOffloadedPlayback()
|| !handledOffloadOnPresentationEnded)
&& audioTrackPositionTracker.hasPendingData(getWrittenFrames());
}
@ -1553,6 +1557,7 @@ public final class DefaultAudioSink implements AudioSink {
outputBuffer = null;
stoppedAudioTrack = false;
handledEndOfStream = false;
handledOffloadOnPresentationEnded = false;
avSyncHeader = null;
bytesUntilNextAvSync = 0;
trimmingAudioProcessor.resetTrimmedFrameCount();
@ -1966,6 +1971,15 @@ public final class DefaultAudioSink implements AudioSink {
}
}
@Override
public void onPresentationEnded(AudioTrack track) {
if (!track.equals(audioTrack)) {
// Stale event.
return;
}
handledOffloadOnPresentationEnded = true;
}
@Override
public void onTearDown(AudioTrack track) {
if (!track.equals(audioTrack)) {