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

DefaultAudioSink: Fix transient position calculation errors

Browse Source 
PiperOrigin-RevId: 344408351
This commit is contained in:
olly 2020-11-26 13:25:46 +00:00 committed by Andrew Lewis
parent 43713abe79
commit dd0246a31c
1 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
library/core/src/main/java/com/google/android/exoplayer2/audio/DefaultAudioSink.java
View File

@ -1407,21 +1407,33 @@ public final class DefaultAudioSink implements AudioSink {
mediaPositionParameters = mediaPositionParametersCheckpoints.remove(); mediaPositionParameters = mediaPositionParametersCheckpoints.remove();
} }
long playoutDurationSinceLastCheckpoint = long playoutDurationSinceLastCheckpointUs =
positionUs - mediaPositionParameters.audioTrackPositionUs; positionUs - mediaPositionParameters.audioTrackPositionUs;
if (!mediaPositionParameters.playbackParameters.equals(PlaybackParameters.DEFAULT)) { if (mediaPositionParameters.playbackParameters.equals(PlaybackParameters.DEFAULT)) {
if (mediaPositionParametersCheckpoints.isEmpty()) { return mediaPositionParameters.mediaTimeUs + playoutDurationSinceLastCheckpointUs;
playoutDurationSinceLastCheckpoint = } else if (mediaPositionParametersCheckpoints.isEmpty()) {
audioProcessorChain.getMediaDuration(playoutDurationSinceLastCheckpoint); long mediaDurationSinceLastCheckpointUs =
} else { audioProcessorChain.getMediaDuration(playoutDurationSinceLastCheckpointUs);
// Playing data at a previous playback speed, so fall back to multiplying by the speed. return mediaPositionParameters.mediaTimeUs + mediaDurationSinceLastCheckpointUs;
playoutDurationSinceLastCheckpoint = } else {
Util.getMediaDurationForPlayoutDuration( // The processor chain has been configured with new parameters, but we're still playing audio
playoutDurationSinceLastCheckpoint, // that was processed using previous parameters. We can't scale the playout duration using the
mediaPositionParameters.playbackParameters.speed); // processor chain in this case, so we fall back to scaling using the previous parameters'
} // target speed instead. Since the processor chain may not have achieved the target speed
// precisely, we scale the duration to the next checkpoint (which will always be small) rather
// than the duration from the previous checkpoint (which may be arbitrarily large). This
// limits the amount of error that can be introduced due to a difference between the target
// and actual speeds.
MediaPositionParameters nextMediaPositionParameters =
mediaPositionParametersCheckpoints.getFirst();
long playoutDurationUntilNextCheckpointUs =
nextMediaPositionParameters.audioTrackPositionUs - positionUs;
long mediaDurationUntilNextCheckpointUs =
Util.getMediaDurationForPlayoutDuration(
playoutDurationUntilNextCheckpointUs,
mediaPositionParameters.playbackParameters.speed);
return nextMediaPositionParameters.mediaTimeUs - mediaDurationUntilNextCheckpointUs;
} }
return mediaPositionParameters.mediaTimeUs + playoutDurationSinceLastCheckpoint;
} }
private long applySkipping(long positionUs) { private long applySkipping(long positionUs) {