fix(avrender): 修复 audioContext 处于 suspended 状态时无法完成 stop 调用

zhaohappy · Nov 23, 2024 · 34d3cb5 · 34d3cb5
1 parent 187ce78
commit 34d3cb5
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 8 deletions.
diff --git a/dist/avplayer-ui/118.avplayer.js b/dist/avplayer-ui/118.avplayer.js
diff --git a/dist/avplayer-ui/avplayer.js b/dist/avplayer-ui/avplayer.js
diff --git a/dist/avplayer/118.avplayer.js b/dist/avplayer/118.avplayer.js
diff --git a/dist/avplayer/avplayer.js b/dist/avplayer/avplayer.js
diff --git a/src/avpipeline/AudioRenderPipeline.ts b/src/avpipeline/AudioRenderPipeline.ts
@@ -850,6 +850,10 @@ export default class AudioRenderPipeline extends Pipeline {
   public async unregisterTask(taskId: string): Promise<void> {
     const task = this.tasks.get(taskId)
     if (task) {
+      if (task.fakePlayTimer) {
+        clearTimeout(task.fakePlayTimer)
+        task.fakePlayTimer = null
+      }
       if (task.resampler) {
         task.resampler.close()
       }

diff --git a/src/avrender/pcm/AudioSourceWorkletProcessor.ts b/src/avrender/pcm/AudioSourceWorkletProcessor.ts
@@ -122,7 +122,7 @@ export default class AudioSourceWorkletProcessor extends AudioWorkletProcessorBa
 
         case 'stop': {
 
-          if (!this.ended && !this.pause) {
+          if (!this.ended && !this.pause && !this.frontBuffered) {
             await new Promise<void>((resolve) => {
               this.afterPullResolve = resolve
             })

diff --git a/src/avrender/pcm/AudioSourceWorkletProcessor2.ts b/src/avrender/pcm/AudioSourceWorkletProcessor2.ts
@@ -134,7 +134,7 @@ export default class AudioSourceWorkletProcessor2 extends AudioWorkletProcessorB
 
         case 'stop': {
 
-          if (!this.ended && !this.pause) {
+          if (!this.ended && !this.pause && !this.frontBuffered) {
             await new Promise<void>((resolve) => {
               this.afterPullResolve = resolve
             })

diff --git a/src/avrender/pcm/AudioSourceWorkletProcessor2_.js b/src/avrender/pcm/AudioSourceWorkletProcessor2_.js
diff --git a/src/avrender/pcm/AudioSourceWorkletProcessor_.js b/src/avrender/pcm/AudioSourceWorkletProcessor_.js