Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add support for audio sharing #2530

Merged
merged 2 commits into from
Jul 28, 2022
Merged

Add support for audio sharing #2530

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0bb75cb
Add support for audio sharing
SimonBrandner Jul 16, 2022
5e5a1ac
Simplify code
SimonBrandner Jul 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions src/webrtc/call.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ import { ISendEventResponse } from "../@types/requests";
import { EventEmitterEvents, TypedEventEmitter } from "../models/typed-event-emitter";
import { DeviceInfo } from '../crypto/deviceinfo';
import { GroupCallUnknownDeviceError } from './groupCall';
import { IScreensharingOpts } from "./mediaHandler";

// events: hangup, error(err), replaced(call), state(state, oldState)

Expand Down Expand Up @@ -1100,7 +1101,7 @@ export class MatrixCall extends TypedEventEmitter<CallEvent, CallEventHandlerMap
* @param {string} desktopCapturerSourceId optional id of the desktop capturer source to use
* @returns {boolean} new screensharing state
*/
public async setScreensharingEnabled(enabled: boolean, desktopCapturerSourceId?: string): Promise<boolean> {
public async setScreensharingEnabled(enabled: boolean, opts?: IScreensharingOpts): Promise<boolean> {
// Skip if there is nothing to do
if (enabled && this.isScreensharing()) {
logger.warn(`Call ${this.callId} There is already a screensharing stream - there is nothing to do!`);
Expand All @@ -1112,13 +1113,13 @@ export class MatrixCall extends TypedEventEmitter<CallEvent, CallEventHandlerMap

// Fallback to replaceTrack()
if (!this.opponentSupportsSDPStreamMetadata()) {
return this.setScreensharingEnabledWithoutMetadataSupport(enabled, desktopCapturerSourceId);
return this.setScreensharingEnabledWithoutMetadataSupport(enabled, opts);
}

logger.debug(`Call ${this.callId} set screensharing enabled? ${enabled}`);
if (enabled) {
try {
const stream = await this.client.getMediaHandler().getScreensharingStream(desktopCapturerSourceId);
const stream = await this.client.getMediaHandler().getScreensharingStream(opts);
if (!stream) return false;
this.pushNewLocalFeed(stream, SDPStreamMetadataPurpose.Screenshare);
return true;
Expand All @@ -1144,12 +1145,12 @@ export class MatrixCall extends TypedEventEmitter<CallEvent, CallEventHandlerMap
* @returns {boolean} new screensharing state
*/
private async setScreensharingEnabledWithoutMetadataSupport(
enabled: boolean, desktopCapturerSourceId?: string,
enabled: boolean, opts?: IScreensharingOpts,
): Promise<boolean> {
logger.debug(`Call ${this.callId} Set screensharing enabled? ${enabled} using replaceTrack()`);
if (enabled) {
try {
const stream = await this.client.getMediaHandler().getScreensharingStream(desktopCapturerSourceId);
const stream = await this.client.getMediaHandler().getScreensharingStream(opts);
if (!stream) return false;

const track = stream.getTracks().find((track) => {
Expand Down
8 changes: 4 additions & 4 deletions src/webrtc/groupCall.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import { MatrixEvent } from "../models/event";
import { EventType } from "../@types/event";
import { CallEventHandlerEvent } from "./callEventHandler";
import { GroupCallEventHandlerEvent } from "./groupCallEventHandler";
import { IScreensharingOpts } from "./mediaHandler";

export enum GroupCallIntent {
Ring = "m.ring",
Expand Down Expand Up @@ -527,7 +528,7 @@ export class GroupCall extends TypedEventEmitter<GroupCallEvent, GroupCallEventH
}

public async setScreensharingEnabled(
enabled: boolean, desktopCapturerSourceId?: string,
enabled: boolean, opts: IScreensharingOpts = {},
): Promise<boolean> {
if (enabled === this.isScreensharing()) {
return enabled;
Expand All @@ -536,8 +537,7 @@ export class GroupCall extends TypedEventEmitter<GroupCallEvent, GroupCallEventH
if (enabled) {
try {
logger.log("Asking for screensharing permissions...");

const stream = await this.client.getMediaHandler().getScreensharingStream(desktopCapturerSourceId);
const stream = await this.client.getMediaHandler().getScreensharingStream(opts);

for (const track of stream.getTracks()) {
const onTrackEnded = () => {
Expand All @@ -550,7 +550,7 @@ export class GroupCall extends TypedEventEmitter<GroupCallEvent, GroupCallEventH

logger.log("Screensharing permissions granted. Setting screensharing enabled on all calls");

this.localDesktopCapturerSourceId = desktopCapturerSourceId;
this.localDesktopCapturerSourceId = opts.desktopCapturerSourceId;
this.localScreenshareFeed = new CallFeed({
client: this.client,
roomId: this.room.roomId,
Expand Down
24 changes: 15 additions & 9 deletions src/webrtc/mediaHandler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,11 @@ export type MediaHandlerEventHandlerMap = {
[MediaHandlerEvent.LocalStreamsChanged]: () => void;
};

export interface IScreensharingOpts {
desktopCapturerSourceId?: string;
audio?: boolean;
}

export class MediaHandler extends TypedEventEmitter<
MediaHandlerEvent.LocalStreamsChanged, MediaHandlerEventHandlerMap
> {
Expand Down Expand Up @@ -254,20 +259,20 @@ export class MediaHandler extends TypedEventEmitter<
* @param reusable is allowed to be reused by the MediaHandler
* @returns {MediaStream} based on passed parameters
*/
public async getScreensharingStream(desktopCapturerSourceId: string, reusable = true): Promise<MediaStream | null> {
public async getScreensharingStream(opts: IScreensharingOpts = {}, reusable = true): Promise<MediaStream | null> {
let stream: MediaStream;

if (this.screensharingStreams.length === 0) {
const screenshareConstraints = this.getScreenshareContraints(desktopCapturerSourceId);
const screenshareConstraints = this.getScreenshareContraints(opts);
if (!screenshareConstraints) return null;

if (desktopCapturerSourceId) {
if (opts.desktopCapturerSourceId) {
// We are using Electron
logger.debug("Getting screensharing stream using getUserMedia()", desktopCapturerSourceId);
logger.debug("Getting screensharing stream using getUserMedia()", opts);
stream = await navigator.mediaDevices.getUserMedia(screenshareConstraints);
} else {
// We are not using Electron
logger.debug("Getting screensharing stream using getDisplayMedia()");
logger.debug("Getting screensharing stream using getDisplayMedia()", opts);
stream = await navigator.mediaDevices.getDisplayMedia(screenshareConstraints);
}
} else {
Expand Down Expand Up @@ -352,11 +357,12 @@ export class MediaHandler extends TypedEventEmitter<
};
}

private getScreenshareContraints(desktopCapturerSourceId?: string): DesktopCapturerConstraints {
if (desktopCapturerSourceId) {
private getScreenshareContraints(opts: IScreensharingOpts): DesktopCapturerConstraints {
const { desktopCapturerSourceId, audio } = opts;
if (opts.desktopCapturerSourceId) {
SimonBrandner marked this conversation as resolved.
Show resolved Hide resolved
logger.debug("Using desktop capturer source", desktopCapturerSourceId);
return {
audio: false,
audio,
video: {
mandatory: {
chromeMediaSource: "desktop",
Expand All @@ -367,7 +373,7 @@ export class MediaHandler extends TypedEventEmitter<
} else {
logger.debug("Not using desktop capturer source");
return {
audio: false,
audio,
video: true,
};
}
Expand Down