Merge pull request #167 from bilibili/fix/mp4clip-timeout

Fix/mp4clip timeout
bilibili · Jul 4, 2024 · 7034a45 · 7034a45
2 parents 2135130 + 737cb31
commit 7034a45
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 16 deletions.
diff --git a/.changeset/light-boats-taste.md b/.changeset/light-boats-taste.md
@@ -0,0 +1,6 @@
+---
+'@webav/av-canvas': patch
+'@webav/av-cliper': patch
+---
+
+fix: cant stop decode audio when reset
diff --git a/packages/av-canvas/demo/video-editor.tsx b/packages/av-canvas/demo/video-editor.tsx
@@ -48,7 +48,7 @@ const TimelineEditor = ({
       <div>
         <span className="ml-[10px]">缩放：</span>
         <button
-          onClick={() => setScale(scale + 1)}
+          onClick={() => setScale(scale + 10)}
           className="border rounded-full"
         >
           -

diff --git a/packages/av-cliper/src/clips/mp4-clip.ts b/packages/av-cliper/src/clips/mp4-clip.ts
@@ -206,7 +206,7 @@ export class MP4Clip implements IClip {
               `MP4Clip.tick timeout, ${JSON.stringify({
                 videoReady,
                 audioReady,
-              })}`,
+              })}, time: ${time}`,
             ),
           );
         }, 3000);
@@ -792,7 +792,7 @@ class AudioFrameFinder {
     dec: ReturnType<typeof createAudioChunksDecoder> | null = null,
     aborter: { abort: boolean },
   ): Promise<Float32Array[]> => {
-    if (dec == null || aborter.abort) return [];
+    if (dec == null || aborter.abort || dec.state === 'closed') return [];
 
     const frameCnt = Math.ceil(deltaTime * (this.#sampleRate / 1e6));
     if (frameCnt === 0) return [];
@@ -861,6 +861,7 @@ class AudioFrameFinder {
       new Float32Array(0), // right chan
     ];
     this.#dec?.close();
+    this.#decoding = false;
     this.#dec = createAudioChunksDecoder(
       this.conf,
       DEFAULT_AUDIO_CONF.sampleRate,
@@ -915,7 +916,7 @@ function createAudioChunksDecoder(
 
   let tasks: Array<{ chunks: EncodedAudioChunk[]; cb: OutputHandle }> = [];
   async function run() {
-    if (curCb != null) return;
+    if (curCb != null || adec.state !== 'configured') return;
 
     const t = tasks.shift();
     if (t == null) return;
@@ -944,6 +945,9 @@ function createAudioChunksDecoder(
       curCb = null;
       if (adec.state !== 'closed') adec.close();
     },
+    get state() {
+      return adec.state;
+    },
   };
 }
 

diff --git a/packages/av-cliper/src/log.ts b/packages/av-cliper/src/log.ts
@@ -21,18 +21,6 @@ let THRESHOLD = 1;
 const localFile = tmpfile();
 
 let writer: Awaited<ReturnType<typeof localFile.createWriter>> | null = null;
-const initPromise = (async function init() {
-  try {
-    writer = await localFile.createWriter();
-  } catch (err) {
-    if (!(err instanceof Error)) throw err;
-    if (err.message.includes('createSyncAccessHandle is not a function')) {
-      console.warn(err);
-    } else {
-      throw err;
-    }
-  }
-})();
 
 type LvName = 'debug' | 'info' | 'warn' | 'error';
 const lvHandler = ['debug', 'info', 'warn', 'error'].reduce(
@@ -103,6 +91,21 @@ map.set(Log.info, 1);
 map.set(Log.warn, 2);
 map.set(Log.error, 3);
 
+const initPromise = (async function init() {
+  try {
+    writer = await localFile.createWriter();
+    Log.info(navigator.userAgent);
+    Log.info('date: ' + new Date().toLocaleDateString());
+  } catch (err) {
+    if (!(err instanceof Error)) throw err;
+    if (err.message.includes('createSyncAccessHandle is not a function')) {
+      console.warn(err);
+    } else {
+      throw err;
+    }
+  }
+})();
+
 if (import.meta.env?.DEV) {
   Log.setLogLevel(Log.debug);
 }