Merge branch 'gh-pages' into video-replay

Author: fippo

.eslintrc.js

@@ -35,6 +35,9 @@ module.exports = {
     // From Streams specification
     "TransformStream": true,
     // From WebCodec specification
+    "AudioData": true,
+    "AudioEncoder": true,
+    "AudioDecoder": true,
     "VideoFrame": true,
     "VideoEncoder": true,
     "VideoDecoder": true,

src/content/insertable-streams/audio-processing/index.html

@@ -48,6 +48,7 @@ <h1><a href="//webrtc.github.io/samples/" title="WebRTC samples homepage">WebRTC
         <button type="button" id="stopButton" disabled>Stop</button>
     <div>
     <p class="warning">Warning: if you're not using headphones, pressing Start will cause feedback.</p>
+    <div id="errorMsg" class="warning"></div>
 
     <p>View the console to see logging. The <code>audio</code>, <code>processor</code>,
         <code>generator</code>, <code>transformer</code>, <code>stream</code> and

src/content/insertable-streams/audio-processing/js/main.js

@@ -44,19 +44,14 @@ let stopButton;
 // Transformation chain elements
 let processor;
 let generator;
-let transformer;
 
 // Stream from getUserMedia
 let stream;
 // Output from the transform
 let processedStream;
 
-// Adjust this value to increase/decrease the amount of filtering.
-// eslint-disable-next-line prefer-const
-let cutoff = 100;
-
-// An AbortController used to stop the transform.
-let abortController;
+// Worker for processing
+let worker;
 
 // Initialize on page load.
 async function init() {
@@ -73,85 +68,35 @@ const constraints = window.constraints = {
   video: false
 };
 
-// Returns a low-pass transform function for use with TransformStream.
-function lowPassFilter() {
-  const format = 'f32-planar';
-  let lastValuePerChannel = undefined;
-  return (data, controller) => {
-    const rc = 1.0 / (cutoff * 2 * Math.PI);
-    const dt = 1.0 / data.sampleRate;
-    const alpha = dt / (rc + dt);
-    const nChannels = data.numberOfChannels;
-    if (!lastValuePerChannel) {
-      console.log(`Audio stream has ${nChannels} channels.`);
-      lastValuePerChannel = Array(nChannels).fill(0);
-    }
-    const buffer = new Float32Array(data.numberOfFrames * nChannels);
-    for (let c = 0; c < nChannels; c++) {
-      const offset = data.numberOfFrames * c;
-      const samples = buffer.subarray(offset, offset + data.numberOfFrames);
-      data.copyTo(samples, {planeIndex: c, format});
-      let lastValue = lastValuePerChannel[c];
-
-      // Apply low-pass filter to samples.
-      for (let i = 0; i < samples.length; ++i) {
-        lastValue = lastValue + alpha * (samples[i] - lastValue);
-        samples[i] = lastValue;
-      }
-
-      lastValuePerChannel[c] = lastValue;
-    }
-    controller.enqueue(new AudioData({
-      format,
-      sampleRate: data.sampleRate,
-      numberOfFrames: data.numberOfFrames,
-      numberOfChannels: nChannels,
-      timestamp: data.timestamp,
-      data: buffer
-    }));
-  };
-}
-
 async function start() {
   startButton.disabled = true;
   try {
     stream = await navigator.mediaDevices.getUserMedia(constraints);
+    const audioTracks = stream.getAudioTracks();
+    console.log('Using audio device: ' + audioTracks[0].label);
+    stream.oninactive = () => {
+      console.log('Stream ended');
+    };
+
+    processor = new MediaStreamTrackProcessor(audioTracks[0]);
+    generator = new MediaStreamTrackGenerator('audio');
+    const source = processor.readable;
+    const sink = generator.writable;
+    worker = new Worker('js/worker.js');
+    worker.postMessage({source: source, sink: sink}, [source, sink]);
+
+    processedStream = new MediaStream();
+    processedStream.addTrack(generator);
+    audio.srcObject = processedStream;
+    stopButton.disabled = false;
+    await audio.play();
   } catch (error) {
     const errorMessage =
           'navigator.MediaDevices.getUserMedia error: ' + error.message + ' ' +
           error.name;
     document.getElementById('errorMsg').innerText = errorMessage;
     console.log(errorMessage);
   }
-  const audioTracks = stream.getAudioTracks();
-  console.log('Using audio device: ' + audioTracks[0].label);
-  stream.oninactive = () => {
-    console.log('Stream ended');
-  };
-
-  processor = new MediaStreamTrackProcessor(audioTracks[0]);
-  generator = new MediaStreamTrackGenerator('audio');
-  const source = processor.readable;
-  const sink = generator.writable;
-  transformer = new TransformStream({transform: lowPassFilter()});
-  abortController = new AbortController();
-  const signal = abortController.signal;
-  const promise = source.pipeThrough(transformer, {signal}).pipeTo(sink);
-  promise.catch((e) => {
-    if (signal.aborted) {
-      console.log('Shutting down streams after abort.');
-    } else {
-      console.error('Error from stream transform:', e);
-    }
-    source.cancel(e);
-    sink.abort(e);
-  });
-
-  processedStream = new MediaStream();
-  processedStream.addTrack(generator);
-  audio.srcObject = processedStream;
-  stopButton.disabled = false;
-  await audio.play();
 }
 
 async function stop() {
@@ -161,8 +106,7 @@ async function stop() {
   stream.getTracks().forEach(track => {
     track.stop();
   });
-  abortController.abort();
-  abortController = null;
+  worker.postMessage({command: 'abort'});
   startButton.disabled = false;
 }
 

src/content/insertable-streams/audio-processing/js/worker.js

@@ -0,0 +1,75 @@
+/*
+ *  Copyright (c) 2023 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree.
+ */
+
+// Adjust this value to increase/decrease the amount of filtering.
+// eslint-disable-next-line prefer-const
+let cutoff = 100;
+
+// Returns a low-pass transform function for use with TransformStream.
+function lowPassFilter() {
+  const format = 'f32-planar';
+  let lastValuePerChannel = undefined;
+  return (data, controller) => {
+    const rc = 1.0 / (cutoff * 2 * Math.PI);
+    const dt = 1.0 / data.sampleRate;
+    const alpha = dt / (rc + dt);
+    const nChannels = data.numberOfChannels;
+    if (!lastValuePerChannel) {
+      console.log(`Audio stream has ${nChannels} channels.`);
+      lastValuePerChannel = Array(nChannels).fill(0);
+    }
+    const buffer = new Float32Array(data.numberOfFrames * nChannels);
+    for (let c = 0; c < nChannels; c++) {
+      const offset = data.numberOfFrames * c;
+      const samples = buffer.subarray(offset, offset + data.numberOfFrames);
+      data.copyTo(samples, {planeIndex: c, format});
+      let lastValue = lastValuePerChannel[c];
+
+      // Apply low-pass filter to samples.
+      for (let i = 0; i < samples.length; ++i) {
+        lastValue = lastValue + alpha * (samples[i] - lastValue);
+        samples[i] = lastValue;
+      }
+
+      lastValuePerChannel[c] = lastValue;
+    }
+    controller.enqueue(new AudioData({
+      format,
+      sampleRate: data.sampleRate,
+      numberOfFrames: data.numberOfFrames,
+      numberOfChannels: nChannels,
+      timestamp: data.timestamp,
+      data: buffer
+    }));
+  };
+}
+
+let abortController;
+
+onmessage = async (event) => {
+  if (event.data.command == 'abort') {
+    abortController.abort();
+    abortController = null;
+  } else {
+    const source = event.data.source;
+    const sink = event.data.sink;
+    const transformer = new TransformStream({transform: lowPassFilter()});
+    abortController = new AbortController();
+    const signal = abortController.signal;
+    const promise = source.pipeThrough(transformer, {signal}).pipeTo(sink);
+    promise.catch((e) => {
+      if (signal.aborted) {
+        console.log('Shutting down streams after abort.');
+      } else {
+        console.error('Error from stream transform:', e);
+      }
+      source.cancel(e);
+      sink.abort(e);
+    });
+  }
+};

src/content/peerconnection/bandwidth/js/main.js

@@ -200,8 +200,14 @@ function onSetSessionDescriptionError(error) {
 bandwidthSelector.onchange = () => {
   bandwidthSelector.disabled = true;
   const bandwidth = bandwidthSelector.options[bandwidthSelector.selectedIndex].value;
+  setBandwidth(bandwidth)
+      .then(() => {
+        bandwidthSelector.disabled = false;
+      });
+};
 
-  // In Chrome, use RTCRtpSender.setParameters to change bandwidth without
+function setBandwidth(bandwidthInKbps) {
+  // In modern browsers, use RTCRtpSender.setParameters to change bandwidth without
   // (local) renegotiation. Note that this will be within the envelope of
   // the initial maximum bandwidth negotiated via SDP.
   if ((adapter.browserDetails.browser === 'chrome' ||
@@ -215,36 +221,28 @@ bandwidthSelector.onchange = () => {
     if (!parameters.encodings) {
       parameters.encodings = [{}];
     }
-    if (bandwidth === 'unlimited') {
+    if (bandwidthInKbps === 'unlimited') {
       delete parameters.encodings[0].maxBitrate;
     } else {
-      parameters.encodings[0].maxBitrate = bandwidth * 1000;
+      parameters.encodings[0].maxBitrate = bandwidthInKbps * 1000;
     }
-    sender.setParameters(parameters)
-        .then(() => {
-          bandwidthSelector.disabled = false;
-        })
-        .catch(e => console.error(e));
-    return;
+    return sender.setParameters(parameters);
   }
-  // Fallback to the SDP munging with local renegotiation way of limiting
+  // Fallback to the SDP changes with local renegotiation as way of limiting
   // the bandwidth.
-  pc1.createOffer()
+  return pc1.createOffer()
       .then(offer => pc1.setLocalDescription(offer))
       .then(() => {
         const desc = {
           type: pc1.remoteDescription.type,
-          sdp: bandwidth === 'unlimited' ?
+          sdp: bandwidthInKbps === 'unlimited' ?
           removeBandwidthRestriction(pc1.remoteDescription.sdp) :
-          updateBandwidthRestriction(pc1.remoteDescription.sdp, bandwidth)
+          updateBandwidthRestriction(pc1.remoteDescription.sdp, bandwidthInKbps)
         };
         console.log('Applying bandwidth restriction to setRemoteDescription:\n' +
         desc.sdp);
         return pc1.setRemoteDescription(desc);
       })
-      .then(() => {
-        bandwidthSelector.disabled = false;
-      })
       .catch(onSetSessionDescriptionError);
 };