Merge pull request #51 from diffusionstudio/matthias/fix/silence-remove-perf-improvement

Matthias/fix/silence remove perf improvement

Author: k9p5

src/tracks/media/media.spec.ts

@@ -60,6 +60,7 @@ describe('The Media Track Object', () => {
 		await track.removeSilences();
 		expect(track.clips.length).toBe(1);
 		expect(track.clips.at(0)).toBe(clip);
+		expect(track.clips.at(0)?.state).toBe('ATTACHED');
 	});
 
 	it('removes silences', async () => {
@@ -81,10 +82,41 @@ describe('The Media Track Object', () => {
 		expect(clip.source).toBeDefined();
 		await track.removeSilences();
 		expect(track.clips.length).toBe(2);
-		expect(track.clips.at(0)?.range[0].millis).toBe(10051);
+		expect(track.clips.at(0)?.range[0].millis).toBe(10050);
 		expect(track.clips.at(0)?.range[1].millis).toBe(11000);
-		expect(track.clips.at(1)?.range[0].millis).toBe(15001);
+		expect(track.clips.at(1)?.range[0].millis).toBe(15000);
 		expect(track.clips.at(1)?.range[1].millis).toBe(19000);
+		expect(track.clips.at(0)?.state).toBe('ATTACHED');
+		expect(track.clips.at(1)?.state).toBe('ATTACHED');
+	});
+
+	it('removes silences twice', async () => {
+		const clip = new MockMediaClip([new Timestamp(10000), new Timestamp(20000)], [
+			{
+				start: new Timestamp(0),
+				stop: new Timestamp(500),
+			},
+			{
+				start: new Timestamp(11000),
+				stop: new Timestamp(15000),
+			},
+			{
+				start: new Timestamp(19000),
+				stop: new Timestamp(30500),
+			},
+		], new Audio());
+		await track.add(clip);
+		expect(clip.source).toBeDefined();
+		await track.removeSilences();
+		await track.removeSilences();
+		expect(track.clips.length).toBe(2);
+		expect(track.clips.at(0)?.id).not.toBe(clip.id);
+		expect(track.clips.at(0)?.range[0].millis).toBe(10000);
+		expect(track.clips.at(0)?.range[1].millis).toBe(11000);
+		expect(track.clips.at(1)?.range[0].millis).toBe(15000);
+		expect(track.clips.at(1)?.range[1].millis).toBe(19000);
+		expect(track.clips.at(0)?.state).toBe('ATTACHED');
+		expect(track.clips.at(1)?.state).toBe('ATTACHED');
 	});
 
 	it('should propagate a seek call', async () => {

src/tracks/media/media.ts

@@ -7,7 +7,7 @@
 
 import { Track } from '../track';
 
-import type { MediaClip } from '../../clips';
+import type { MediaClip, MediaClipProps } from '../../clips';
 import { Timestamp } from '../../models';
 import { SilenceOptions } from '../../sources';
 
@@ -28,6 +28,9 @@ export class MediaTrack<Clip extends MediaClip> extends Track<MediaClip> {
 	 */
 	public async removeSilences(options: SilenceOptions = {}) {
 		const numClips = this.clips.length;
+
+		let newClips: MediaClip<MediaClipProps>[] = [];
+		let clipsToDetach: MediaClip<MediaClipProps>[] = [];
 		// Process each clip
 		for (let i = 0; i < numClips; i++) {
 			const clip = this.clips[i];
@@ -51,29 +54,37 @@ export class MediaTrack<Clip extends MediaClip> extends Track<MediaClip> {
 				continue;
 			}
 
+			clipsToDetach.push(clip);
 			let start = clip.range[0];
-            let currentClip = clip;
+            let currentClip = clip.copy();
 
 			for (const silence of applicableSilences) {
-                if (silence.start.millis <= start.millis) {
-                    const newClip = await currentClip.split(silence.stop.add(currentClip.offset));
-                    currentClip.detach();
-                    start = silence.stop;
-                    currentClip = newClip;
+				if (silence.start.millis <= start.millis) {
+					start = silence.stop;
+					currentClip.range[0] = silence.stop;
                     continue;
                 }
 
                 if (silence.stop.millis >= currentClip.range[1].millis) {
-                    currentClip = await currentClip.split(silence.start.add(currentClip.offset));
-                    currentClip.detach();
+					currentClip.range[1] = silence.start;
+					start = silence.stop;
+					newClips.push(currentClip);
                     continue;
                 }
-                
-                const middleClip = await currentClip.split(silence.start.add(currentClip.offset));
-				
-                currentClip = await middleClip.split(silence.stop.add(middleClip.offset));
-                middleClip.detach();
+                const middleClip = currentClip.copy();
+				middleClip.range[0] = silence.stop;
+
+                currentClip.range[1] = silence.start;
+				newClips.push(currentClip);	
+
+				currentClip = middleClip;
+			}
+			if (currentClip.id !== newClips.at(-1)?.id) {
+				newClips.push(currentClip);
 			}
 		}
+		clipsToDetach.forEach((clip) => clip.detach());
+		const promises = newClips.map((clip) => this.add(clip));
+		await Promise.all(promises);
 	}
 }