fix: correct method calls and encoder initialization

Hazi7 · Jan 21, 2025 · 9b1559d · 9b1559d
1 parent 9746716
commit 9b1559d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 20 deletions.
diff --git a/src/core/media-buffer.ts b/src/core/media-buffer.ts
@@ -3,7 +3,7 @@ import { RingBuffer } from "./ring-buffer";
 export interface MediaChunk {
   type: "AAC_RAW" | "AAC_SE" | "AVC_SE" | "AVC_NALU";
   data: Uint8Array;
-  // pts
+  // PTS
   // [https://w3c.github.io/webcodecs/#dom-encodedvideochunk-timestamp-slot]
   timestamp: number;
   isKey: boolean;

diff --git a/src/core/media-processor.ts b/src/core/media-processor.ts
@@ -78,13 +78,13 @@ export class MediaProcessor {
     // 存存在音频轨道，进行编码
     if (this.audioStream) {
       const reader = this.audioStream.getReader();
-      this.encodeVideoChunk(reader, this.audioEncoder);
+      this.encodeAudioChunk(reader, this.audioEncoder);
     }
 
     // 如存在视频轨道，进行编码
     if (this.videoStream) {
       const reader = this.videoStream.getReader();
-      this.encodeAudioChunk(reader, this.videoEncoder);
+      this.encodeVideoChunk(reader, this.videoEncoder);
     }
 
     // 创建输出流
@@ -228,7 +228,8 @@ export class MediaProcessor {
     return Math.max(0, (timestamp - this.baseTimestamp) / 1000);
   }
 
-  private async initEncoder() {
+  private initEncoder() {
+    // 初始化音频编码器
     this.audioEncoder = new AudioEncoder({
       output: (chunk, metadata) => {
         this.handleAudioChunk(chunk, metadata);
@@ -237,19 +238,11 @@ export class MediaProcessor {
         console.log(error);
       },
     });
-
     if (this.options.audio) {
-      const { supported } = await AudioEncoder.isConfigSupported(
-        this.options.audio
-      );
-
-      if (supported) {
-        this.audioEncoder.configure(this.options.audio);
-      } else {
-        throw new Error("不支持的配置");
-      }
+      this.audioEncoder.configure(this.options.audio);
     }
 
+    // 初始化视频编码器
     this.videoEncoder = new VideoEncoder({
       output: (chunk, metadata) => {
         this.handleVideoChunk(chunk, metadata);
@@ -258,12 +251,9 @@ export class MediaProcessor {
         console.log(error);
       },
     });
-
-    this.videoEncoder.configure({
-      codec: "avc1.640034",
-      width: 1920,
-      height: 1080,
-    });
+    if (this.options.video) {
+      this.videoEncoder.configure(this.options.video);
+    }
   }
 
   private initProcessor(