@revideo/2d 0.5.6-alpha.1066 → 0.5.6

package/lib/utils/video/parser/segment.js

@@ -130,11 +130,30 @@ export class Segment {
             return;
         }
         if (this.responseFinished && this.encodedChunkQueue.length === 0) {
-            await this.decoder.flush();
+            await this.flushDecoderWithRetry();
             this.currentFramePastSegmentEndTime = true;
             return;
         }
     }
+    async flushDecoderWithRetry(maxRetries = 3, timeoutMs = 2000) {
+        for (let attempt = 0; attempt < maxRetries; attempt++) {
+            // Sometimes decoder.flush does not resolve even though the queue size is zero
+            if (this.decoder.decodeQueueSize === 0) {
+                return;
+            }
+            try {
+                await Promise.race([
+                    this.decoder.flush(),
+                    new Promise((_, reject) => setTimeout(() => reject(new Error('Flush timeout')), timeoutMs)),
+                ]);
+            }
+            catch (error) {
+                if (attempt === maxRetries) {
+                    throw error;
+                }
+            }
+        }
+    }
     /**
      * Called when the decoder has a frame ready.
      * Pushes the frame to the buffer so it can be consumed.
@@ -173,7 +192,7 @@ export class Segment {
         }
         // Wait for decoder if there are frames due.
         if (this.frameBuffer.length === 0 && this.framesDue > 0) {
-            let maxIterations = 1000;
+            let maxIterations = 200;
             while (this.frameBuffer.length === 0) {
                 await new Promise(res => setTimeout(res, 10));
                 maxIterations--;
@@ -181,7 +200,7 @@ export class Segment {
                     return;
                 }
                 if (maxIterations === 0) {
-                    throw new Error(`Timed out while waiting for VideoDecoder to produce a frame. Frames due: ${this.framesDue}`);
+                    return; // TODO: investigate further, shouldn't this be an error?
                 }
             }
         }
@@ -217,4 +236,4 @@ export class Segment {
         return this.startTime;
     }
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"segment.js","sourceRoot":"","sources":["../../../../src/lib/utils/video/parser/segment.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"segment.js","sourceRoot":"","sources":["../../../../src/lib/utils/video/parser/segment.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@revideo/2d",
-  "version": "0.5.6-alpha.1066+3c56528f",
+  "version": "0.5.6",
   "description": "A 2D renderer for revideo",
   "author": "revideo",
   "homepage": "https://re.video/",
@@ -29,8 +29,8 @@
   ],
   "devDependencies": {
     "@preact/signals": "^1.2.1",
-    "@revideo/internal": "^0.0.0",
-    "@revideo/ui": "^0.5.6-alpha.1066+3c56528f",
+    "@revideo/internal": "0.0.0",
+    "@revideo/ui": "0.5.6",
     "clsx": "^2.0.0",
     "jsdom": "^22.1.0",
     "preact": "^10.19.2",
@@ -40,7 +40,7 @@
     "@codemirror/language": "^6.10.1",
     "@lezer/common": "^1.2.1",
     "@lezer/highlight": "^1.2.0",
-    "@revideo/core": "^0.5.6-alpha.1066+3c56528f",
+    "@revideo/core": "0.5.6",
     "@rive-app/canvas-advanced": "2.7.3",
     "code-fns": "^0.8.2",
     "hls.js": "^1.5.11",
@@ -48,5 +48,5 @@
     "mp4box": "^0.5.2",
     "parse-svg-path": "^0.1.2"
   },
-  "gitHead": "3c56528f2522a1eb5e029e5bd29dfe7f86f7aaac"
+  "gitHead": "6e350fa16d493d3bd20a4e06fa36a02bbecd0a0b"
 }

package/src/lib/components/Asset.ts

@@ -31,7 +31,10 @@ export abstract class Asset extends Rect {
     }
 
     let src = this.src();
-    const isUrl = src.startsWith('http://') || src.startsWith('https://');
+    const isUrl =
+      src.startsWith('http://') ||
+      src.startsWith('https://') ||
+      src.startsWith('data:');
 
     if (isUrl) {
       return src;

package/src/lib/components/Audio.ts

@@ -8,10 +8,6 @@ export class Audio extends Media {
 
   public constructor(props: MediaProps) {
     super(props);
-
-    if (!this.awaitCanPlay()) {
-      this.scheduleSeek(this.time());
-    }
   }
 
   protected mediaElement(): HTMLAudioElement {
@@ -37,30 +33,18 @@ export class Audio extends Media {
       audio.src = src;
       Audio.pool[key] = audio;
     }
-    if (audio.readyState < 2) {
-      if (
-        this.awaitCanPlay() ||
-        this.view().playbackState() === PlaybackState.Rendering
-      ) {
-        DependencyContext.collectPromise(
-          new Promise<void>(resolve => {
-            const onCanPlay = () => {
-              resolve();
-              audio.removeEventListener('canplay', onCanPlay);
-            };
-
-            const onError = () => {
-              const reason = this.getErrorReason(audio.error?.code);
-              console.log(`ERROR: Error loading audio: ${src}, ${reason}`);
-            };
-
-            audio.addEventListener('canplay', onCanPlay);
-            audio.addEventListener('error', onError);
-          }),
-        );
-      }
+
+    const weNeedToWait = this.waitForCanPlayNecessary(audio);
+    if (!weNeedToWait) {
+      return audio;
     }
 
+    DependencyContext.collectPromise(
+      new Promise<void>(resolve => {
+        this.waitForCanPlay(audio, resolve);
+      }),
+    );
+
     return audio;
   }
 

package/src/lib/components/Media.ts

@@ -1,5 +1,6 @@
 import {
   DependencyContext,
+  PlaybackState,
   SignalValue,
   SimpleSignal,
   clamp,
@@ -44,16 +45,21 @@ export abstract class Media extends Asset {
   @signal()
   protected declare readonly awaitCanPlay: SimpleSignal<boolean, this>;
 
-  protected readonly volume: number = 1;
+  protected declare volume: number;
 
   protected lastTime = -1;
 
   public constructor(props: MediaProps) {
     super(props);
+    if (!this.awaitCanPlay()) {
+      this.scheduleSeek(this.time());
+    }
+
     if (props.play) {
       this.play();
     }
     this.volume = props.volume ?? 1;
+    this.setVolume(this.volume);
   }
 
   public isPlaying(): boolean {
@@ -154,24 +160,56 @@ export abstract class Media extends Asset {
   }
 
   protected scheduleSeek(time: number) {
-    const media = this.mediaElement();
-    const onCanPlay = () => {
-      media.removeEventListener('canplay', onCanPlay);
+    this.waitForCanPlay(this.mediaElement(), () => {
+      const media = this.mediaElement();
+      // Wait until the media is ready to seek again as
+      // setting the time before the video doesn't work reliably.
       media.currentTime = time;
-      const listener = () => {
-        media.removeEventListener('seeked', listener);
-      };
-      media.addEventListener('seeked', listener);
+    });
+  }
+
+  /**
+   * Waits for the canplay event to be fired before calling onCanPlay.
+   *
+   * If the media is already ready to play, onCanPlay is called immediately.
+   * @param onCanPlay - The function to call when the media is ready to play.
+   * @returns
+   */
+  protected waitForCanPlay(media: HTMLMediaElement, onCanPlay: () => void) {
+    if (media.readyState >= 2) {
+      onCanPlay();
+      return;
+    }
+
+    const onCanPlayWrapper = () => {
+      onCanPlay();
+      media.removeEventListener('canplay', onCanPlayWrapper);
     };
+
     const onError = () => {
       const reason = this.getErrorReason(media.error?.code);
       console.log(`ERROR: Error loading video: ${this.src()}, ${reason}`);
+      media.removeEventListener('error', onError);
     };
 
-    media.addEventListener('canplay', onCanPlay);
+    media.addEventListener('canplay', onCanPlayWrapper);
     media.addEventListener('error', onError);
   }
 
