From a05ecee1b992d8131ac7bee6184a40210f6b7657 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jindra=20Pet=C5=99=C3=ADk?= <jindra.petrik@gmail.com>
Date: Mon, 9 Jan 2023 19:52:08 +0100
Subject: [PATCH] Fixed Incorrect frame counting

---
 CHANGELOG.md                                  |  1 +
 .../decompiler/flash/gui/ImagePanel.java      | 33 +++++++++++--------
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7c5769068..778395a5c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,7 @@ All notable changes to this project will be documented in this file.
 - Clear preview on raw edit to stop sound playback
 - CXFORM and GRADRECORD causing NotSerializableException
 - Scrollbars
+- Incorrect frame counting
 
 ## [18.3.0] - 2023-01-01
 ### Added
diff --git a/src/com/jpexs/decompiler/flash/gui/ImagePanel.java b/src/com/jpexs/decompiler/flash/gui/ImagePanel.java
index b307cc631..abca1ef58 100644
--- a/src/com/jpexs/decompiler/flash/gui/ImagePanel.java
+++ b/src/com/jpexs/decompiler/flash/gui/ImagePanel.java
@@ -301,6 +301,8 @@ public final class ImagePanel extends JPanel implements MediaDisplay {
     private List<java.awt.Point> showPoints1 = new ArrayList<>();
     
     private List<java.awt.Point> showPoints2 = new ArrayList<>();
+    
+    private int displayedFrame = 0;
 
     
     public void setShowPoints(List<java.awt.Point> showPoints1, List<java.awt.Point> showPoints2) {
@@ -2709,6 +2711,7 @@ public final class ImagePanel extends JPanel implements MediaDisplay {
                 this.stillFrame = false;
             }
             this.prevFrame = -1;
+            this.displayedFrame = this.frame;
 
             RECT timRect = drawable.getRect();
 
@@ -2884,9 +2887,7 @@ public final class ImagePanel extends JPanel implements MediaDisplay {
         displayObjectCache.clear();
     }
 
-    private void nextFrame(Timer thisTimer, final int cnt, final int timeShouldBe) {
-        drawFrame(thisTimer, true);
-
+    private void nextFrame(Timer thisTimer, final int cnt, final int timeShouldBe) {                                
         synchronized (ImagePanel.class) {
             if (timelined != null && timer == thisTimer) {
                 int frameCount = timelined.getTimeline().getFrameCount();
@@ -2914,6 +2915,7 @@ public final class ImagePanel extends JPanel implements MediaDisplay {
                 } else {
                     time = timeShouldBe;
                 }
+                drawFrame(thisTimer, true);
             }
         }
         fireMediaDisplayStateChanged();
@@ -3339,6 +3341,7 @@ public final class ImagePanel extends JPanel implements MediaDisplay {
                                         newBounds.getCenterY());
                             }
                         }
+                        //System.out.println("drawFrame "+frame);
                     }
                 }
 
@@ -3585,7 +3588,7 @@ public final class ImagePanel extends JPanel implements MediaDisplay {
                 frame = 0;
                 prevFrame = -1;
             }
-
+            
             startTimer(timeline, true);
         }
     }
@@ -3642,13 +3645,11 @@ public final class ImagePanel extends JPanel implements MediaDisplay {
         return ret;
     }
 
-    private void scheduleTask(boolean singleFrame, long msDelay) {
+    private void scheduleTask(boolean singleFrame, long msDelay, boolean first) {
         TimerTask task = new TimerTask() {
             public final Timer thisTimer = timer;
 
-            public final boolean isSingleFrame = singleFrame;
-
-            private long lastRun = 0L;
+            public final boolean isSingleFrame = singleFrame;                      
 
             @Override
             public void run() {
@@ -3658,7 +3659,6 @@ public final class ImagePanel extends JPanel implements MediaDisplay {
                             return;
                         }
                     }
-                    lastRun = System.currentTimeMillis();
                     int curFrame = frame;
                     long delay = getMsPerFrame();
                     if (isSingleFrame) {
@@ -3680,7 +3680,7 @@ public final class ImagePanel extends JPanel implements MediaDisplay {
                             return;
                         }
                         //How many ticks (= times where frame should be displayed in framerate) are there from hitting play button
-                        int ticksFromStart = (int) Math.floor((frameTimeMsIs - startRun) / (double) getMsPerFrame()) + 1;
+                        int ticksFromStart = (int) Math.floor((frameTimeMsIs - startRun) / (double) getMsPerFrame());
 
                         //How many frames are there between last displayed frame and now. For perfect display(=no framedrop), value should be 1
                         int skipFrames;
@@ -3711,7 +3711,12 @@ public final class ImagePanel extends JPanel implements MediaDisplay {
                         if (frameCount == 1 || stillFrame) { //We have only one frame, so the ticks on that frame equal ticks on whole timeline
                             currentFrameTicks = ticksFromStart;
                         }
-                        nextFrame(thisTimer, skipFrames, currentFrameTicks);
+                        
+                        if (first) {
+                            drawFrame(thisTimer, true);
+                        } else {
+                            nextFrame(thisTimer, skipFrames, currentFrameTicks);
+                        }
 
                         long afterDrawFrameTimeMsIs = System.currentTimeMillis();
 
@@ -3728,7 +3733,7 @@ public final class ImagePanel extends JPanel implements MediaDisplay {
                         }
                     }
                     //schedule next run of the task
-                    scheduleTask(isSingleFrame, delay);
+                    scheduleTask(isSingleFrame, delay, false);
 
                 } catch (Exception ex) {
                     logger.log(Level.SEVERE, "Frame drawing error", ex);
@@ -3765,8 +3770,8 @@ public final class ImagePanel extends JPanel implements MediaDisplay {
         }
         timer = new Timer();
         fpsShouldBe = timeline.frameRate;
-        fpsIs = fpsShouldBe;
-        scheduleTask(singleFrame, 0);
+        fpsIs = fpsShouldBe;        
+        scheduleTask(singleFrame, 0, true);
     }
 
     @Override