The default implementation is a no-op. * - * @param playbackSpeed The factor by which playback is sped up. + * @param currentPlaybackSpeed The factor by which playback is currently sped up. + * @param targetPlaybackSpeed The target factor by which playback should be sped up. This may be + * different from {@code currentPlaybackSpeed}, for example, if the speed is temporarily + * adjusted for live playback. * @throws ExoPlaybackException If an error occurs handling the playback speed. */ - default void setPlaybackSpeed(float playbackSpeed) throws ExoPlaybackException {} + default void setPlaybackSpeed(float currentPlaybackSpeed, float targetPlaybackSpeed) + throws ExoPlaybackException {} /** * Incrementally renders the {@link SampleStream}. diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/MediaCodecAudioRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/MediaCodecAudioRenderer.java index 7580202852..990369c783 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/audio/MediaCodecAudioRenderer.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/MediaCodecAudioRenderer.java @@ -390,7 +390,7 @@ public class MediaCodecAudioRenderer extends MediaCodecRenderer implements Media @Override protected float getCodecOperatingRateV23( - float playbackSpeed, Format format, Format[] streamFormats) { + float targetPlaybackSpeed, Format format, Format[] streamFormats) { // Use the highest known stream sample-rate up front, to avoid having to reconfigure the codec // should an adaptive switch to that stream occur. int maxSampleRate = -1; @@ -400,7 +400,7 @@ public class MediaCodecAudioRenderer extends MediaCodecRenderer implements Media maxSampleRate = max(maxSampleRate, streamSampleRate); } } - return maxSampleRate == -1 ? CODEC_OPERATING_RATE_UNSET : (maxSampleRate * playbackSpeed); + return maxSampleRate == -1 ? CODEC_OPERATING_RATE_UNSET : (maxSampleRate * targetPlaybackSpeed); } @Override diff --git a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java index 61e121d6b7..6ca35003d9 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java @@ -312,7 +312,8 @@ public abstract class MediaCodecRenderer extends BaseRenderer { @Nullable private MediaCrypto mediaCrypto; private boolean mediaCryptoRequiresSecureDecoder; private long renderTimeLimitMs; - private float playbackSpeed; + private float currentPlaybackSpeed; + private float targetPlaybackSpeed; @Nullable private MediaCodecAdapter codec; @Nullable private Format codecInputFormat; @Nullable private MediaFormat codecOutputMediaFormat; @@ -393,7 +394,8 @@ public abstract class MediaCodecRenderer extends BaseRenderer { formatQueue = new TimedValueQueue<>(); decodeOnlyPresentationTimestamps = new ArrayList<>(); outputBufferInfo = new MediaCodec.BufferInfo(); - playbackSpeed = 1f; + currentPlaybackSpeed = 1f; + targetPlaybackSpeed = 1f; renderTimeLimitMs = C.TIME_UNSET; pendingOutputStreamStartPositionsUs = new long[MAX_PENDING_OUTPUT_STREAM_OFFSET_COUNT]; pendingOutputStreamOffsetsUs = new long[MAX_PENDING_OUTPUT_STREAM_OFFSET_COUNT]; @@ -715,8 +717,10 @@ public abstract class MediaCodecRenderer extends BaseRenderer { } @Override - public void setPlaybackSpeed(float playbackSpeed) throws ExoPlaybackException { - this.playbackSpeed = playbackSpeed; + public void setPlaybackSpeed(float currentPlaybackSpeed, float targetPlaybackSpeed) + throws ExoPlaybackException { + this.currentPlaybackSpeed = currentPlaybackSpeed; + this.targetPlaybackSpeed = targetPlaybackSpeed; if (codec != null && codecDrainAction != DRAIN_ACTION_REINITIALIZE && getState() != STATE_DISABLED) { @@ -1082,7 +1086,7 @@ public abstract class MediaCodecRenderer extends BaseRenderer { float codecOperatingRate = Util.SDK_INT < 23 ? CODEC_OPERATING_RATE_UNSET - : getCodecOperatingRateV23(playbackSpeed, inputFormat, getStreamFormats()); + : getCodecOperatingRateV23(targetPlaybackSpeed, inputFormat, getStreamFormats()); if (codecOperatingRate <= assumedMinimumCodecOperatingRate) { codecOperatingRate = CODEC_OPERATING_RATE_UNSET; } @@ -1624,9 +1628,9 @@ public abstract class MediaCodecRenderer extends BaseRenderer { && SystemClock.elapsedRealtime() < codecHotswapDeadlineMs)); } - /** Returns the playback speed, as set by {@link #setPlaybackSpeed}. */ + /** Returns the current playback speed, as set by {@link #setPlaybackSpeed}. */ protected float getPlaybackSpeed() { - return playbackSpeed; + return currentPlaybackSpeed; } /** Returns the operating rate used by the current codec */ @@ -1640,14 +1644,16 @@ public abstract class MediaCodecRenderer extends BaseRenderer { * *
The default implementation returns {@link #CODEC_OPERATING_RATE_UNSET}. * - * @param playbackSpeed The factor by which playback is sped up. + * @param targetPlaybackSpeed The target factor by which playback should be sped up. This may be + * different from the current playback speed, for example, if the speed is temporarily + * adjusted for live playback. * @param format The {@link Format} for which the codec is being configured. * @param streamFormats The possible stream formats. * @return The codec operating rate, or {@link #CODEC_OPERATING_RATE_UNSET} if no codec operating * rate should be set. */ protected float getCodecOperatingRateV23( - float playbackSpeed, Format format, Format[] streamFormats) { + float targetPlaybackSpeed, Format format, Format[] streamFormats) { return CODEC_OPERATING_RATE_UNSET; } @@ -1665,7 +1671,7 @@ public abstract class MediaCodecRenderer extends BaseRenderer { } float newCodecOperatingRate = - getCodecOperatingRateV23(playbackSpeed, format, getStreamFormats()); + getCodecOperatingRateV23(targetPlaybackSpeed, format, getStreamFormats()); if (codecOperatingRate == newCodecOperatingRate) { // No change. return true; diff --git a/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java index c52e7063e5..9e3ccbf570 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java @@ -645,14 +645,15 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer { } @Override - public void setPlaybackSpeed(float playbackSpeed) throws ExoPlaybackException { - super.setPlaybackSpeed(playbackSpeed); - frameReleaseHelper.onPlaybackSpeed(playbackSpeed); + public void setPlaybackSpeed(float currentPlaybackSpeed, float targetPlaybackSpeed) + throws ExoPlaybackException { + super.setPlaybackSpeed(currentPlaybackSpeed, targetPlaybackSpeed); + frameReleaseHelper.onPlaybackSpeed(currentPlaybackSpeed); } @Override protected float getCodecOperatingRateV23( - float playbackSpeed, Format format, Format[] streamFormats) { + float targetPlaybackSpeed, Format format, Format[] streamFormats) { // Use the highest known stream frame-rate up front, to avoid having to reconfigure the codec // should an adaptive switch to that stream occur. float maxFrameRate = -1; @@ -662,7 +663,7 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer { maxFrameRate = max(maxFrameRate, streamFrameRate); } } - return maxFrameRate == -1 ? CODEC_OPERATING_RATE_UNSET : (maxFrameRate * playbackSpeed); + return maxFrameRate == -1 ? CODEC_OPERATING_RATE_UNSET : (maxFrameRate * targetPlaybackSpeed); } @Override diff --git a/library/core/src/main/java/com/google/android/exoplayer2/video/VideoFrameReleaseHelper.java b/library/core/src/main/java/com/google/android/exoplayer2/video/VideoFrameReleaseHelper.java index c646a2323f..1778ed6976 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/video/VideoFrameReleaseHelper.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/video/VideoFrameReleaseHelper.java @@ -190,10 +190,9 @@ public final class VideoFrameReleaseHelper { } /** - * Called when the renderer's playback speed changes, where 1 is the default rate, 2 is twice the - * default rate, 0.5 is half the default rate and so on. + * Called when the renderer's playback speed changes. * - * @param playbackSpeed The player's speed. + * @param playbackSpeed The factor by which playback is sped up. */ public void onPlaybackSpeed(float playbackSpeed) { this.playbackSpeed = playbackSpeed;