+  /**
+   * Returns true if we should wait for the media to be ready to play.
+   */
+  protected waitForCanPlayNecessary(media: HTMLMediaElement): boolean {
+    if (media.readyState >= 2) {
+      return false;
+    }
+
+    return (
+      this.awaitCanPlay() ||
+      this.view().playbackState() === PlaybackState.Rendering
+    );
+  }
+
   public play() {
     const time = useThread().time;
     const start = time();

package/src/lib/components/Video.ts

@@ -83,10 +83,6 @@ export class Video extends Media {
 
   public constructor(props: VideoProps) {
     super(props);
-
-    if (!this.awaitCanPlay()) {
-      this.scheduleSeek(this.time());
-    }
   }
 
   protected override desiredSize(): SerializedVector2<DesiredLength> {
@@ -134,30 +130,17 @@ export class Video extends Media {
       Video.pool[key] = video;
     }
 
-    if (video.readyState < 2) {
-      if (
-        this.awaitCanPlay() ||
-        this.view().playbackState() === PlaybackState.Rendering
-      ) {
-        DependencyContext.collectPromise(
-          new Promise<void>(resolve => {
-            const onCanPlay = () => {
-              resolve();
-              video.removeEventListener('canplay', onCanPlay);
-            };
-
-            const onError = () => {
-              const reason = this.getErrorReason(video.error?.code);
-              console.log(`ERROR: Error loading video: ${src}, ${reason}`);
-            };
-
-            video.addEventListener('canplay', onCanPlay);
-            video.addEventListener('error', onError);
-          }),
-        );
-      }
+    const weNeedToWait = this.waitForCanPlayNecessary(video);
+    if (!weNeedToWait) {
+      return video;
     }
 
+    DependencyContext.collectPromise(
+      new Promise<void>(resolve => {
+        this.waitForCanPlay(video, resolve);
+      }),
+    );
+
     return video;
   }
 

package/src/lib/utils/video/parser/segment.ts

@@ -177,12 +177,33 @@ export class Segment {
       return;
     }
     if (this.responseFinished && this.encodedChunkQueue.length === 0) {
-      await this.decoder.flush();
+      await this.flushDecoderWithRetry();
       this.currentFramePastSegmentEndTime = true;
       return;
     }
   }
 
+  private async flushDecoderWithRetry(maxRetries = 3, timeoutMs = 2000) {
+    for (let attempt = 0; attempt < maxRetries; attempt++) {
+      // Sometimes decoder.flush does not resolve even though the queue size is zero
+      if (this.decoder.decodeQueueSize === 0) {
+        return;
+      }
+      try {
+        await Promise.race([
+          this.decoder.flush(),
+          new Promise((_, reject) =>
+            setTimeout(() => reject(new Error('Flush timeout')), timeoutMs),
+          ),
+        ]);
+      } catch (error: any) {
+        if (attempt === maxRetries) {
+          throw error;
+        }
+      }
+    }
+  }
+
   /**
    * Called when the decoder has a frame ready.
    * Pushes the frame to the buffer so it can be consumed.
@@ -230,7 +251,7 @@ export class Segment {
 
     // Wait for decoder if there are frames due.
     if (this.frameBuffer.length === 0 && this.framesDue > 0) {
-      let maxIterations = 1000;
+      let maxIterations = 200;
       while (this.frameBuffer.length === 0) {
         await new Promise(res => setTimeout(res, 10));
         maxIterations--;
@@ -240,9 +261,7 @@ export class Segment {
         }
 
         if (maxIterations === 0) {
-          throw new Error(
-            `Timed out while waiting for VideoDecoder to produce a frame. Frames due: ${this.framesDue}`,
-          );
+          return; // TODO: investigate further, shouldn't this be an error?
         }
       }
     }