Merge branch 'dev' into chore/update-inline-code-comments

100mslive · Dec 2, 2024 · a2ad7ab · a2ad7ab
2 parents 2b3deb0 + 2e8fee4
commit a2ad7ab
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 6 deletions.
diff --git a/packages/hms-video-store/src/diagnostics/DiagnosticsStatsCollector.ts b/packages/hms-video-store/src/diagnostics/DiagnosticsStatsCollector.ts
@@ -67,7 +67,9 @@ export class DiagnosticsStatsCollector {
     const ridAveragedVideoBitrateList = this.localVideoTrackStatsList.map(trackStatsMap =>
       trackStatsMap ? calculateAverage(Object.values(trackStatsMap), curr => curr.bitrate) : 0,
     );
-
+    const audioJitter = getLastElement(this.remoteAudioTrackStatsList)?.jitter || 0;
+    const videoJitter = getLastElement(this.remoteVideoTrackStatsList)?.jitter || 0;
+    const jitter = Math.max(audioJitter, videoJitter);
     const lastLocalAudioTrackStats = getLastElement(this.localAudioTrackStatsList);
     const lastLocalVideoTrackStats = getLastElement(this.localVideoTrackStatsList);
 
@@ -80,6 +82,7 @@ export class DiagnosticsStatsCollector {
         bytesReceived: lastSubscribeStats?.bytesReceived || 0,
         bitrateSent: calculateAverage(this.peerStatsList, curr => curr.publish?.bitrate),
         bitrateReceived: calculateAverage(this.peerStatsList, curr => curr.subscribe?.bitrate),
+        jitter: jitter,
       },
       audio: {
         roundTripTime,
@@ -91,6 +94,7 @@ export class DiagnosticsStatsCollector {
         bytesSent: lastLocalAudioTrackStats
           ? Object.values(lastLocalAudioTrackStats).reduce((acc, curr) => acc + (curr.bytesSent || 0), 0)
           : 0,
+        jitter: audioJitter,
       },
       video: {
         roundTripTime,
@@ -102,6 +106,7 @@ export class DiagnosticsStatsCollector {
         bytesSent: lastLocalVideoTrackStats
           ? Object.values(lastLocalVideoTrackStats).reduce((acc, curr) => acc + (curr.bytesSent || 0), 0)
           : 0,
+        jitter: videoJitter,
       },
     };
   }

diff --git a/packages/hms-video-store/src/diagnostics/interfaces.ts b/packages/hms-video-store/src/diagnostics/interfaces.ts
@@ -88,4 +88,5 @@ export interface DiagnosticsRTCStats {
   bitrateSent: number;
   bitrateReceived: number;
   roundTripTime: number;
+  jitter: number;
 }
diff --git a/packages/roomkit-react/package.json b/packages/roomkit-react/package.json
diff --git a/packages/roomkit-react/src/Diagnostics/ConnectivityTest.tsx b/packages/roomkit-react/src/Diagnostics/ConnectivityTest.tsx
@@ -164,6 +164,7 @@ const AudioStats = ({ stats }: { stats: DiagnosticsRTCStats | undefined }) => {
           <DetailedInfo title="Bitrate Sent" value={formatBytes(stats.bitrateSent, 'b/s')} />
           <DetailedInfo title="Bitrate Received" value={formatBytes(stats.bitrateReceived, 'b/s')} />
           <DetailedInfo title="Round Trip Time" value={`${stats.roundTripTime} ms`} />
+          <DetailedInfo title="Jitter" value={`${stats.jitter} s`} />
         </Flex>
       )}
     </ConnectivityTestStepResult>
@@ -182,6 +183,7 @@ const VideoStats = ({ stats }: { stats: DiagnosticsRTCStats | undefined }) => {
           <DetailedInfo title="Bitrate Sent" value={formatBytes(stats.bitrateSent, 'b/s')} />
           <DetailedInfo title="Bitrate Received" value={formatBytes(stats.bitrateReceived, 'b/s')} />
           <DetailedInfo title="Round Trip Time" value={`${stats.roundTripTime} ms`} />
+          <DetailedInfo title="Jitter" value={`${stats.jitter} s`} />
         </Flex>
       )}
     </ConnectivityTestStepResult>

diff --git a/yarn.lock b/yarn.lock
@@ -2,10 +2,10 @@
 # yarn lockfile v1
 
 
-"@100mslive/[email protected].1":
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/@100mslive/hms-noise-cancellation/-/hms-noise-cancellation-0.0.1.tgz#037c8bdfb6b2d7bf12f9d257422150fe6ca43acb"
-  integrity sha512-DGnzcXRDJREWypIjGX70er+f2k/XLLRF41lrXPs1+PtB1imdEkECPPS0Fg4BA0BCWKDNAGTZBHZPrBDgUmr9Lw==
+"@100mslive/[email protected].2-alpha.8":
+  version "0.0.2-alpha.8"
+  resolved "https://registry.yarnpkg.com/@100mslive/hms-noise-cancellation/-/hms-noise-cancellation-0.0.2-alpha.8.tgz#0cdd4801ad0a85e7c09ad7fe760840d897619ba3"
+  integrity sha512-1NKK3P+8Mb/lQMuDu3+VOEwFjMhGD5yiz94C6c2yVpv7/q3n6XDbkdTycnmWNpoOqW5AfMPr8DtxD/dYQkhUOA==
 
 "@100mslive/[email protected]":
   version "0.12.12"