Skip to content

Commit

Permalink
style: prettier changes
Browse files Browse the repository at this point in the history
  • Loading branch information
hugohutri committed Aug 24, 2022
1 parent 587bb1d commit 1f0c2d1
Show file tree
Hide file tree
Showing 3 changed files with 44 additions and 148 deletions.
24 changes: 5 additions & 19 deletions spec/unit/webrtc/callFeed.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,7 @@ describe("CallFeed", () => {
let client;

beforeEach(() => {
client = new TestClient(
"@alice:foo",
"somedevice",
"token",
undefined,
{},
);
client = new TestClient("@alice:foo", "somedevice", "token", undefined, {});
});

afterEach(() => {
Expand Down Expand Up @@ -65,36 +59,28 @@ describe("CallFeed", () => {
describe("muting after adding a track", () => {
it("should un-mute audio", () => {
// @ts-ignore Mock
feed.stream.addTrack(
new MockMediaStreamTrack("track", "audio", true),
);
feed.stream.addTrack(new MockMediaStreamTrack("track", "audio", true));
expect(feed.isAudioMuted()).toBeFalsy();
});

it("should un-mute video", () => {
// @ts-ignore Mock
feed.stream.addTrack(
new MockMediaStreamTrack("track", "video", true),
);
feed.stream.addTrack(new MockMediaStreamTrack("track", "video", true));
expect(feed.isVideoMuted()).toBeFalsy();
});
});

describe("muting after calling setAudioVideoMuted()", () => {
it("should mute audio by default ", () => {
// @ts-ignore Mock
feed.stream.addTrack(
new MockMediaStreamTrack("track", "audio", true),
);
feed.stream.addTrack(new MockMediaStreamTrack("track", "audio", true));
feed.setAudioVideoMuted(true, false);
expect(feed.isAudioMuted()).toBeTruthy();
});

it("should mute video by default", () => {
// @ts-ignore Mock
feed.stream.addTrack(
new MockMediaStreamTrack("track", "video", true),
);
feed.stream.addTrack(new MockMediaStreamTrack("track", "video", true));
feed.setAudioVideoMuted(false, true);
expect(feed.isVideoMuted()).toBeTruthy();
});
Expand Down
44 changes: 9 additions & 35 deletions src/webrtc/callFeed.ts
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,7 @@ type EventHandlerMap = {
[CallFeedEvent.Speaking]: (speaking: boolean) => void;
[CallFeedEvent.VoiceActivityThresholdChanged]: (threshold: number) => void;
};
export class CallFeed extends TypedEventEmitter<
CallFeedEvent,
EventHandlerMap
> {
export class CallFeed extends TypedEventEmitter<CallFeedEvent, EventHandlerMap> {
public stream: MediaStream;
public secondStream: MediaStream;
public sdpMetadataStreamId: string;
Expand Down Expand Up @@ -107,9 +104,7 @@ export class CallFeed extends TypedEventEmitter<
this.purpose = opts.purpose;
this.audioMuted = opts.audioMuted;
this.videoMuted = opts.videoMuted;
this.speakingVolumeSamples = new Array(SPEAKING_SAMPLE_COUNT).fill(
-Infinity,
);
this.speakingVolumeSamples = new Array(SPEAKING_SAMPLE_COUNT).fill(-Infinity);
this.sdpMetadataStreamId = opts.stream.id;
this.voiceActivityThreshold = -55;
this.setVADMute = opts.setVADMute;
Expand Down Expand Up @@ -159,13 +154,10 @@ export class CallFeed extends TypedEventEmitter<
this.analyser.smoothingTimeConstant = 0.1;

this.secondStream = this.stream.clone();
const mediaStreamAudioSourceNode =
this.audioContext.createMediaStreamSource(this.secondStream);
const mediaStreamAudioSourceNode = this.audioContext.createMediaStreamSource(this.stream);
mediaStreamAudioSourceNode.connect(this.analyser);

this.frequencyBinCount = new Float32Array(
this.analyser.frequencyBinCount,
);
this.frequencyBinCount = new Float32Array(this.analyser.frequencyBinCount);
}

private onAddTrack = (): void => {
Expand Down Expand Up @@ -229,28 +221,18 @@ export class CallFeed extends TypedEventEmitter<
* Either value may be null to leave it as-is
* @param muted is the feed's video muted?
*/
public setAudioVideoMuted(
audioMuted: boolean | null,
videoMuted: boolean | null,
): void {
public setAudioVideoMuted(audioMuted: boolean, videoMuted: boolean): void {
if (audioMuted !== null) {
if (this.audioMuted !== audioMuted) {
this.speakingVolumeSamples.fill(-Infinity);
}
this.audioMuted = audioMuted;
}
if (videoMuted !== null) this.videoMuted = videoMuted;
this.emit(
CallFeedEvent.MuteStateChanged,
this.audioMuted,
this.videoMuted,
);
this.emit(CallFeedEvent.MuteStateChanged, this.audioMuted, this.videoMuted);
}

public setVadMuted(
audioMuted: boolean | null,
videoMuted: boolean | null,
): void {
public setVadMuted(audioMuted: boolean | null, videoMuted: boolean | null): void {
if (audioMuted !== null) {
this.vadAudioMuted = audioMuted;
}
Expand All @@ -262,13 +244,7 @@ export class CallFeed extends TypedEventEmitter<
*/
public measureVolumeActivity(enabled: boolean): void {
if (enabled) {
if (
!this.analyser ||
!this.frequencyBinCount ||
!this.hasAudioTrack
) {
return;
}
if (!this.analyser || !this.frequencyBinCount || !this.hasAudioTrack) return;

this.measuringVolumeActivity = true;
this.volumeLooper();
Expand Down Expand Up @@ -356,9 +332,7 @@ export class CallFeed extends TypedEventEmitter<
public clone(): CallFeed {
const mediaHandler = this.client.getMediaHandler();
const stream = this.stream.clone();
logger.log(
`callFeed cloning stream ${this.stream.id} newStream ${stream.id}`,
);
logger.log(`callFeed cloning stream ${this.stream.id} newStream ${stream.id}`);

if (this.purpose === SDPStreamMetadataPurpose.Usermedia) {
mediaHandler.userMediaStreams.push(stream);
Expand Down
Loading

0 comments on commit 1f0c2d1

Please sign in to comment.