From 351b8673ee9f3f4de81551baa88a07243b97493d Mon Sep 17 00:00:00 2001
From: Mikael Finstad <finstaden@gmail.com>
Date: Wed, 26 Jul 2023 09:56:46 +0200
Subject: [PATCH] fix duration formatting

---
 src/util/duration.js      |  4 ++--
 src/util/duration.test.js | 12 +++++++++++-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/util/duration.js b/src/util/duration.js
index 57f4969a..14ac9683 100644
--- a/src/util/duration.js
+++ b/src/util/duration.js
@@ -12,8 +12,8 @@ export function formatDuration({ seconds: totalSecondsIn, fileNameFriendly, show
 
   const seconds = Math.floor(totalUnits / unitsPerSec);
   const secondsPadded = padStart(seconds % 60, 2, '0');
-  const minutes = Math.floor((totalUnits / 1000 / 60)) % 60;
-  const hours = Math.floor(totalUnits / 1000 / 60 / 60);
+  const minutes = Math.floor(totalUnits / unitsPerSec / 60) % 60;
+  const hours = Math.floor(totalUnits / unitsPerSec / 60 / 60);
 
   const minutesPadded = shorten && hours === 0 ? `${minutes}` : padStart(minutes, 2, '0');
 
diff --git a/src/util/duration.test.js b/src/util/duration.test.js
index 8d2030eb..664a6745 100644
--- a/src/util/duration.test.js
+++ b/src/util/duration.test.js
@@ -42,12 +42,22 @@ it('should format and parse duration with correct rounding', () => {
   expect(formatDuration({ seconds: parseDuration('01:00:00.000') })).toBe('01:00:00.000');
 });
 
-it('should handle issue 1603', () => {
+// https://github.com/mifi/lossless-cut/issues/1603
+it('should round up properly', () => {
+  const fps = 30;
+  const halfFrame = (1 / fps) / 2;
   expect(formatDuration({ seconds: 1 })).toBe('00:00:01.000');
+  expect(formatDuration({ seconds: 1, fps })).toBe('00:00:01.00');
   expect(formatDuration({ seconds: 0.999999 })).toBe('00:00:01.000');
+  expect(formatDuration({ seconds: 1 - halfFrame + 0.001, fps })).toBe('00:00:01.00');
   expect(formatDuration({ seconds: 0.999 })).toBe('00:00:00.999');
+  expect(formatDuration({ seconds: 1 - halfFrame - 0.001, fps })).toBe('00:00:00.29');
   expect(formatDuration({ seconds: 59.999 })).toBe('00:00:59.999');
+  expect(formatDuration({ seconds: 60 - halfFrame - 0.001, fps })).toBe('00:00:59.29');
   expect(formatDuration({ seconds: 59.9999 })).toBe('00:01:00.000');
+  expect(formatDuration({ seconds: (60 - halfFrame) + 0.001, fps })).toBe('00:01:00.00');
   expect(formatDuration({ seconds: 3599.999 })).toBe('00:59:59.999');
+  expect(formatDuration({ seconds: (3600 - halfFrame) - 0.001, fps })).toBe('00:59:59.29');
   expect(formatDuration({ seconds: 3599.9999 })).toBe('01:00:00.000');
+  expect(formatDuration({ seconds: (3600 - halfFrame) + 0.001, fps })).toBe('01:00:00.00');
 });