docs: 修复多线程环境下无法播放声音的问题

zhaohappy · Dec 17, 2024 · 7874980 · 7874980
1 parent 5bfc318
commit 7874980
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 12 deletions.
diff --git a/site/docs/demo/audio-encode-wasm.tsx b/site/docs/demo/audio-encode-wasm.tsx
@@ -94,7 +94,6 @@ async function encode(set: (v: string) => void) {
       let newFrame = frame
       if (resampler) {
         resampler.resample(frame.extendedData, addressof(pcmBuffer), frame.nbSamples)
-        pcmBuffer.format = AVSampleFormat.AV_SAMPLE_FMT_FLTP
         newFrame = avPCMBuffer2AVFrame(addressof(pcmBuffer), false, frame)
         newFrame.pts = frame.pts
         newFrame.duration = frame.duration

diff --git a/site/docs/demo/audio-encode-webcodecs.tsx b/site/docs/demo/audio-encode-webcodecs.tsx
@@ -94,7 +94,6 @@ async function encode(set: (v: string) => void) {
       let newFrame = frame
       if (resampler) {
         resampler.resample(frame.extendedData, addressof(pcmBuffer), frame.nbSamples)
-        pcmBuffer.format = AVSampleFormat.AV_SAMPLE_FMT_FLTP
         newFrame = avPCMBuffer2AVFrame(addressof(pcmBuffer), false, frame)
         newFrame.pts = frame.pts
         newFrame.duration = frame.duration

diff --git a/site/docs/demo/audio-render-audiodata.tsx b/site/docs/demo/audio-render-audiodata.tsx
@@ -12,12 +12,13 @@ import { mapFloat32Array } from '@libmedia/cheap/std/memory'
 import { destroyAVFrame } from '@libmedia/avutil/util/avframe'
 import WebAudioDecoder from '@libmedia/avcodec/webcodec/AudioDecoder'
 import { audioData2AVFrame } from '@libmedia/avutil/function/audioData2AVFrame'
+import * as cheapConfig from '@libmedia/cheap/config'
+import { avRescaleQ } from '@libmedia/avutil/util/rational'
+import { AV_TIME_BASE_Q } from '@libmedia/avutil/constant'
 
 import { formatUrl, getIOReader, getAVFormat, getAccept, getWasm } from './utils'
-import { useEffect, useRef, useState } from 'react'
+import { useEffect } from 'react'
 import React from 'react'
-import { avRescaleQ } from '@libmedia/avutil/util/rational'
-import { AV_TIME_BASE_Q } from '@libmedia/avutil/constant'
 
 
 let file: File
@@ -74,7 +75,17 @@ async function render() {
   function play(data: pointer<pointer<float>>, nbSamples: int32, sampleRate: int32) {
     const audioBuffer = audioContext.createBuffer(channels, nbSamples, sampleRate)
     for (let i = 0; i < channels; i++) {
-      audioBuffer.copyToChannel(mapFloat32Array(data[i], nbSamples), i)
+      if (audioBuffer.copyToChannel && !cheapConfig.USE_THREADS) {
+        audioBuffer.copyToChannel(
+          mapFloat32Array(data[i], nbSamples),
+          i,
+          0
+        )
+      }
+      else {
+        const audioData = audioBuffer.getChannelData(i)
+        audioData.set(mapFloat32Array(data[i], nbSamples), 0)
+      }
     }
     const bufferSource = audioContext.createBufferSource()
     bufferSource.buffer = audioBuffer

diff --git a/site/docs/demo/audio-render-avframe.tsx b/site/docs/demo/audio-render-avframe.tsx
@@ -11,9 +11,10 @@ import AVPCMBuffer from '@libmedia/avutil/struct/avpcmbuffer'
 import { avFreep } from '@libmedia/avutil/util/mem'
 import { mapFloat32Array } from '@libmedia/cheap/std/memory'
 import { destroyAVFrame } from '@libmedia/avutil/util/avframe'
+import * as cheapConfig from '@libmedia/cheap/config'
 
 import { formatUrl, getIOReader, getAVFormat, getAccept, getWasm } from './utils'
-import { useEffect, useRef, useState } from 'react'
+import { useEffect } from 'react'
 import React from 'react'
 
 let file: File
@@ -70,7 +71,17 @@ async function render() {
   function play(data: pointer<pointer<float>>, nbSamples: int32, sampleRate: int32) {
     const audioBuffer = audioContext.createBuffer(channels, nbSamples, sampleRate)
     for (let i = 0; i < channels; i++) {
-      audioBuffer.copyToChannel(mapFloat32Array(data[i], nbSamples), i)
+      if (audioBuffer.copyToChannel && !cheapConfig.USE_THREADS) {
+        audioBuffer.copyToChannel(
+          mapFloat32Array(data[i], nbSamples),
+          i,
+          0
+        )
+      }
+      else {
+        const audioData = audioBuffer.getChannelData(i)
+        audioData.set(mapFloat32Array(data[i], nbSamples), 0)
+      }
     }
     const bufferSource = audioContext.createBufferSource()
     bufferSource.buffer = audioBuffer

diff --git a/site/docs/demo/video-decode-wasm.tsx b/site/docs/demo/video-decode-wasm.tsx
@@ -37,7 +37,7 @@ async function decode(set: (v: string) => void) {
   const stream = iformatContext.getStreamByMediaType(AVMediaType.AVMEDIA_TYPE_VIDEO)
 
   const decoder = new WasmVideoDecoder({
-    resource: await compileResource(getWasm('decoder', stream.codecpar.codecId)),
+    resource: await compileResource(getWasm('decoder', stream.codecpar.codecId), true),
     onError: (error) => {
       set(`decode error: ${error}\n`)
     },

diff --git a/site/docs/demo/video-encode-wasm.tsx b/site/docs/demo/video-encode-wasm.tsx
@@ -50,7 +50,7 @@ async function encode(set: (v: string) => void) {
   let counter = 0
 
   const encoder = new WasmVideoEncoder({
-    resource: await compileResource(getWasm('encoder', codecpar.codecId)),
+    resource: await compileResource(getWasm('encoder', codecpar.codecId), true),
     onError: (error) => {
       set(`encode error: ${error}\n`)
     },
@@ -61,7 +61,7 @@ async function encode(set: (v: string) => void) {
   })
 
   const decoder = new WasmVideoDecoder({
-    resource: await compileResource(getWasm('decoder', stream.codecpar.codecId)),
+    resource: await compileResource(getWasm('decoder', stream.codecpar.codecId), true),
     onError: (error) => {
       set(`decode error: ${error}\n`)
     },

diff --git a/site/docs/demo/video-encode-webcodecs.tsx b/site/docs/demo/video-encode-webcodecs.tsx
@@ -59,7 +59,7 @@ async function encode(set: (v: string) => void) {
   })
 
   const decoder = new WasmVideoDecoder({
-    resource: await compileResource(getWasm('decoder', stream.codecpar.codecId)),
+    resource: await compileResource(getWasm('decoder', stream.codecpar.codecId), true),
     onError: (error) => {
       set(`decode error: ${error}\n`)
     },