haskal
/
jiti-meet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rnnoise: simplify initialization

This commit is contained in:
Saúl Ibarra Corretgé 2020-06-11 15:42:55 +02:00 committed by Saúl Ibarra Corretgé
parent 6533071c4c
commit 7646618e5a
4 changed files with 7 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package-lock.json generated
View File

@ -15793,8 +15793,8 @@
} }
}, },
"rnnoise-wasm": { "rnnoise-wasm": {
"version": "github:jitsi/rnnoise-wasm#db96d11f175a22ef56c7db1ba9550835b716e615", "version": "github:jitsi/rnnoise-wasm#566a16885897704d6e6d67a1d5ac5d39781db2af",
"from": "github:jitsi/rnnoise-wasm#db96d11f175a22ef56c7db1ba9550835b716e615" "from": "github:jitsi/rnnoise-wasm#566a16885897704d6e6d67a1d5ac5d39781db2af"
}, },
"rsvp": { "rsvp": {
"version": "4.8.5", "version": "4.8.5",

2
package.json
View File

@ -89,7 +89,7 @@
"react-transition-group": "2.4.0", "react-transition-group": "2.4.0",
"redux": "4.0.4", "redux": "4.0.4",
"redux-thunk": "2.2.0", "redux-thunk": "2.2.0",
"rnnoise-wasm": "github:jitsi/rnnoise-wasm.git#db96d11f175a22ef56c7db1ba9550835b716e615", "rnnoise-wasm": "github:jitsi/rnnoise-wasm.git#566a16885897704d6e6d67a1d5ac5d39781db2af",
"styled-components": "3.4.9", "styled-components": "3.4.9",
"util": "0.12.1", "util": "0.12.1",
"uuid": "3.1.0", "uuid": "3.1.0",

20
react/features/stream-effects/rnnoise/index.js
View File

@ -9,8 +9,7 @@ import RnnoiseProcessor from './RnnoiseProcessor';
export { RNNOISE_SAMPLE_LENGTH } from './RnnoiseProcessor'; export { RNNOISE_SAMPLE_LENGTH } from './RnnoiseProcessor';
export type { RnnoiseProcessor }; export type { RnnoiseProcessor };
let rnnoiseWasmInterface; let rnnoiseModule;
let initializePromise;
/** /**
* Creates a new instance of RnnoiseProcessor. * Creates a new instance of RnnoiseProcessor.
@ -18,20 +17,9 @@ let initializePromise;
* @returns {Promise<RnnoiseProcessor>} * @returns {Promise<RnnoiseProcessor>}
*/ */
export function createRnnoiseProcessor() { export function createRnnoiseProcessor() {
if (!initializePromise) { if (!rnnoiseModule) {
initializePromise = new Promise((resolve, reject) => { rnnoiseModule = rnnoiseWasmInit();
rnnoiseWasmInterface = rnnoiseWasmInit({
onRuntimeInitialized() {
resolve();
},
onAbort(reason) {
reject(reason);
}
});
});
} }
return initializePromise.then( return rnnoiseModule.then(mod => new RnnoiseProcessor(mod));
() => new RnnoiseProcessor(rnnoiseWasmInterface)
);
} }

6
webpack.config.js
View File

@ -250,12 +250,6 @@ module.exports = [
entry: { entry: {
'rnnoise-processor': './react/features/stream-effects/rnnoise/index.js' 'rnnoise-processor': './react/features/stream-effects/rnnoise/index.js'
}, },
node: {
// Emscripten generated glue code "rnnoise.js" expects node fs module,
// we need to specify this parameter so webpack knows how to properly
// interpret it when encountered.
fs: 'empty'
},
output: Object.assign({}, config.output, { output: Object.assign({}, config.output, {
library: [ 'JitsiMeetJS', 'app', 'effects', 'rnnoise' ], library: [ 'JitsiMeetJS', 'app', 'effects', 'rnnoise' ],
libraryTarget: 'window', libraryTarget: 'window',