refactor scripts

Author: vpalmisano

scripts/e2e-audio-stats.js

@@ -120,13 +120,17 @@ webrtcperf.applyAudioTimestampWatermark = mediaStream => {
   return newMediaStream
 }
 
-let processingAudioTracks = 0
+webrtcperf.processingAudioTracks = new Set()
 
-window.recognizeAudioTimestampWatermark = track => {
-  if (processingAudioTracks > 4) {
+webrtcperf.recognizeAudioTimestampWatermark = track => {
+  if (webrtcperf.processingAudioTracks.has(track)) return
+  if (webrtcperf.processingAudioTracks.size > 4) {
     return
   }
-  processingAudioTracks += 1
+  webrtcperf.processingAudioTracks.add(track)
+  track.addEventListener('ended', () => {
+    webrtcperf.processingAudioTracks.delete(track)
+  })
 
   const ggwave = webrtcperf.ggwave
   const samplesPerFrame = 1024
@@ -150,7 +154,6 @@ window.recognizeAudioTimestampWatermark = track => {
             log(`AudioTimestampWatermark rx init failed: ${instance}`)
             return
           }
-          processingAudioTracks += 1
         }
 
         try {
@@ -191,11 +194,12 @@ window.recognizeAudioTimestampWatermark = track => {
         }
       },
       close() {
-        processingAudioTracks -= 1
+        webrtcperf.processingAudioTracks.delete(track)
         if (instance) ggwave.free(instance)
       },
       abort(err) {
         log('AudioTimestampWatermark error:', err)
+        webrtcperf.processingAudioTracks.delete(track)
       },
     },
     new CountQueuingStrategy({ highWaterMark: 100 }),

scripts/e2e-video-stats.js

@@ -205,18 +205,25 @@ async function loadTesseract() {
   return await window._tesseractData
 }
 
+webrtcperf.processingVideoTracks = new Set()
+
 /**
  * recognizeVideoTimestampWatermark
- * @param {MediaStreamTrack} videoTrack
+ * @param {MediaStreamTrack} track
  * @param {number} measureInterval
  */
-webrtcperf.recognizeVideoTimestampWatermark = async (videoTrack, measureInterval = 5) => {
-  log(`recognizeVideoTimestampWatermark ${videoTrack.id} ${videoTrack.label}`, videoTrack.getSettings())
+webrtcperf.recognizeVideoTimestampWatermark = async (track, measureInterval = 5) => {
+  if (webrtcperf.processingVideoTracks.has(track.id)) return
+  webrtcperf.processingVideoTracks.add(track)
+  track.addEventListener('ended', () => {
+    webrtcperf.processingVideoTracks.delete(track)
+  })
+  log(`recognizeVideoTimestampWatermark ${track.id} ${track.label}`, track.getSettings())
   const { scheduler } = await loadTesseract()
   let lastTimestamp = 0
 
   const trackProcessor = new window.MediaStreamTrackProcessor({
-    track: videoTrack,
+    track: track,
   })
   const writableStream = new window.WritableStream(
     {
@@ -226,7 +233,7 @@ webrtcperf.recognizeVideoTimestampWatermark = async (videoTrack, measureInterval
 
         if (timestamp - lastTimestamp > measureInterval * 1000000 && codedWidth && codedHeight) {
           lastTimestamp = timestamp
-          const textHeight = Math.round(Math.round(codedHeight / 18) * 1.2)
+          const textHeight = Math.max(Math.round(codedHeight / 15), 24)
           const bitmap = await createImageBitmap(videoFrame, 0, 0, codedWidth, textHeight)
           const canvas = new OffscreenCanvas(codedWidth, textHeight)
           const ctx = canvas.getContext('bitmaprenderer')
@@ -257,12 +264,17 @@ webrtcperf.recognizeVideoTimestampWatermark = async (videoTrack, measureInterval
         }
         videoFrame.close()
       },
-      close() {},
+      close() {
+        webrtcperf.processingVideoTracks.delete(track)
+      },
       abort(err) {
         log('WritableStream error:', err)
+        webrtcperf.processingVideoTracks.delete(track)
       },
     },
     new CountQueuingStrategy({ highWaterMark: 15 }),
   )
-  trackProcessor.readable.pipeTo(writableStream)
+  trackProcessor.readable.pipeTo(writableStream).catch(err => {
+    log(`recognizeVideoTimestampWatermark error: ${err.message}`)
+  })
 }

scripts/peer-connection.js

@@ -1,4 +1,4 @@
-/* global webrtcperf, log, PeerConnections, handleTransceiverForInsertableStreams, handleTransceiverForPlayoutDelayHint, handleTransceiverForJitterBufferTarget, recognizeAudioTimestampWatermark, saveMediaTrack, stopSaveMediaTrack */
+/* global webrtcperf, log, PeerConnections, handleTransceiverForInsertableStreams, handleTransceiverForPlayoutDelayHint, handleTransceiverForJitterBufferTarget, saveMediaTrack, stopSaveMediaTrack */
 
 const timestampInsertableStreams = !!window.PARAMS?.timestampInsertableStreams
 
@@ -320,7 +320,7 @@ window.RTCPeerConnection = function (conf, options) {
         }
       } else if (receiver.track.kind === 'audio') {
         if (webrtcperf.enabledForSession(window.PARAMS?.timestampWatermarkAudio)) {
-          recognizeAudioTimestampWatermark(receiver.track)
+          webrtcperf.recognizeAudioTimestampWatermark(receiver.track)
         }
         if (webrtcperf.enabledForSession(window.PARAMS?.saveRecvAudioTrack)) {
           saveMediaTrack(receiver.track, 'recv').catch(err => log(`saveMediaTrack error: ${err.message}`))