Commit bb9ac214 by tianyifeng Committed by tonihei

Handle dead object error during writing buffer to AudioTrack

PiperOrigin-RevId: 514989776
parent 87d1c3e6
......@@ -904,7 +904,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
}
private void attemptRendererErrorRecovery() throws ExoPlaybackException {
seekToCurrentPosition(/* sendDiscontinuity= */ true);
reselectTracksInternalAndSeek();
}
private void updatePlaybackPositions() throws ExoPlaybackException {
......@@ -1688,6 +1688,11 @@ import java.util.concurrent.atomic.AtomicBoolean;
enabledRendererCount--;
}
private void reselectTracksInternalAndSeek() throws ExoPlaybackException {
reselectTracksInternal();
seekToCurrentPosition(/* sendDiscontinuity= */ true);
}
private void reselectTracksInternal() throws ExoPlaybackException {
float playbackSpeed = mediaClock.getPlaybackParameters().speed;
// Reselect tracks on each period in turn, until the selection changes.
......
......@@ -453,7 +453,6 @@ public final class DefaultAudioSink implements AudioSink {
@GuardedBy("releaseExecutorLock")
private static int pendingReleaseCount;
private final AudioCapabilities audioCapabilities;
private final com.google.android.exoplayer2.audio.AudioProcessorChain audioProcessorChain;
private final boolean enableFloatOutput;
private final ChannelMappingAudioProcessor channelMappingAudioProcessor;
......@@ -478,6 +477,7 @@ public final class DefaultAudioSink implements AudioSink {
private @MonotonicNonNull Configuration configuration;
private @MonotonicNonNull AudioProcessingPipeline audioProcessingPipeline;
@Nullable private AudioTrack audioTrack;
private AudioCapabilities audioCapabilities;
private AudioAttributes audioAttributes;
@Nullable private MediaPositionParameters afterDrainParameters;
......@@ -1128,6 +1128,8 @@ public final class DefaultAudioSink implements AudioSink {
listener.onAudioSinkError(e);
}
if (e.isRecoverable) {
// Change to the audio capabilities supported by all the devices during the error recovery.
audioCapabilities = DEFAULT_AUDIO_CAPABILITIES;
throw e; // Do not delay the exception if it can be recovered at higher level.
}
writeExceptionPendingExceptionHolder.throwExceptionIfDeadlineIsReached(e);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment