Merge f96a3ba into 2004aac

collab-project · Oct 31, 2020 · d55edf3 · d55edf3
2 parents 2004aac + f96a3ba
commit d55edf3
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 15 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,5 +1,10 @@
 # videojs-record changelog
 
+## 4.2.0 - unreleased
+
+- Fix issue with opus-recorder plugin (#519)
+
+
 ## 4.1.0 - 2020/08/11
 
 - Fixed webpack externals configuration: it's no longer needed to

diff --git a/docs/demo/audio-only-opus.html b/docs/demo/audio-only-opus.html
@@ -66,7 +66,7 @@
             displayMilliseconds: true,
             audioEngine: 'opus-recorder',
             audioSampleRate: 48000,
-            audioChannels: 2,
+            audioChannels: 1,
             audioWorkerURL: 'lib/opus-recorder/encoderWorker.min.js'
         }
     }

diff --git a/docs/plugins/opus-recorder.md b/docs/plugins/opus-recorder.md
@@ -42,7 +42,7 @@ record: {
     debug: true,
     audioEngine: 'opus-recorder',
     audioSampleRate: 48000,
-    audioChannels: 2,
+    audioChannels: 1,
     audioWorkerURL: '../../node_modules/opus-recorder/dist/encoderWorker.min.js'
     // use the pluginLibraryOptions option to specify optional settings for the
     // opus-recorder library. For example:
@@ -62,5 +62,5 @@ Options for this plugin:
 | `audioEngine` | `opus-recorder` | Enables the plugin. |
 | `audioWorkerURL` | `/path/to/encoderWorker.min.js` | Path to encoder WebWorker file. |
 | `audioSampleRate` | `48000` | The audio sample rate (in sample-frames per second) at which the `AudioContext` handles audio. Legal values are in the range of 22050 to 96000. |
-| `audioChannels` | `2` | Number of audio channels. Using a single channel results in a smaller file size. |
+| `audioChannels` | `1` | Number of audio channels. Using a single channel results in a smaller file size. |
 | `pluginLibraryOptions` | `{}` | Specify optional settings for the opus-recorder library. |
diff --git a/examples/plugins/audio-only-opus.html b/examples/plugins/audio-only-opus.html
@@ -69,7 +69,7 @@
             displayMilliseconds: true,
             audioEngine: 'opus-recorder',
             audioSampleRate: 48000,
-            audioChannels: 2,
+            audioChannels: 1,
             audioWorkerURL: '../../node_modules/opus-recorder/dist/encoderWorker.min.js'
             // use the pluginLibraryOptions option to specify optional settings for the
             // opus-recorder library. For example:

diff --git a/src/js/plugins/opus-recorder-plugin.js b/src/js/plugins/opus-recorder-plugin.js
@@ -40,7 +40,7 @@ class OpusRecorderEngine extends RecordEngine {
          *
          * @type {number}
          */
-        this.audioChannels = 2;
+        this.audioChannels = 1;
         /**
          * The length of the buffer that the internal `JavaScriptNode`
          * uses to capture the audio. Can be tweaked if experiencing
@@ -92,13 +92,19 @@ class OpusRecorderEngine extends RecordEngine {
         this.mediaType = mediaType;
         this.debug = debug;
 
+        // create new AudioContext
+        let AudioContext = window.AudioContext || window.webkitAudioContext;
+        this.audioContext = new AudioContext();
+        this.audioSourceNode = this.audioContext.createMediaStreamSource(
+            this.inputStream);
+
         // minimal default config
         this.config = {
-            leaveStreamOpen: true,
             numberOfChannels: this.audioChannels,
             bufferLength: this.bufferSize,
             encoderSampleRate: this.sampleRate,
-            encoderPath: this.audioWorkerURL
+            encoderPath: this.audioWorkerURL,
+            sourceNode: this.audioSourceNode
         };
 
         // extend config with optional options
@@ -107,19 +113,13 @@ class OpusRecorderEngine extends RecordEngine {
         // create Recorder engine
         this.engine = new Recorder(this.config);
         this.engine.ondataavailable = this.onRecordingAvailable.bind(this);
-
-        // create new AudioContext
-        let AudioContext = window.AudioContext || window.webkitAudioContext;
-        this.audioContext = new AudioContext();
-        this.audioSourceNode = this.audioContext.createMediaStreamSource(
-            this.inputStream);
     }
 
     /**
      * Start recording.
      */
     start() {
-        this.engine.start(this.audioSourceNode).then(() => {
+        this.engine.start().then(() => {
             // recording started ok
         }).catch((err) => {
             // can't start playback

diff --git a/test/test-helpers.js b/test/test-helpers.js
@@ -149,7 +149,7 @@ const TestHelpers = {
                 recordPluginOptions.audioEngine = OPUSRECORDER;
                 recordPluginOptions.audioSampleRate = 48000;
                 recordPluginOptions.audioWorkerURL = '/base/node_modules/opus-recorder/dist/encoderWorker.min.js';
-                recordPluginOptions.audioChannels = 2;
+                recordPluginOptions.audioChannels = 1;
                 break;
 
             case RECORDERJS: