matrix/matrix-js-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-12-01 04:43:29 +03:00
Code Activity

Don't use a callback in setScreensharingEnabled()

Browse Source 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
This commit is contained in:
Šimon Brandner
2021-09-01 18:08:59 +02:00
parent 3c36be9839
commit d7640d9e15
1 changed files with 15 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/webrtc/call.ts
View File

@@ -784,12 +784,11 @@ export class MatrixCall extends EventEmitter {
/** /**
* Starts/stops screensharing * Starts/stops screensharing
* @param enabled the desired screensharing state * @param enabled the desired screensharing state
* @param selectDesktopCapturerSource callBack to select a screensharing stream on desktop * @param desktopCapturerSource optional desktop capturer source to use
* @returns {boolean} new screensharing state * @returns {boolean} new screensharing state
*/ */
public async setScreensharingEnabled( public async setScreensharingEnabled(
enabled: boolean, enabled: boolean, desktopCapturerSource?: DesktopCapturerSource,
selectDesktopCapturerSource?: () => Promise<DesktopCapturerSource>,
): Promise<boolean> { ): Promise<boolean> {
// Skip if there is nothing to do // Skip if there is nothing to do
if (enabled && this.isScreensharing()) { if (enabled && this.isScreensharing()) {
@@ -802,13 +801,13 @@ export class MatrixCall extends EventEmitter {
// Fallback to replaceTrack() // Fallback to replaceTrack()
if (!this.opponentSupportsSDPStreamMetadata()) { if (!this.opponentSupportsSDPStreamMetadata()) {
return await this.setScreensharingEnabledWithoutMetadataSupport(enabled, selectDesktopCapturerSource); return await this.setScreensharingEnabledWithoutMetadataSupport(enabled, desktopCapturerSource);
} }
logger.debug(`Set screensharing enabled? ${enabled}`); logger.debug(`Set screensharing enabled? ${enabled}`);
if (enabled) { if (enabled) {
try { try {
const stream = await getScreensharingStream(selectDesktopCapturerSource); const stream = await getScreensharingStream(desktopCapturerSource);
if (!stream) return false; if (!stream) return false;
this.pushLocalFeed(stream, SDPStreamMetadataPurpose.Screenshare); this.pushLocalFeed(stream, SDPStreamMetadataPurpose.Screenshare);
return true; return true;
@@ -834,17 +833,16 @@ export class MatrixCall extends EventEmitter {
* Starts/stops screensharing * Starts/stops screensharing
* Should be used ONLY if the opponent doesn't support SDPStreamMetadata * Should be used ONLY if the opponent doesn't support SDPStreamMetadata
* @param enabled the desired screensharing state * @param enabled the desired screensharing state
* @param selectDesktopCapturerSource callBack to select a screensharing stream on desktop * @param desktopCapturerSource optional desktop capturer source to use
* @returns {boolean} new screensharing state * @returns {boolean} new screensharing state
*/ */
private async setScreensharingEnabledWithoutMetadataSupport( private async setScreensharingEnabledWithoutMetadataSupport(
enabled: boolean, enabled: boolean, desktopCapturerSource?: DesktopCapturerSource,
selectDesktopCapturerSource?: () => Promise<DesktopCapturerSource>,
): Promise<boolean> { ): Promise<boolean> {
logger.debug(`Set screensharing enabled? ${enabled} using replaceTrack()`); logger.debug(`Set screensharing enabled? ${enabled} using replaceTrack()`);
if (enabled) { if (enabled) {
try { try {
const stream = await getScreensharingStream(selectDesktopCapturerSource); const stream = await getScreensharingStream(desktopCapturerSource);
if (!stream) return false; if (!stream) return false;
const track = stream.getTracks().find((track) => { const track = stream.getTracks().find((track) => {
@@ -1926,13 +1924,11 @@ export class MatrixCall extends EventEmitter {
} }
} }
async function getScreensharingStream( async function getScreensharingStream(desktopCapturerSource: DesktopCapturerSource): Promise<MediaStream> {
selectDesktopCapturerSource?: () => Promise<DesktopCapturerSource>, const screenshareConstraints = getScreenshareContraints(desktopCapturerSource);
): Promise<MediaStream> {
const screenshareConstraints = await getScreenshareContraints(selectDesktopCapturerSource);
if (!screenshareConstraints) return null; if (!screenshareConstraints) return null;
if (window.electron?.getDesktopCapturerSources) { if (desktopCapturerSource) {
// We are using Electron // We are using Electron
logger.debug("Getting screen stream using getUserMedia()..."); logger.debug("Getting screen stream using getUserMedia()...");
return await navigator.mediaDevices.getUserMedia(screenshareConstraints); return await navigator.mediaDevices.getUserMedia(screenshareConstraints);
@@ -1980,27 +1976,20 @@ function getUserMediaContraints(type: ConstraintsType): MediaStreamConstraints {
} }
} }
async function getScreenshareContraints( function getScreenshareContraints(desktopCapturerSource?: DesktopCapturerSource): DesktopCapturerConstraints {
selectDesktopCapturerSource?: () => Promise<DesktopCapturerSource>, if (desktopCapturerSource) {
): Promise<DesktopCapturerConstraints> { logger.debug("Using desktop capturer source", desktopCapturerSource);
if (window.electron?.getDesktopCapturerSources && selectDesktopCapturerSource) {
// We have access to getDesktopCapturerSources()
logger.debug("Electron getDesktopCapturerSources() is available...");
const selectedSource = await selectDesktopCapturerSource();
if (!selectedSource) return null;
return { return {
audio: false, audio: false,
video: { video: {
mandatory: { mandatory: {
chromeMediaSource: "desktop", chromeMediaSource: "desktop",
chromeMediaSourceId: selectedSource.id, chromeMediaSourceId: desktopCapturerSource.id,
}, },
}, },
}; };
} else { } else {
// We do not have access to the Electron desktop capturer, logger.debug("Not using desktop capturer source");
// therefore we can assume we are on the web
logger.debug("Electron desktopCapturer is not available...");
return { return {
audio: false, audio: false,
video: true, video: true,