Commit 1051580a by bachinger Committed by Oliver Woodman

Improve naming of the methods of LivePlaybackSpeedControl

PiperOrigin-RevId: 338232327
parent 54506b50
...@@ -181,19 +181,19 @@ public final class DefaultLivePlaybackSpeedControl implements LivePlaybackSpeedC ...@@ -181,19 +181,19 @@ public final class DefaultLivePlaybackSpeedControl implements LivePlaybackSpeedC
} }
@Override @Override
public void updateLiveConfiguration(LiveConfiguration liveConfiguration) { public void setLiveConfiguration(LiveConfiguration liveConfiguration) {
this.mediaConfiguration = liveConfiguration; this.mediaConfiguration = liveConfiguration;
lastPlaybackSpeedUpdateMs = C.TIME_UNSET; lastPlaybackSpeedUpdateMs = C.TIME_UNSET;
} }
@Override @Override
public void overrideTargetLiveOffsetUs(long liveOffsetUs) { public void setTargetLiveOffsetOverrideUs(long liveOffsetUs) {
this.targetLiveOffsetOverrideUs = liveOffsetUs; this.targetLiveOffsetOverrideUs = liveOffsetUs;
lastPlaybackSpeedUpdateMs = C.TIME_UNSET; lastPlaybackSpeedUpdateMs = C.TIME_UNSET;
} }
@Override @Override
public float adjustPlaybackSpeed(long liveOffsetUs) { public float getAdjustedPlaybackSpeed(long liveOffsetUs) {
long targetLiveOffsetUs = getTargetLiveOffsetUs(); long targetLiveOffsetUs = getTargetLiveOffsetUs();
if (targetLiveOffsetUs == C.TIME_UNSET) { if (targetLiveOffsetUs == C.TIME_UNSET) {
return 1f; return 1f;
......
...@@ -870,7 +870,8 @@ import java.util.concurrent.atomic.AtomicBoolean; ...@@ -870,7 +870,8 @@ import java.util.concurrent.atomic.AtomicBoolean;
if (playbackInfo.playWhenReady if (playbackInfo.playWhenReady
&& isCurrentPeriodInMovingLiveWindow() && isCurrentPeriodInMovingLiveWindow()
&& playbackInfo.playbackParameters.speed == 1f) { && playbackInfo.playbackParameters.speed == 1f) {
float adjustedSpeed = livePlaybackSpeedControl.adjustPlaybackSpeed(getCurrentLiveOffsetUs()); float adjustedSpeed =
livePlaybackSpeedControl.getAdjustedPlaybackSpeed(getCurrentLiveOffsetUs());
if (mediaClock.getPlaybackParameters().speed != adjustedSpeed) { if (mediaClock.getPlaybackParameters().speed != adjustedSpeed) {
mediaClock.setPlaybackParameters(playbackInfo.playbackParameters.withSpeed(adjustedSpeed)); mediaClock.setPlaybackParameters(playbackInfo.playbackParameters.withSpeed(adjustedSpeed));
} }
...@@ -1798,9 +1799,9 @@ import java.util.concurrent.atomic.AtomicBoolean; ...@@ -1798,9 +1799,9 @@ import java.util.concurrent.atomic.AtomicBoolean;
} }
int windowIndex = newTimeline.getPeriodByUid(newPeriodId.periodUid, period).windowIndex; int windowIndex = newTimeline.getPeriodByUid(newPeriodId.periodUid, period).windowIndex;
newTimeline.getWindow(windowIndex, window); newTimeline.getWindow(windowIndex, window);
livePlaybackSpeedControl.updateLiveConfiguration(window.mediaItem.liveConfiguration); livePlaybackSpeedControl.setLiveConfiguration(window.mediaItem.liveConfiguration);
if (positionForTargetOffsetOverrideUs != C.TIME_UNSET) { if (positionForTargetOffsetOverrideUs != C.TIME_UNSET) {
livePlaybackSpeedControl.overrideTargetLiveOffsetUs( livePlaybackSpeedControl.setTargetLiveOffsetOverrideUs(
getLiveOffsetUs(newTimeline, newPeriodId.periodUid, positionForTargetOffsetOverrideUs)); getLiveOffsetUs(newTimeline, newPeriodId.periodUid, positionForTargetOffsetOverrideUs));
} else { } else {
Object windowUid = window.uid; Object windowUid = window.uid;
...@@ -1811,7 +1812,7 @@ import java.util.concurrent.atomic.AtomicBoolean; ...@@ -1811,7 +1812,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
} }
if (!Util.areEqual(oldWindowUid, windowUid)) { if (!Util.areEqual(oldWindowUid, windowUid)) {
// Reset overridden target live offset to media values if window changes. // Reset overridden target live offset to media values if window changes.
livePlaybackSpeedControl.overrideTargetLiveOffsetUs(C.TIME_UNSET); livePlaybackSpeedControl.setTargetLiveOffsetOverrideUs(C.TIME_UNSET);
} }
} }
} }
......
...@@ -24,20 +24,21 @@ import com.google.android.exoplayer2.MediaItem.LiveConfiguration; ...@@ -24,20 +24,21 @@ import com.google.android.exoplayer2.MediaItem.LiveConfiguration;
public interface LivePlaybackSpeedControl { public interface LivePlaybackSpeedControl {
/** /**
* Updates the live configuration defined by the media. * Sets the live configuration defined by the media.
* *
* @param liveConfiguration The {@link LiveConfiguration} as defined by the media. * @param liveConfiguration The {@link LiveConfiguration} as defined by the media.
*/ */
void updateLiveConfiguration(LiveConfiguration liveConfiguration); void setLiveConfiguration(LiveConfiguration liveConfiguration);
/** /**
* Overrides the {@link #updateLiveConfiguration configured} target live offset in microseconds, * Sets the target live offset in microseconds that overrides the live offset {@link
* or {@code C.TIME_UNSET} to delete a previous override. * #setLiveConfiguration configured} by the media. Passing {@code C.TIME_UNSET} deletes a previous
* override.
* *
* <p>If no target live offset is configured by {@link #updateLiveConfiguration}, this override * <p>If no target live offset is configured by {@link #setLiveConfiguration}, this override has
* has no effect. * no effect.
*/ */
void overrideTargetLiveOffsetUs(long liveOffsetUs); void setTargetLiveOffsetOverrideUs(long liveOffsetUs);
/** /**
* Returns the adjusted playback speed in order get closer towards the {@link * Returns the adjusted playback speed in order get closer towards the {@link
...@@ -46,7 +47,7 @@ public interface LivePlaybackSpeedControl { ...@@ -46,7 +47,7 @@ public interface LivePlaybackSpeedControl {
* @param liveOffsetUs The current live offset, in microseconds. * @param liveOffsetUs The current live offset, in microseconds.
* @return The adjusted playback speed. * @return The adjusted playback speed.
*/ */
float adjustPlaybackSpeed(long liveOffsetUs); float getAdjustedPlaybackSpeed(long liveOffsetUs);
/** /**
* Returns the current target live offset, in microseconds, or {@link C#TIME_UNSET} if no target * Returns the current target live offset, in microseconds, or {@link C#TIME_UNSET} if no target
......
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