sjs/media
1
0
Fork 0
mirror of https://github.com/samsonjs/media.git synced 2026-04-27 15:07:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

VideoFrameReleaseTimeHelper: Account for playback speed

Browse source 
Previously the helper would constantly lose (or never establish) sync
for non-1x playback speeds. This changes the helper to account for
other playback speeds correctly.

PiperOrigin-RevId: 345458859
This commit is contained in:
olly 2020-12-03 16:36:24 +00:00 committed by Oliver Woodman
parent 74bbd5367e
commit 2980354510
1 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
library/core/src/main/java/com/google/android/exoplayer2/video/VideoFrameReleaseTimeHelper.java
View file

@ -62,7 +62,7 @@ public final class VideoFrameReleaseTimeHelper {
@Nullable private final DefaultDisplayListener displayListener; @Nullable private final DefaultDisplayListener displayListener;
private float formatFrameRate; private float formatFrameRate;
private float playbackSpeed; private double playbackSpeed;
private long nextFramePresentationTimeUs; private long nextFramePresentationTimeUs;
private long vsyncDurationNs; private long vsyncDurationNs;
@ -152,8 +152,9 @@ public final class VideoFrameReleaseTimeHelper {
* *
* @param playbackSpeed The player's speed. * @param playbackSpeed The player's speed.
*/ */
public void onPlaybackSpeed(float playbackSpeed) { public void onPlaybackSpeed(double playbackSpeed) {
this.playbackSpeed = playbackSpeed; this.playbackSpeed = playbackSpeed;
haveSync = false;
} }
/** /**
@ -179,7 +180,9 @@ public final class VideoFrameReleaseTimeHelper {
/** Returns the estimated playback frame rate, or {@link C#RATE_UNSET} if unknown. */ /** Returns the estimated playback frame rate, or {@link C#RATE_UNSET} if unknown. */
public float getPlaybackFrameRate() { public float getPlaybackFrameRate() {
return formatFrameRate == Format.NO_VALUE ? C.RATE_UNSET : (formatFrameRate * playbackSpeed); return formatFrameRate == Format.NO_VALUE
? C.RATE_UNSET
: (float) (formatFrameRate * playbackSpeed);
} }
/** /**
@ -213,7 +216,8 @@ public final class VideoFrameReleaseTimeHelper {
// Project the adjusted frame time forward using the average. // Project the adjusted frame time forward using the average.
long candidateAdjustedReleaseTimeNs = long candidateAdjustedReleaseTimeNs =
lastAdjustedReleaseTimeNs lastAdjustedReleaseTimeNs
+ averageFrameDurationNs * (frameCount - lastAdjustedFrameIndex); + getPlayoutDuration(
averageFrameDurationNs * (frameCount - lastAdjustedFrameIndex));
if (adjustmentAllowed(releaseTimeNs, candidateAdjustedReleaseTimeNs)) { if (adjustmentAllowed(releaseTimeNs, candidateAdjustedReleaseTimeNs)) {
adjustedReleaseTimeNs = candidateAdjustedReleaseTimeNs; adjustedReleaseTimeNs = candidateAdjustedReleaseTimeNs;
@ -224,7 +228,8 @@ public final class VideoFrameReleaseTimeHelper {
// We're synced but haven't waited the required number of frames to apply an adjustment. // We're synced but haven't waited the required number of frames to apply an adjustment.
// Check for drift between the proposed and projected frame release timestamps. // Check for drift between the proposed and projected frame release timestamps.
long projectedReleaseTimeNs = long projectedReleaseTimeNs =
syncReleaseTimeNs + (framePresentationTimeNs - syncFramePresentationTimeNs); syncReleaseTimeNs
+ getPlayoutDuration(framePresentationTimeNs - syncFramePresentationTimeNs);
if (!adjustmentAllowed(releaseTimeNs, projectedReleaseTimeNs)) { if (!adjustmentAllowed(releaseTimeNs, projectedReleaseTimeNs)) {
haveSync = false; haveSync = false;
} }
@ -275,6 +280,10 @@ public final class VideoFrameReleaseTimeHelper {
} }
} }
private long getPlayoutDuration(long mediaDuration) {
return (long) (mediaDuration / playbackSpeed);
}
private static boolean adjustmentAllowed( private static boolean adjustmentAllowed(
long unadjustedReleaseTimeNs, long adjustedReleaseTimeNs) { long unadjustedReleaseTimeNs, long adjustedReleaseTimeNs) {
return Math.abs(unadjustedReleaseTimeNs - adjustedReleaseTimeNs) <= MAX_ALLOWED_ADJUSTMENT_NS; return Math.abs(unadjustedReleaseTimeNs - adjustedReleaseTimeNs) <= MAX_ALLOWED_ADJUSTMENT_NS;