@webex/plugin-meetings 3.0.0-beta.404 → 3.0.0-beta.406

package/src/statsAnalyzer/index.ts

@@ -264,7 +264,7 @@ export class StatsAnalyzer extends EventsScope {
 
     // Add stats for individual streams
     Object.keys(this.statsResults).forEach((mediaType) => {
-      if (mediaType.includes('audio-send')) {
+      if (mediaType.startsWith('audio-send')) {
         const audioSenderStream = cloneDeep(emptyAudioTransmitStream);
 
         getAudioSenderStreamMqa({
@@ -276,7 +276,7 @@ export class StatsAnalyzer extends EventsScope {
         newMqa.audioTransmit[0].streams.push(audioSenderStream);
 
         this.lastMqaDataSent[mediaType].send = cloneDeep(this.statsResults[mediaType].send);
-      } else if (mediaType.includes('audio-share-send')) {
+      } else if (mediaType.startsWith('audio-share-send')) {
         const audioSenderStream = cloneDeep(emptyAudioTransmitStream);
 
         getAudioSenderStreamMqa({
@@ -288,7 +288,7 @@ export class StatsAnalyzer extends EventsScope {
         newMqa.audioTransmit[1].streams.push(audioSenderStream);
 
         this.lastMqaDataSent[mediaType].send = cloneDeep(this.statsResults[mediaType].send);
-      } else if (mediaType.includes('audio-recv')) {
+      } else if (mediaType.startsWith('audio-recv')) {
         const audioReceiverStream = cloneDeep(emptyAudioReceiveStream);
 
         getAudioReceiverStreamMqa({
@@ -300,7 +300,7 @@ export class StatsAnalyzer extends EventsScope {
         newMqa.audioReceive[0].streams.push(audioReceiverStream);
 
         this.lastMqaDataSent[mediaType].recv = cloneDeep(this.statsResults[mediaType].recv);
-      } else if (mediaType.includes('audio-share-recv')) {
+      } else if (mediaType.startsWith('audio-share-recv')) {
         const audioReceiverStream = cloneDeep(emptyAudioReceiveStream);
 
         getAudioReceiverStreamMqa({
@@ -312,7 +312,8 @@ export class StatsAnalyzer extends EventsScope {
         newMqa.audioReceive[1].streams.push(audioReceiverStream);
 
         this.lastMqaDataSent[mediaType].recv = cloneDeep(this.statsResults[mediaType].recv);
-      } else if (mediaType.includes('video-send')) {
+      } else if (mediaType.startsWith('video-send-layer')) {
+        // We only want the stream-specific stats we get with video-send-layer-0, video-send-layer-1, etc.
         const videoSenderStream = cloneDeep(emptyVideoTransmitStream);
 
         getVideoSenderStreamMqa({
@@ -324,7 +325,7 @@ export class StatsAnalyzer extends EventsScope {
         newMqa.videoTransmit[0].streams.push(videoSenderStream);
 
         this.lastMqaDataSent[mediaType].send = cloneDeep(this.statsResults[mediaType].send);
-      } else if (mediaType.includes('video-share-send')) {
+      } else if (mediaType.startsWith('video-share-send')) {
         const videoSenderStream = cloneDeep(emptyVideoTransmitStream);
 
         getVideoSenderStreamMqa({
@@ -336,7 +337,7 @@ export class StatsAnalyzer extends EventsScope {
         newMqa.videoTransmit[1].streams.push(videoSenderStream);
 
         this.lastMqaDataSent[mediaType].send = cloneDeep(this.statsResults[mediaType].send);
-      } else if (mediaType.includes('video-recv')) {
+      } else if (mediaType.startsWith('video-recv')) {
         const videoReceiverStream = cloneDeep(emptyVideoReceiveStream);
 
         getVideoReceiverStreamMqa({
@@ -348,7 +349,7 @@ export class StatsAnalyzer extends EventsScope {
         newMqa.videoReceive[0].streams.push(videoReceiverStream);
 
         this.lastMqaDataSent[mediaType].recv = cloneDeep(this.statsResults[mediaType].recv);
-      } else if (mediaType.includes('video-share-recv')) {
+      } else if (mediaType.startsWith('video-share-recv')) {
         const videoReceiverStream = cloneDeep(emptyVideoReceiveStream);
 
         getVideoReceiverStreamMqa({
@@ -373,9 +374,14 @@ export class StatsAnalyzer extends EventsScope {
         name: MEDIA_DEVICES.MICROPHONE,
       });
     }
-    if (this.statsResults['video-send']) {
+
+    const existingVideoSender = Object.keys(this.statsResults).find((item) =>
+      item.includes('video-send')
+    );
+
+    if (existingVideoSender) {
       newMqa.intervalMetadata.peripherals.push({
-        information: this.statsResults['video-send'].trackLabel || _UNKNOWN_,
+        information: this.statsResults[existingVideoSender].trackLabel || _UNKNOWN_,
         name: MEDIA_DEVICES.CAMERA,
       });
     }
@@ -552,9 +558,21 @@ export class StatsAnalyzer extends EventsScope {
       }
     });
 
+    let videoSenderIndex = 0;
     statsItem.report.forEach((result) => {
       if (types.includes(result.type)) {
-        this.parseGetStatsResult(result, type, isSender);
+        // if the video sender has multiple streams in the report, it is a new stream object.
+        if (type === 'video-send' && result.type === 'outbound-rtp') {
+          const newType = `video-send-layer-${videoSenderIndex}`;
+          this.parseGetStatsResult(result, newType, isSender);
+          videoSenderIndex += 1;
+
+          this.statsResults[newType].direction = statsItem.currentDirection;
+          this.statsResults[newType].trackLabel = statsItem.localTrackLabel;
+          this.statsResults[newType].csi = statsItem.csi;
+        } else {
+          this.parseGetStatsResult(result, type, isSender);
+        }
       }
     });
 
@@ -664,12 +682,23 @@ export class StatsAnalyzer extends EventsScope {
       const getCurrentStatsTotals = (keyPrefix: string, value: string): number =>
         Object.keys(this.statsResults)
           .filter((key) => key.startsWith(keyPrefix))
-          .reduce((prev, cur) => prev + (this.statsResults[cur]?.recv[value] || 0), 0);
+          .reduce(
+            (prev, cur) =>
+              prev +
+              (this.statsResults[cur]?.[keyPrefix.includes('send') ? 'send' : 'recv'][value] || 0),
+            0
+          );
 
       const getPreviousStatsTotals = (keyPrefix: string, value: string): number =>
         Object.keys(this.statsResults)
           .filter((key) => key.startsWith(keyPrefix))
-          .reduce((prev, cur) => prev + (this.lastStatsResults[cur]?.recv[value] || 0), 0);
+          .reduce(
+            (prev, cur) =>
+              prev +
+              (this.lastStatsResults[cur]?.[keyPrefix.includes('send') ? 'send' : 'recv'][value] ||
+                0),
+            0
+          );
 
       // Audio Transmit
       if (this.lastStatsResults['audio-send']) {
@@ -731,47 +760,54 @@ export class StatsAnalyzer extends EventsScope {
         false
       );
 
+      const currentTotalPacketsSent = getCurrentStatsTotals('video-send', 'totalPacketsSent');
+      const previousTotalPacketsSent = getPreviousStatsTotals('video-send', 'totalPacketsSent');
+
+      const currentFramesEncoded = getCurrentStatsTotals('video-send', 'framesEncoded');
+      const previousFramesEncoded = getPreviousStatsTotals('video-send', 'framesEncoded');
+
+      const currentFramesSent = getCurrentStatsTotals('video-send', 'framesSent');
+      const previousFramesSent = getPreviousStatsTotals('video-send', 'framesSent');
+
+      const doesVideoSendExist = Object.keys(this.lastStatsResults).some((item) =>
+        item.includes('video-send')
+      );
+
       // Video Transmit
-      if (this.lastStatsResults['video-send']) {
+      if (doesVideoSendExist) {
         // compare video stats sent
-        const currentStats = this.statsResults['video-send'].send;
-        const previousStats = this.lastStatsResults['video-send'].send;
 
         if (
           this.meetingMediaStatus.expected.sendVideo &&
-          (currentStats.totalPacketsSent === previousStats.totalPacketsSent ||
-            currentStats.totalPacketsSent === 0)
+          (currentTotalPacketsSent === previousTotalPacketsSent || currentTotalPacketsSent === 0)
         ) {
           LoggerProxy.logger.info(
             `StatsAnalyzer:index#compareLastStatsResult --> No video RTP packets sent`,
-            currentStats.totalPacketsSent
+            currentTotalPacketsSent
           );
         } else {
           if (
             this.meetingMediaStatus.expected.sendVideo &&
-            (currentStats.framesEncoded === previousStats.framesEncoded ||
-              currentStats.framesEncoded === 0)
+            (currentFramesEncoded === previousFramesEncoded || currentFramesEncoded === 0)
           ) {
             LoggerProxy.logger.info(
               `StatsAnalyzer:index#compareLastStatsResult --> No video Frames Encoded`,
-              currentStats.framesEncoded
+              currentFramesEncoded
             );
           }
 
           if (
             this.meetingMediaStatus.expected.sendVideo &&
-            (this.statsResults['video-send'].send.framesSent ===
-              this.lastStatsResults['video-send'].send.framesSent ||
-              this.statsResults['video-send'].send.framesSent === 0)
+            (currentFramesSent === previousFramesSent || currentFramesSent === 0)
           ) {
             LoggerProxy.logger.info(
               `StatsAnalyzer:index#compareLastStatsResult --> No video Frames sent`,
-              this.statsResults['video-send'].send.framesSent
+              currentFramesSent
             );
           }
         }
 
-        this.emitStartStopEvents('video', previousStats.framesSent, currentStats.framesSent, true);
+        this.emitStartStopEvents('video', previousFramesSent, currentFramesSent, true);
       }
 
       // Video Receive

package/test/unit/spec/meeting/index.js

@@ -8630,6 +8630,34 @@ describe('plugin-meetings', () => {
 
           checkParseMeetingInfo(expectedInfoToParse);
         });
+
+        it('should parse meeting info, set values, and return null when permissionToken is not present', () => {
+          meeting.config.experimental = {enableMediaNegotiatedEvent: true};
+          meeting.config.experimental.enableUnifiedMeetings = true;
+          const FAKE_STRING_DESTINATION = 'sipUrl';
+          const FAKE_MEETING_INFO = {
+            conversationUrl: uuid1,
+            locusUrl: url1,
+            meetingJoinUrl: url2,
+            meetingNumber: '12345',
+            sipMeetingUri: test1,
+            sipUrl: test1,
+            owner: test2,
+          };
+
+          meeting.parseMeetingInfo(FAKE_MEETING_INFO, FAKE_STRING_DESTINATION);
+          const expectedInfoToParse = {
+            conversationUrl: uuid1,
+            locusUrl: url1,
+            sipUri: test1,
+            meetingNumber: '12345',
+            meetingJoinUrl: url2,
+            owner: test2,
+          };
+
+          checkParseMeetingInfo(expectedInfoToParse);
+        });
+
         it('should parse interpretation info correctly', () => {
           const parseInterpretationInfo = sinon.spy(MeetingUtil, 'parseInterpretationInfo');
           const mockToggleOnData = {

package/test/unit/spec/stats-analyzer/index.js

@@ -1543,6 +1543,185 @@ describe('plugin-meetings', () => {
           },
         ]);
       });
+
+      it('has three streams for video senders for simulcast', async () => {
+        pc.getTransceiverStats = sinon.stub().resolves({
+          audio: {
+            senders: [fakeStats.audio.senders[0]],
+            receivers: [fakeStats.audio.receivers[0]],
+          },
+          video: {
+            senders: [
+              {
+                localTrackLabel: 'fake-camera',
+                report: [
+                  {
+                    type: 'outbound-rtp',
+                    bytesSent: 1,
+                    framesSent: 0,
+                    packetsSent: 0,
+                  },
+                  {
+                    type: 'outbound-rtp',
+                    bytesSent: 0,
+                    framesSent: 0,
+                    packetsSent: 0,
+                  },
+                  {
+                    type: 'outbound-rtp',
+                    bytesSent: 1000,
+                    framesSent: 1,
+                    packetsSent: 1,
+                  },
+                  {
+                    type: 'remote-inbound-rtp',
+                    packetsLost: 0,
+                  },
+                  {
+                    type: 'candidate-pair',
+                    state: 'succeeded',
+                    localCandidateId: 'fake-candidate-id',
+                  },
+                  {
+                    type: 'candidate-pair',
+                    state: 'failed',
+                    localCandidateId: 'bad-candidate-id',
+                  },
+                  {
+                    type: 'local-candidate',
+                    id: 'fake-candidate-id',
+                    protocol: 'tcp',
+                  },
+                ],
+              },
+            ],
+            receivers: [fakeStats.video.receivers[0]],
+          },
+          screenShareAudio: {
+            senders: [fakeStats.audio.senders[0]],
+            receivers: [fakeStats.audio.receivers[0]],
+          },
+          screenShareVideo: {
+            senders: [fakeStats.video.senders[0]],
+            receivers: [fakeStats.video.receivers[0]],
+          },
+        });
+
+        await startStatsAnalyzer({expected: {receiveVideo: true}});
+
+        await progressTime();
+
+        assert.deepEqual(mqeData.videoTransmit[0].streams, [
+          {
+            common: {
+              codec: 'H264',
+              csi: [],
+              duplicateSsci: 0,
+              requestedBitrate: 0,
+              requestedFrames: 0,
+              rtpPackets: 0,
+              ssci: 0,
+              transmittedBitrate: 0.13333333333333333,
+              transmittedFrameRate: 0
+            },
+            h264CodecProfile: 'BP',
+            isAvatar: false,
+            isHardwareEncoded: false,
+            localConfigurationChanges: 2,
+            maxFrameQp: 0,
+            maxNoiseLevel: 0,
+            minRegionQp: 0,
+            remoteConfigurationChanges: 0,
+            requestedFrameSize: 0,
+            requestedKeyFrames: 0,
+            transmittedFrameSize: 0,
+            transmittedHeight: 0,
+            transmittedKeyFrames: 0,
+            transmittedKeyFramesClient: 0,
+            transmittedKeyFramesConfigurationChange: 0,
+            transmittedKeyFramesFeedback: 0,
+            transmittedKeyFramesLocalDrop: 0,
+            transmittedKeyFramesOtherLayer: 0,
+            transmittedKeyFramesPeriodic: 0,
+            transmittedKeyFramesSceneChange: 0,
+            transmittedKeyFramesStartup: 0,
+            transmittedKeyFramesUnknown: 0,
+            transmittedWidth: 0,
+          },
+          {
+            common: {
+              codec: 'H264',
+              csi: [],
+              duplicateSsci: 0,
+              requestedBitrate: 0,
+              requestedFrames: 0,
+              rtpPackets: 0,
+              ssci: 0,
+              transmittedBitrate: 0,
+              transmittedFrameRate: 0,
+            },
+            h264CodecProfile: 'BP',
+            isAvatar: false,
+            isHardwareEncoded: false,
+            localConfigurationChanges: 2,
+            maxFrameQp: 0,
+            maxNoiseLevel: 0,
+            minRegionQp: 0,
+            remoteConfigurationChanges: 0,
+            requestedFrameSize: 0,
+            requestedKeyFrames: 0,
+            transmittedFrameSize: 0,
+            transmittedHeight: 0,
+            transmittedKeyFrames: 0,
+            transmittedKeyFramesClient: 0,
+            transmittedKeyFramesConfigurationChange: 0,
+            transmittedKeyFramesFeedback: 0,
+            transmittedKeyFramesLocalDrop: 0,
+            transmittedKeyFramesOtherLayer: 0,
+            transmittedKeyFramesPeriodic: 0,
+            transmittedKeyFramesSceneChange: 0,
+            transmittedKeyFramesStartup: 0,
+            transmittedKeyFramesUnknown: 0,
+            transmittedWidth: 0,
+          },
+          {
+            common: {
+              codec: 'H264',
+              csi: [],
+              duplicateSsci: 0,
+              requestedBitrate: 0,
+              requestedFrames: 0,
+              rtpPackets: 1,
+              ssci: 0,
+              transmittedBitrate: 133.33333333333334,
+              transmittedFrameRate: 0,
+            },
+            h264CodecProfile: 'BP',
+            isAvatar: false,
+            isHardwareEncoded: false,
+            localConfigurationChanges: 2,
+            maxFrameQp: 0,
+            maxNoiseLevel: 0,
+            minRegionQp: 0,
+            remoteConfigurationChanges: 0,
+            requestedFrameSize: 0,
+            requestedKeyFrames: 0,
+            transmittedFrameSize: 0,
+            transmittedHeight: 0,
+            transmittedKeyFrames: 0,
+            transmittedKeyFramesClient: 0,
+            transmittedKeyFramesConfigurationChange: 0,
+            transmittedKeyFramesFeedback: 0,
+            transmittedKeyFramesLocalDrop: 0,
+            transmittedKeyFramesOtherLayer: 0,
+            transmittedKeyFramesPeriodic: 0,
+            transmittedKeyFramesSceneChange: 0,
+            transmittedKeyFramesStartup: 0,
+            transmittedKeyFramesUnknown: 0,
+            transmittedWidth: 0,
+          }
+        ]);
+      });
     });
   });
 });