commit cbd3d55ba78c11ec550792e8ca64ed51bb60112d
author Ralph <hidetsugu.tamaki@linecorp.com> Fri Aug 30 04:28:33 2019 +0900
committer Gabriel Peal <gpeal@users.noreply.github.com> Thu Aug 29 15:28:33 2019 -0400
tree 954b3c11534499884232d48fdb0dede586f8af87
parent ddd1ac0a7f1929d59c4b5bd2a84aa16ca947ef75

Fix rounding-off error on progress calculation with time-remapped layer (#1372)

lottie/src/main/java/com/airbnb/lottie/model/layer/CompositionLayer.java

diff --git a/lottie/src/main/java/com/airbnb/lottie/model/layer/CompositionLayer.java b/lottie/src/main/java/com/airbnb/lottie/model/layer/CompositionLayer.java
index 28e6e85..7e9bf1d 100644
--- a/lottie/src/main/java/com/airbnb/lottie/model/layer/CompositionLayer.java
+++ b/lottie/src/main/java/com/airbnb/lottie/model/layer/CompositionLayer.java
@@ -116,10 +116,13 @@
   @Override public void setProgress(@FloatRange(from = 0f, to = 1f) float progress) {
     super.setProgress(progress);
     if (timeRemapping != null) {
-      float duration = lottieDrawable.getComposition().getDuration();
-      float compositionDelayTime = layerModel.getComposition().getStartFrame() / layerModel.getComposition().getFrameRate() * 1000;
-      long remappedTime = (long) (timeRemapping.getValue() * 1000 - compositionDelayTime);
-      progress = remappedTime / duration;
+      // The duration has 0.01 frame offset to show end of animation properly.
+      // https://github.com/airbnb/lottie-android/pull/766
+      // Ignore this offset for calculating time-remapping because time-remapping value is based on original duration.
+      float durationFrames = lottieDrawable.getComposition().getDurationFrames() + 0.01f;
+      float compositionDelayFrames = layerModel.getComposition().getStartFrame();
+      float remappedFrames = timeRemapping.getValue() * layerModel.getComposition().getFrameRate() - compositionDelayFrames;
+      progress = remappedFrames / durationFrames;
     }
     if (layerModel.getTimeStretch() != 0) {
       progress /= layerModel.getTimeStretch();