Fix time remaining treatment

Eliastik · Mar 3, 2024 · 33e53bb · 33e53bb
1 parent e927e33
commit 33e53bb
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 21 deletions.
diff --git a/dist/cjs/SimpleSoundStudioLibrary.js b/dist/cjs/SimpleSoundStudioLibrary.js
diff --git a/dist/cjs/SimpleSoundStudioLibrary.js.map b/dist/cjs/SimpleSoundStudioLibrary.js.map
diff --git a/dist/esm/SimpleSoundStudioLibrary.js b/dist/esm/SimpleSoundStudioLibrary.js
diff --git a/dist/esm/SimpleSoundStudioLibrary.js.map b/dist/esm/SimpleSoundStudioLibrary.js.map
diff --git a/lib/AudioEditor.ts b/lib/AudioEditor.ts
@@ -353,6 +353,7 @@ export default class AudioEditor extends AbstractAudioElement {
 
             if (this.eventEmitter) {
                 this.eventEmitter.emit(EventType.UPDATE_AUDIO_TREATMENT_PERCENT, 0);
+                this.eventEmitter.emit(EventType.UPDATE_REMAINING_TIME_ESTIMATED, -1);
             }
         } else {
             throw new Error("Audio Context is not ready!");
@@ -503,6 +504,7 @@ export default class AudioEditor extends AbstractAudioElement {
 
         if (this.eventEmitter) {
             this.eventEmitter.emit(EventType.UPDATE_AUDIO_TREATMENT_PERCENT, 0);
+            this.eventEmitter.emit(EventType.UPDATE_REMAINING_TIME_ESTIMATED, -1);
         }
 
         const passthroughFilter = this.filters.find(f => f.id === Constants.FILTERS_NAMES.PASSTHROUGH);

diff --git a/lib/filters/PassThroughFilter.ts b/lib/filters/PassThroughFilter.ts
@@ -18,22 +18,13 @@ export default class PassThroughFilter extends AbstractAudioFilterWorklet<PassTh
     }
 
     receiveEvent(message: MessageEvent<PassThroughWorkletEvent>): void {
+        if (!this.eventEmitter) {
+            return;
+        }
+
         const currentTime = performance.now();
         const samplesProcessed = message.data.samplesCount;
 
-        if (this.currentTimeSamplesPerSecond === 0) {
-            this.currentTimeSamplesPerSecond = currentTime;
-        }
-
-        const timeDifferenceSamplePerSecond = currentTime - this.currentTimeSamplesPerSecond;
-
-        if (timeDifferenceSamplePerSecond >= 1000) {
-            console.log(samplesProcessed, this.lastSampleCount);
-            this.samplePerSecond = (samplesProcessed - this.lastSampleCount) / (timeDifferenceSamplePerSecond / 1000);
-            this.currentTimeSamplesPerSecond = currentTime;
-            this.lastSampleCount = samplesProcessed;
-        }
-
         if (this.currentTime === 0) {
             this.currentTime = currentTime;
         }
@@ -43,16 +34,27 @@ export default class PassThroughFilter extends AbstractAudioFilterWorklet<PassTh
         const remainingSamples = this._totalSamples - samplesProcessed;
         const remainingTimeSeconds = remainingSamples / this.samplePerSecond;
 
-        if (this.eventEmitter && message.data.command === "update" && timeDifference >= Constants.TREATMENT_TIME_COUNTING_THROTTLE_INTERVAL) {
+        if (message.data.command === "update" && timeDifference >= Constants.TREATMENT_TIME_COUNTING_THROTTLE_INTERVAL) {
             this.eventEmitter.emit(EventType.UPDATE_AUDIO_TREATMENT_PERCENT, percentageProcessed * 100);
+            this.currentTime = currentTime;
+        }
+
+        if (this.currentTimeSamplesPerSecond === 0) {
+            this.currentTimeSamplesPerSecond = currentTime;
+        }
+
+        const timeDifferenceSamplePerSecond = currentTime - this.currentTimeSamplesPerSecond;
+
+        if (timeDifferenceSamplePerSecond >= 1000) {
+            this.samplePerSecond = (samplesProcessed - this.lastSampleCount) / (timeDifferenceSamplePerSecond / 1000);
+            this.currentTimeSamplesPerSecond = currentTime;
+            this.lastSampleCount = samplesProcessed;
 
             if (isNaN(remainingTimeSeconds) || !isFinite(remainingTimeSeconds)) {
-                this.eventEmitter.emit(EventType.UPDATE_REMAINING_TIME_ESTIMATED, 0);
+                this.eventEmitter.emit(EventType.UPDATE_REMAINING_TIME_ESTIMATED, -1);
             } else {
                 this.eventEmitter.emit(EventType.UPDATE_REMAINING_TIME_ESTIMATED, remainingTimeSeconds);
             }
-
-            this.currentTime = currentTime;
         }
     }