fix bug: dont start sending after gUM

Author: yuki-uchida

js/examples/call/src/media/callMediaController.ts

@@ -5,6 +5,7 @@ import type { VideoJitterConfig, AudioJitterConfig } from '../types/jitterBuffer
 import type { VideoEncodingSettings } from '../types/videoEncoding'
 import type { AudioEncodingSettings } from '../types/audioEncoding'
 import type { AudioCaptureConstraints, CameraCaptureConstraints } from '../types/captureConstraints'
+import type { SubscribeMessage } from '../../../../pkg/moqt_client_wasm'
 
 export interface MediaHandlers {
   onLocalVideoStream?: (stream: MediaStream | null) => void
@@ -30,10 +31,12 @@ export class CallMediaController {
   private handlers: MediaHandlers = {}
   private readonly publisher: MediaPublisher
   private readonly subscriber: MediaSubscriber
+  private readonly trackNamespace: string[]
 
   constructor(client: MoqtClientWrapper, trackNamespace: string[]) {
     this.publisher = new MediaPublisher(client, trackNamespace)
     this.subscriber = new MediaSubscriber(client)
+    this.trackNamespace = trackNamespace
 
     this.publisher.setHandlers({
       onLocalVideoStream: (stream) => this.handlers.onLocalVideoStream?.(stream),
@@ -57,6 +60,26 @@ export class CallMediaController {
       onRemoteAudioRenderingLatency: (userId, ms) => this.handlers.onRemoteAudioRenderingLatency?.(userId, ms),
       onRemoteVideoConfig: (userId, config) => this.handlers.onRemoteVideoConfig?.(userId, config)
     })
+
+    client.setOnIncomingSubscribeHandler(async ({ subscribe, isSuccess, code, respondOk, respondError }) => {
+      if (!isSuccess) {
+        await respondError(BigInt(code), 'Subscription validation failed')
+        return
+      }
+      await respondOk(0n, 'secret', 'subgroup')
+      if (!this.isLocalTrack(subscribe)) {
+        return
+      }
+      try {
+        if (subscribe.trackName === 'video') {
+          await this.publisher.restartVideoForNewSubscriber()
+        } else if (subscribe.trackName === 'audio') {
+          await this.publisher.restartAudioForNewSubscriber()
+        }
+      } catch (err) {
+        console.error('Failed to kick media pipeline for new subscriber', err)
+      }
+    })
   }
 
   setHandlers(handlers: MediaHandlers): void {
@@ -122,4 +145,11 @@ export class CallMediaController {
   setAudioCaptureConstraints(constraints: AudioCaptureConstraints): void {
     this.publisher.setAudioCaptureConstraints(constraints)
   }
+
+  private isLocalTrack(subscribe: SubscribeMessage): boolean {
+    if (subscribe.trackNamespace.length !== this.trackNamespace.length) {
+      return false
+    }
+    return subscribe.trackNamespace.every((value, index) => value === this.trackNamespace[index])
+  }
 }

js/examples/call/src/media/mediaPublisher.ts

@@ -435,6 +435,20 @@ export class MediaPublisher {
     await this.startVideo(deviceId)
   }
 
+  async restartVideoForNewSubscriber(): Promise<void> {
+    if (!this.videoWorker) {
+      return
+    }
+    await this.forceKeyframeAndRestart(this.currentVideoDeviceId ?? undefined)
+  }
+
+  async restartAudioForNewSubscriber(): Promise<void> {
+    if (!this.audioWorker) {
+      return
+    }
+    await this.setAudioEncodingSettings(this.audioEncodingSettings, true)
+  }
+
   private collectAliasesSafe(trackName: 'video' | 'audio'): bigint[] {
     const rawClient = this.client.getRawClient()
     if (!rawClient) {