fix: AudioDecoder output may be fewer than the input chunk count, lea…

…ding to decoding timeouts. #71
bilibili · Apr 10, 2024 · eac0e53 · eac0e53
1 parent 2882571
commit eac0e53
Showing 1 changed file with 14 additions and 13 deletions.
diff --git a/packages/av-cliper/src/clips/mp4-clip.ts b/packages/av-cliper/src/clips/mp4-clip.ts
@@ -622,7 +622,7 @@ class AudioFrameFinder {
         this.#decCusorIdx = i;
         const s = this.samples[i];
         if (s.deleted) continue;
-        if (samples.length > 10) break;
+        if (samples.length >= 10) break;
         samples.push(s);
       }
 
@@ -679,24 +679,28 @@ function createAudioChunksDecoder(
 ) {
   type OutputHandle = (pcm: Float32Array[], done: boolean) => void;
 
-  let curCb: ((pcm: Float32Array[]) => void) | null = null;
+  let curCb: ((pcm: Float32Array[], done: boolean) => void) | null = null;
   const needResample = resampleRate !== decoderConf.sampleRate;
-  const resampleQ = createPromiseQueue<Float32Array[]>((resampedPCM) => {
-    curCb?.(resampedPCM);
-  });
+  const resampleQ = createPromiseQueue<[Float32Array[], boolean]>(
+    ([resampedPCM, done]) => {
+      curCb?.(resampedPCM, done);
+    },
+  );
 
   const adec = new AudioDecoder({
     output: (ad) => {
       const pcm = extractPCM4AudioData(ad);
+      const done = adec.decodeQueueSize === 0;
       if (needResample) {
-        resampleQ(() =>
-          audioResample(pcm, ad.sampleRate, {
+        resampleQ(async () => [
+          await audioResample(pcm, ad.sampleRate, {
             rate: resampleRate,
             chanCount: ad.numberOfChannels,
           }),
-        );
+          done,
+        ]);
       } else {
-        curCb?.(pcm);
+        curCb?.(pcm, done);
       }
       ad.close();
     },
@@ -716,10 +720,7 @@ function createAudioChunksDecoder(
       return;
     }
 
-    let i = 0;
-    curCb = (pcm) => {
-      i += 1;
-      const done = i >= t.chunks.length;
+    curCb = (pcm, done) => {
       t.cb(pcm, done);
       if (done) {
         curCb = null;