fix: no video in multi-source stream when main source id is not null

millicast · Oct 24, 2024 · 66afc4e · 66afc4e
1 parent 6af9c59
commit 66afc4e
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 25 deletions.
diff --git a/packages/millicast-sdk/src/Signaling.js b/packages/millicast-sdk/src/Signaling.js
@@ -197,7 +197,7 @@ export default class Signaling extends EventEmitter {
     sdp = SdpParser.adaptCodecName(sdp, 'AV1X', VideoCodec.AV1)
 
     // default events
-    const events = ['active', 'inative', 'layers', 'viewercount', 'vad', 'updated', 'migrate', 'stopped']
+    const events = ['active', 'inactive', 'layers', 'viewercount', 'vad', 'updated', 'migrate', 'stopped']
     const data = { sdp, streamId: this.streamName, pinnedSourceId: optionsParsed.pinnedSourceId, excludedSourceIds: optionsParsed.excludedSourceIds, events }
 
     if (optionsParsed.vad) { data.vad = true }

diff --git a/packages/millicast-sdk/src/View.js b/packages/millicast-sdk/src/View.js
@@ -301,28 +301,25 @@ export default class View extends BaseWebRTC {
     })
 
     signalingInstance.on(signalingEvents.broadcastEvent, async (event) => {
-      if (event.data.sourceId === null) {
-        switch (event.name) {
-          case 'active':
-            if (this.DRMProfile == null) {
-              const subscriberData = await this.tokenGenerator()
-              if (subscriberData.drmObject) {
-                // cache the DRM license server URLs
-                this.DRMProfile = subscriberData.drmObject
-              }
-            }
-            this.emit(signalingEvents.broadcastEvent, event)
-            this.isMainStreamActive = true
-            while (this.eventQueue.length > 0) {
-              this.onTrackEvent(this.eventQueue.shift())
-            }
-            return
-          case 'inactive':
-            this.isMainStreamActive = false
-            break
-          default:
-            break
+      if (!this.isMainStreamActive && event.name === 'active') {
+        // handle 'active' event for main stream
+        this.mainSourceId = event.data.sourceId
+        if (!this.DRMProfile && event.data.encryption) {
+          const subscriberData = await this.tokenGenerator()
+          if (subscriberData.drmObject) {
+            // cache the DRM license server URLs
+            this.DRMProfile = subscriberData.drmObject
+          }
         }
+        this.emit(signalingEvents.broadcastEvent, event)
+        this.isMainStreamActive = true
+        while (this.eventQueue.length > 0) {
+          this.onTrackEvent(this.eventQueue.shift())
+        }
+        return
+      }
+      if (event.name === 'inactive' && this.isMainStreamActive && this.mainSourceId === event.data.sourceId) {
+        this.isMainStreamActive = false
       }
       this.emit(signalingEvents.broadcastEvent, event)
     })

diff --git a/packages/millicast-viewer-demo/src/viewer.js b/packages/millicast-viewer-demo/src/viewer.js
@@ -81,9 +81,6 @@ const newViewer = () => {
         millicastView.configureDRM(drmOptions);
       }
     }
-    let layers = event.data["layers"] !== null ? event.data["layers"] : {};
-    if (event.name === "layers" && Object.keys(layers).length <= 0) {
-    }
   });
   millicastView.on("track", (event) => {
     if (!enableDRM) addStream(event.streams[0]);