From 18146f6bbff92575b13794667157cef91e48a108 Mon Sep 17 00:00:00 2001
From: Divya Sampath Kumar <disa6302@colorado.edu>
Date: Wed, 27 Dec 2023 10:06:04 -0800
Subject: [PATCH] Use metrics object data

---
 examples/app.css    |  3 ---
 examples/index.html |  4 +---
 examples/viewer.js  | 42 ++++++++++++++++--------------------------
 3 files changed, 17 insertions(+), 32 deletions(-)

diff --git a/examples/app.css b/examples/app.css
index 87d4362..6780e63 100644
--- a/examples/app.css
+++ b/examples/app.css
@@ -6,9 +6,6 @@
     width: 100%;
 }
 
-#videoPlayerFromMaster {
-    border: 2px solid blue;
-}
 
 #logs-header {
     margin-top: 20px;
diff --git a/examples/index.html b/examples/index.html
index 2bb50ac..45ce898 100644
--- a/examples/index.html
+++ b/examples/index.html
@@ -328,9 +328,7 @@ <h5>Return Channel</h5>
                 </div>
                 <div class="col">
                     <h5>From Master</h5>
-                    <div class="video-container">
-                        <video id="videoPlayerFromMaster" class="remote-view" autoplay playsinline controls></video>
-                    </div>
+                    <div class="video-container"><video class="remote-view" autoplay playsinline controls></video></div>
                 </div>
             </div>
             <div class="row datachannel">
diff --git a/examples/viewer.js b/examples/viewer.js
index 805b4ba..c67883b 100644
--- a/examples/viewer.js
+++ b/examples/viewer.js
@@ -39,7 +39,6 @@ let audioRateArray = [];
 let timeArray = [];
 let chartHeight = 0;
 
-let offerSentTime = 0;
 let signalingSetUpTime = 0;
 let timeToSetUpViewerMedia = 0;
 let timeToFirstFrameFromOffer = 0;
@@ -259,21 +258,12 @@ async function startViewer(localView, remoteView, formValues, onStatsReport, rem
             setTimeout(profilingCalculations, profilingTestLength * 1000);
         }
 
-        if(formValues.enableDQPmetrics) {
-            const videoElement = document.getElementById('videoPlayerFromMaster');
-            videoElement.onloadeddata = function() {
-                let firstFrameTime = Date.now();
-                timeToFirstFrameFromOffer = firstFrameTime - offerSentTime;
-                timeToFirstFrameFromViewerStart = firstFrameTime - viewerButtonPressed.getTime();
-            };
-        }
         viewer.localView = localView;
         viewer.remoteView = remoteView;
 
-        if (formValues.enableProfileTimeline) {
-            viewer.remoteView.addEventListener('loadeddata', () => {
-                metrics.viewer.ttff.endTime = Date.now();
-
+        viewer.remoteView.addEventListener('loadeddata', () => {
+            metrics.viewer.ttff.endTime = Date.now();
+            if (formValues.enableProfileTimeline) {
                 metrics.viewer.ttffAfterPc.endTime = metrics.viewer.ttff.endTime;
                 metrics.master.ttffAfterPc.endTime = metrics.viewer.ttff.endTime;
 
@@ -281,15 +271,18 @@ async function startViewer(localView, remoteView, formValues, onStatsReport, rem
                 // if the ice-gathering on the master side is not complete by the time the metrics are sent, the endTime > startTime
                 // in order to plot it, we can show it as an ongoing process
                 if (metrics.master.iceGathering.startTime > metrics.master.iceGathering.endTime) {
-                    metrics.master.iceGathering.endTime = metrics.viewer.ttff.endTime; 
+                    metrics.master.iceGathering.endTime = metrics.viewer.ttff.endTime;
                 }
-            });
-        }
+            }
+            if(formValues.enableDQPmetrics) {
+                timeToFirstFrameFromOffer = metrics.viewer.ttff.endTime - metrics.viewer.offAnswerTime.startTime;
+                timeToFirstFrameFromViewerStart = metrics.viewer.ttff.endTime - viewerButtonPressed.getTime();
+            }
+        });
 
         if (formValues.enableProfileTimeline) {
-            metrics.viewer.ttff.startTime = viewerButtonPressed;
-            metrics.master.waitTime.endTime = viewerButtonPressed;
-
+            metrics.viewer.ttff.startTime = viewerButtonPressed.getTime();
+            metrics.master.waitTime.endTime = viewerButtonPressed.getTime();
         }
 
         if (formValues.enableDQPmetrics) {
@@ -648,11 +641,10 @@ async function startViewer(localView, remoteView, formValues, onStatsReport, rem
             console.log('[VIEWER] Connected to signaling service');
 
             metrics.viewer.setupMediaPlayer.startTime = Date.now();
-            signalingSetUpTime = Date.now() - viewerButtonPressed.getTime();
+            signalingSetUpTime = metrics.viewer.setupMediaPlayer.startTime - viewerButtonPressed.getTime();
             // Get a stream from the webcam, add it to the peer connection, and display it in the local view.
             // If no video/audio needed, no need to request for the sources.
             // Otherwise, the browser will throw an error saying that either video or audio has to be enabled.
-            let startViewerMediaSetUp = Date.now();
             if (formValues.sendVideo || formValues.sendAudio) {
                 try {
                     viewer.localStream = await navigator.mediaDevices.getUserMedia(constraints);
@@ -663,12 +655,10 @@ async function startViewer(localView, remoteView, formValues, onStatsReport, rem
                     return;
                 }
             }
-            timeToSetUpViewerMedia = Date.now() - startViewerMediaSetUp;
-
 
             metrics.viewer.setupMediaPlayer.endTime = Date.now();
+            timeToSetUpViewerMedia = metrics.viewer.setupMediaPlayer.endTime - metrics.viewer.setupMediaPlayer.startTime;
 
-            metrics.viewer.offAnswerTime.startTime = Date.now();
             // Create an SDP offer to send to the master
             console.log('[VIEWER] Creating SDP offer');
             await viewer.peerConnection.setLocalDescription(
@@ -682,7 +672,7 @@ async function startViewer(localView, remoteView, formValues, onStatsReport, rem
             if (formValues.useTrickleICE) {
                 console.log('[VIEWER] Sending SDP offer');
                 console.debug('SDP offer:', viewer.peerConnection.localDescription);
-                offerSentTime = Date.now();
+                metrics.viewer.offAnswerTime.startTime = Date.now();
                 viewer.signalingClient.sendSdpOffer(viewer.peerConnection.localDescription);
             }
             console.log('[VIEWER] Generating ICE candidates');
@@ -917,7 +907,7 @@ function calcStats(stats, clientId) {
         }
     }
 
-    // Capture the IP and port of the remote candidate
+    // Capture the IP and port of the local candidate
     if (localCandidate) {
         localCandidateConnectionString = '[' + localCandidate.candidateType + '] '
         if (localCandidate.address && localCandidate.port) {