This repository has been archived by the owner on Sep 11, 2024. It is now read-only.
-
-
Notifications
You must be signed in to change notification settings - Fork 831
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Advanced audio processing settings (#8759)
Co-authored-by: Šimon Brandner <[email protected]> Fixes element-hq/element-web#6278 Fixes undefined
- Loading branch information
Showing
7 changed files
with
257 additions
and
22 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,65 @@ | ||
| /* | ||
| Copyright 2022 The Matrix.org Foundation C.I.C. | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| import { mocked } from 'jest-mock'; | ||
|
|
||
| import { SettingLevel } from "../src/settings/SettingLevel"; | ||
| import { MatrixClientPeg } from '../src/MatrixClientPeg'; | ||
| import { stubClient } from "./test-utils"; | ||
| import MediaDeviceHandler from "../src/MediaDeviceHandler"; | ||
| import SettingsStore from '../src/settings/SettingsStore'; | ||
|
|
||
| jest.mock("../src/settings/SettingsStore"); | ||
|
|
||
| const SettingsStoreMock = mocked(SettingsStore); | ||
|
|
||
| describe("MediaDeviceHandler", () => { | ||
| beforeEach(() => { | ||
| stubClient(); | ||
| }); | ||
|
|
||
| afterEach(() => { | ||
| jest.clearAllMocks(); | ||
| }); | ||
|
|
||
| it("sets audio settings", async () => { | ||
| const expectedAudioSettings = new Map<string, boolean>([ | ||
| ["webrtc_audio_autoGainControl", false], | ||
| ["webrtc_audio_echoCancellation", true], | ||
| ["webrtc_audio_noiseSuppression", false], | ||
| ]); | ||
|
|
||
| SettingsStoreMock.getValue.mockImplementation((settingName): any => { | ||
| return expectedAudioSettings.get(settingName); | ||
| }); | ||
|
|
||
| await MediaDeviceHandler.setAudioAutoGainControl(false); | ||
| await MediaDeviceHandler.setAudioEchoCancellation(true); | ||
| await MediaDeviceHandler.setAudioNoiseSuppression(false); | ||
|
|
||
| expectedAudioSettings.forEach((value, key) => { | ||
| expect(SettingsStoreMock.setValue).toHaveBeenCalledWith( | ||
| key, null, SettingLevel.DEVICE, value, | ||
| ); | ||
| }); | ||
|
|
||
| expect(MatrixClientPeg.get().getMediaHandler().setAudioSettings).toHaveBeenCalledWith({ | ||
| autoGainControl: false, | ||
| echoCancellation: true, | ||
| noiseSuppression: false, | ||
| }); | ||
| }); | ||
| }); |
56 changes: 56 additions & 0 deletions
56
test/components/views/settings/tabs/user/VoiceUserSettingsTab-test.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,56 @@ | ||
| /* | ||
| Copyright 2022 The Matrix.org Foundation C.I.C. | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| import React from 'react'; | ||
| import { mocked } from 'jest-mock'; | ||
| import { render } from '@testing-library/react'; | ||
|
|
||
| import VoiceUserSettingsTab from '../../../../../../src/components/views/settings/tabs/user/VoiceUserSettingsTab'; | ||
| import MediaDeviceHandler from "../../../../../../src/MediaDeviceHandler"; | ||
|
|
||
| jest.mock("../../../../../../src/MediaDeviceHandler"); | ||
| const MediaDeviceHandlerMock = mocked(MediaDeviceHandler); | ||
|
|
||
| describe('<VoiceUserSettingsTab />', () => { | ||
| const getComponent = (): React.ReactElement => (<VoiceUserSettingsTab />); | ||
|
|
||
| beforeEach(() => { | ||
| jest.clearAllMocks(); | ||
| }); | ||
|
|
||
| it('renders audio processing settings', () => { | ||
| const { getByTestId } = render(getComponent()); | ||
| expect(getByTestId('voice-auto-gain')).toBeTruthy(); | ||
| expect(getByTestId('voice-noise-suppression')).toBeTruthy(); | ||
| expect(getByTestId('voice-echo-cancellation')).toBeTruthy(); | ||
| }); | ||
|
|
||
| it('sets and displays audio processing settings', () => { | ||
| MediaDeviceHandlerMock.getAudioAutoGainControl.mockReturnValue(false); | ||
| MediaDeviceHandlerMock.getAudioEchoCancellation.mockReturnValue(true); | ||
| MediaDeviceHandlerMock.getAudioNoiseSuppression.mockReturnValue(false); | ||
|
|
||
| const { getByRole } = render(getComponent()); | ||
|
|
||
| getByRole("switch", { name: "Automatically adjust the microphone volume" }).click(); | ||
| getByRole("switch", { name: "Noise suppression" }).click(); | ||
| getByRole("switch", { name: "Echo cancellation" }).click(); | ||
|
|
||
| expect(MediaDeviceHandler.setAudioAutoGainControl).toHaveBeenCalledWith(true); | ||
| expect(MediaDeviceHandler.setAudioEchoCancellation).toHaveBeenCalledWith(false); | ||
| expect(MediaDeviceHandler.setAudioNoiseSuppression).toHaveBeenCalledWith(true); | ||
| }); | ||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters