v11.0.0

Prepare changelog for v11.0.0
Merge pull request #1695 from matrix-org/jryans/glare-streams-release
2021-05-17 13:30:08 +01:00 · 2021-05-17 13:30:07 +01:00 · 2021-05-17 11:55:25 +01:00 · 2021-05-17 11:20:14 +01:00 · 2021-05-11 15:03:04 +01:00 · 2021-05-11 15:03:03 +01:00
11 changed files with 246 additions and 268 deletions
@@ -1,3 +1,34 @@
+Changes in [11.0.0](https://github.com/matrix-org/matrix-js-sdk/releases/tag/v11.0.0) (2021-05-17)
+==================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-js-sdk/compare/v11.0.0-rc.1...v11.0.0)
+
+ * [Release] Fix regressed glare
+   [\#1695](https://github.com/matrix-org/matrix-js-sdk/pull/1695)
+
+Changes in [11.0.0-rc.1](https://github.com/matrix-org/matrix-js-sdk/releases/tag/v11.0.0-rc.1) (2021-05-11)
+============================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-js-sdk/compare/v10.1.0...v11.0.0-rc.1)
+
+BREAKING CHANGES
+---
+
+ * `MatrixCall` and related APIs have been redesigned to support multiple streams 
+   (see [\#1660](https://github.com/matrix-org/matrix-js-sdk/pull/1660) for more details)
+
+All changes
+---
+
+ * Switch from MSC1772 unstable prefixes to stable
+   [\#1679](https://github.com/matrix-org/matrix-js-sdk/pull/1679)
+ * Update the VoIP example to work with the new changes
+   [\#1680](https://github.com/matrix-org/matrix-js-sdk/pull/1680)
+ * Bump hosted-git-info from 2.8.8 to 2.8.9
+   [\#1687](https://github.com/matrix-org/matrix-js-sdk/pull/1687)
+ * Support for multiple streams (not MSC3077)
+   [\#1660](https://github.com/matrix-org/matrix-js-sdk/pull/1660)
+ * Tweak missing m.room.create errors to describe their source
+   [\#1683](https://github.com/matrix-org/matrix-js-sdk/pull/1683)
+
 Changes in [10.1.0](https://github.com/matrix-org/matrix-js-sdk/releases/tag/v10.1.0) (2021-05-10)
 ==================================================================================================
 [Full Changelog](https://github.com/matrix-org/matrix-js-sdk/compare/v10.1.0-rc.1...v10.1.0)
@@ -31,6 +31,23 @@ function addListeners(call) {
        call.hangup();
        disableButtons(false, true, true);
    });
+    call.on("feeds_changed", function(feeds) {
+        const localFeed = feeds.find((feed) => feed.isLocal());
+        const remoteFeed = feeds.find((feed) => !feed.isLocal());
+
+        const remoteElement = document.getElementById("remote");
+        const localElement = document.getElementById("local");
+
+        if (remoteFeed) {
+            remoteElement.srcObject = remoteFeed.stream;
+            remoteElement.play();
+        }
+        if (localFeed) {
+            localElement.muted = true;
+            localElement.srcObject = localFeed.stream;
+            localElement.play();
+        }
+    });
 }

 window.onload = function() {
@@ -62,10 +79,7 @@ function syncComplete() {
        );
        console.log("Call => %s", call);
        addListeners(call);
-        call.placeVideoCall(
-            document.getElementById("remote"),
-            document.getElementById("local")
-        );
+        call.placeVideoCall();
        document.getElementById("result").innerHTML = "<p>Placed call.</p>";
        disableButtons(true, true, false);
    };
@@ -1,26 +1,34 @@
 <html>
+
 <head>
-<title>VoIP Test</title>
-<script src="lib/matrix.js"></script>
-<script src="browserTest.js"></script>
+    <title>VoIP Test</title>
+    <script src="lib/matrix.js"></script>
+    <script src="browserTest.js"></script>
 </head>
+
 <body>
-	You can place and receive calls with this example. Make sure to edit the
+    You can place and receive calls with this example. Make sure to edit the
    constants in <code>browserTest.js</code> first.
    <div id="config"></div>
    <div id="result"></div>
    <button id="call">Place Call</button>
    <button id="answer">Answer Call</button>
    <button id="hangup">Hangup Call</button>
-    <div id="videoBackground">
-        <div id="videoContainer">
-            <video id="remote"></video>
-        </div>
-    </div>
-    <div id="videoBackground">
-        <div id="videoContainer">
-            <video id="local"></video>
-        </div>
+    <div id="videoBackground" class="video-background">
+        <video class="video-element" id="local"></video>
+        <video class="video-element" id="remote"></video>
    </div>
 </body>
+
 </html>
+
+<style>
+    .video-background {
+        height: 500px;
+        margin: 10px;
+    }
+
+    .video-element {
+        height: 100%;
+    }
+</style>
@@ -1,6 +1,6 @@
 {
  "name": "matrix-js-sdk",
-  "version": "10.1.0",
+  "version": "11.0.0",
  "description": "Matrix Client-Server SDK for Javascript",
  "scripts": {
    "prepublishOnly": "yarn build",
@@ -36,9 +36,8 @@ export enum EventType {
     */
    RoomAliases = "m.room.aliases", // deprecated https://matrix.org/docs/spec/client_server/r0.6.1#historical-events

-    // Spaces MSC1772
-    SpaceChild = "org.matrix.msc1772.space.child",
-    SpaceParent = "org.matrix.msc1772.space.parent",
+    SpaceChild = "m.space.child",
+    SpaceParent = "m.space.parent",

    // Room timeline events
    RoomRedaction = "m.room.redaction",
@@ -95,8 +94,8 @@ export enum MsgType {
    Video = "m.video",
 }

-export const RoomCreateTypeField = "org.matrix.msc1772.type"; // Spaces MSC1772
+export const RoomCreateTypeField = "type";

 export enum RoomType {
-    Space = "org.matrix.msc1772.space", // Spaces MSC1772
+    Space = "m.space",
 }
@@ -55,7 +55,6 @@ export * from "./content-repo";
 export * as ContentHelpers from "./content-helpers";
 export {
    createNewMatrixCall,
-    setAudioOutput as setMatrixCallAudioOutput,
    setAudioInput as setMatrixCallAudioInput,
    setVideoInput as setMatrixCallVideoInput,
 } from "./webrtc/call";
@@ -235,7 +235,7 @@ utils.inherits(Room, EventEmitter);
 Room.prototype.getVersion = function() {
    const createEvent = this.currentState.getStateEvents("m.room.create", "");
    if (!createEvent) {
-        logger.warn("Room " + this.roomId + " does not have an m.room.create event");
+        logger.warn("[getVersion] Room " + this.roomId + " does not have an m.room.create event");
        return '1';
    }
    const ver = createEvent.getContent()['room_version'];
@@ -1963,7 +1963,7 @@ Room.prototype.getJoinRule = function() {
 Room.prototype.getType = function() {
    const createEvent = this.currentState.getStateEvents("m.room.create", "");
    if (!createEvent) {
-        logger.warn("Room " + this.roomId + " does not have an m.room.create event");
+        logger.warn("[getType] Room " + this.roomId + " does not have an m.room.create event");
        return undefined;
    }
    return createEvent.getContent()[RoomCreateTypeField];
@@ -28,7 +28,15 @@ import MatrixEvent from '../models/event';
 import {EventType} from '../@types/event';
 import { RoomMember } from '../models/room-member';
 import { randomString } from '../randomstring';
-import { MCallReplacesEvent, MCallAnswer, MCallOfferNegotiate, CallCapabilities } from './callEventTypes';
+import {
+    MCallReplacesEvent,
+    MCallAnswer,
+    MCallOfferNegotiate,
+    CallCapabilities,
+    SDPStreamMetadataPurpose,
+} from './callEventTypes';
+import { CallFeed } from './callFeed';
+

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

@@ -106,6 +114,8 @@ export enum CallEvent {
    RemoteHoldUnhold = 'remote_hold_unhold',
    // backwards compat alias for LocalHoldUnhold: remove in a major version bump
    HoldUnhold = 'hold_unhold',
+    // Feeds have changed
+    FeedsChanged = 'feeds_changed',

    AssertedIdentityChanged = 'asserted_identity_changed',
 }
@@ -255,11 +265,8 @@ export class MatrixCall extends EventEmitter {
    private candidateSendTries: number;
    private sentEndOfCandidates: boolean;
    private peerConn: RTCPeerConnection;
-    private localVideoElement: HTMLVideoElement;
-    private remoteVideoElement: HTMLVideoElement;
-    private remoteAudioElement: HTMLAudioElement;
+    private feeds: Array<CallFeed>;
    private screenSharingStream: MediaStream;
-    private remoteStream: MediaStream;
    private localAVStream: MediaStream;
    private inviteOrAnswerSent: boolean;
    private waitForLocalAVStream: boolean;
@@ -336,6 +343,8 @@ export class MatrixCall extends EventEmitter {
        this.unholdingRemote = false;
        this.micMuted = false;
        this.vidMuted = false;
+
+        this.feeds = [];
    }

    /**
@@ -352,17 +361,11 @@ export class MatrixCall extends EventEmitter {

    /**
     * Place a video call to this room.
-     * @param {Element} remoteVideoElement a <code>&lt;video&gt;</code> DOM element
-     * to render video to.
-     * @param {Element} localVideoElement a <code>&lt;video&gt;</code> DOM element
-     * to render the local camera preview.
     * @throws If you have not specified a listener for 'error' events.
     */
-    async placeVideoCall(remoteVideoElement: HTMLVideoElement, localVideoElement: HTMLVideoElement) {
+    async placeVideoCall() {
        logger.debug("placeVideoCall");
        this.checkForErrorListener();
-        this.localVideoElement = localVideoElement;
-        this.remoteVideoElement = remoteVideoElement;
        const constraints = getUserMediaContraints(ConstraintsType.Video);
        this.type = CallType.Video;
        await this.placeCallWithConstraints(constraints);
@@ -372,22 +375,11 @@ export class MatrixCall extends EventEmitter {
     * Place a screen-sharing call to this room. This includes audio.
     * <b>This method is EXPERIMENTAL and subject to change without warning. It
     * only works in Google Chrome and Firefox >= 44.</b>
-     * @param {Element} remoteVideoElement a <code>&lt;video&gt;</code> DOM element
-     * to render video to.
-     * @param {Element} localVideoElement a <code>&lt;video&gt;</code> DOM element
-     * to render the local camera preview.
     * @throws If you have not specified a listener for 'error' events.
     */
-    async placeScreenSharingCall(
-        remoteVideoElement: HTMLVideoElement,
-        localVideoElement: HTMLVideoElement,
-        selectDesktopCapturerSource?: () => Promise<DesktopCapturerSource>,
-    ) {
+    async placeScreenSharingCall(selectDesktopCapturerSource?: () => Promise<DesktopCapturerSource>) {
        logger.debug("placeScreenSharingCall");
        this.checkForErrorListener();
-        this.localVideoElement = localVideoElement;
-        this.remoteVideoElement = remoteVideoElement;
-
        try {
            const screenshareConstraints = await getScreenshareContraints(selectDesktopCapturerSource);
            if (!screenshareConstraints) {
@@ -433,85 +425,53 @@ export class MatrixCall extends EventEmitter {
    }

    /**
-     * Retrieve the local <code>&lt;video&gt;</code> DOM element.
-     * @return {Element} The dom element
+     * Returns an array of all CallFeeds
+     * @returns {Array<CallFeed>} CallFeeds
     */
-    public getLocalVideoElement(): HTMLVideoElement {
-        return this.localVideoElement;
+    public getFeeds(): Array<CallFeed> {
+        return this.feeds;
    }

    /**
-     * Retrieve the remote <code>&lt;video&gt;</code> DOM element
-     * used for playing back video capable streams.
-     * @return {Element} The dom element
+     * Returns an array of all local CallFeeds
+     * @returns {Array<CallFeed>} local CallFeeds
     */
-    public getRemoteVideoElement(): HTMLVideoElement {
-        return this.remoteVideoElement;
+    public getLocalFeeds(): Array<CallFeed> {
+        return this.feeds.filter((feed) => {return feed.isLocal()});
    }

    /**
-     * Retrieve the remote <code>&lt;audio&gt;</code> DOM element
-     * used for playing back audio only streams.
-     * @return {Element} The dom element
+     * Returns an array of all remote CallFeeds
+     * @returns {Array<CallFeed>} remote CallFeeds
     */
-    public getRemoteAudioElement(): HTMLAudioElement {
-        return this.remoteAudioElement;
+    public getRemoteFeeds(): Array<CallFeed> {
+        return this.feeds.filter((feed) => {return !feed.isLocal()});
    }

    /**
-     * Set the local <code>&lt;video&gt;</code> DOM element. If this call is active,
-     * video will be rendered to it immediately.
-     * @param {Element} element The <code>&lt;video&gt;</code> DOM element.
+     * Returns true if there are no incoming feeds,
+     * otherwise returns false
+     * @returns {boolean} no incoming feeds
     */
-    public async setLocalVideoElement(element: HTMLVideoElement) {
-        this.localVideoElement = element;
+    public noIncomingFeeds(): boolean {
+        return !this.feeds.some((feed) => !feed.isLocal());
+    }

-        if (element && this.localAVStream && this.type === CallType.Video) {
-            element.autoplay = true;
-
-            element.srcObject = this.localAVStream;
-            element.muted = true;
-            try {
-                await element.play();
-            } catch (e) {
-                logger.info("Failed to play local video element", e);
-            }
+    private pushNewFeed(stream: MediaStream, userId: string, purpose: SDPStreamMetadataPurpose) {
+        // Try to find a feed with the same stream id as the new stream,
+        // if we find it replace the old stream with the new one
+        const feed = this.feeds.find((feed) => feed.stream.id === stream.id);
+        if (feed) {
+            feed.setNewStream(stream);
+        } else {
+            this.feeds.push(new CallFeed(stream, userId, purpose, this.client, this.roomId));
+            this.emit(CallEvent.FeedsChanged, this.feeds);
        }
    }

-    /**
-     * Set the remote <code>&lt;video&gt;</code> DOM element. If this call is active,
-     * the first received video-capable stream will be rendered to it immediately.
-     * @param {Element} element The <code>&lt;video&gt;</code> DOM element.
-     */
-    public setRemoteVideoElement(element: HTMLVideoElement) {
-        if (element === this.remoteVideoElement) return;
-
-        element.autoplay = true;
-
-        // if we already have an audio element set, use that instead and mute the audio
-        // on this video element.
-        if (this.remoteAudioElement) element.muted = true;
-
-        this.remoteVideoElement = element;
-
-        if (this.remoteStream) {
-            this.playRemoteVideo();
-        }
-    }
-
-    /**
-     * Set the remote <code>&lt;audio&gt;</code> DOM element. If this call is active,
-     * the first received audio-only stream will be rendered to it immediately.
-     * The audio will *not* be rendered from the remoteVideoElement.
-     * @param {Element} element The <code>&lt;video&gt;</code> DOM element.
-     */
-    public async setRemoteAudioElement(element: HTMLAudioElement) {
-        if (element === this.remoteAudioElement) return;
-
-        this.remoteAudioElement = element;
-
-        if (this.remoteStream) this.playRemoteAudio();
+    private deleteAllFeeds() {
+        this.feeds = [];
+        this.emit(CallEvent.FeedsChanged, this.feeds);
    }

    // The typescript definitions have this type as 'any' :(
@@ -566,16 +526,18 @@ export class MatrixCall extends EventEmitter {
            return;
        }

+        const remoteStream = this.feeds.find((feed) => {return !feed.isLocal()})?.stream;
+
        // According to previous comments in this file, firefox at some point did not
        // add streams until media started ariving on them. Testing latest firefox
        // (81 at time of writing), this is no longer a problem, so let's do it the correct way.
-        if (!this.remoteStream || this.remoteStream.getTracks().length === 0) {
+        if (!remoteStream || remoteStream.getTracks().length === 0) {
            logger.error("No remote stream or no tracks after setting remote description!");
            this.terminate(CallParty.Local, CallErrorCode.SetRemoteDescription, false);
            return;
        }

-        this.type = this.remoteStream.getTracks().some(t => t.kind === 'video') ? CallType.Video : CallType.Voice;
+        this.type = remoteStream.getTracks().some(t => t.kind === 'video') ? CallType.Video : CallType.Voice;

        this.setState(CallState.Ringing);

@@ -660,9 +622,6 @@ export class MatrixCall extends EventEmitter {
            newCall.gotUserMediaForAnswer(this.localAVStream);
            delete(this.localAVStream);
        }
-        newCall.localVideoElement = this.localVideoElement;
-        newCall.remoteVideoElement = this.remoteVideoElement;
-        newCall.remoteAudioElement = this.remoteAudioElement;
        this.successor = newCall;
        this.emit(CallEvent.Replaced, newCall);
        this.hangup(CallErrorCode.Replaced, true);
@@ -774,10 +733,6 @@ export class MatrixCall extends EventEmitter {
        }
        this.updateMuteStatus();

-        if (!onHold) {
-            this.playRemoteAudio();
-        }
-
        this.emit(CallEvent.RemoteHoldUnhold, this.remoteOnHold);
    }

@@ -831,16 +786,6 @@ export class MatrixCall extends EventEmitter {

        const vidShouldBeMuted = this.vidMuted || this.remoteOnHold;
        setTracksEnabled(this.localAVStream.getVideoTracks(), !vidShouldBeMuted);
-
-        if (this.remoteOnHold) {
-            if (this.remoteAudioElement && this.remoteAudioElement.srcObject === this.remoteStream) {
-                this.remoteAudioElement.muted = true;
-            } else if (this.remoteVideoElement && this.remoteVideoElement.srcObject === this.remoteStream) {
-                this.remoteVideoElement.muted = true;
-            }
-        } else {
-            this.playRemoteAudio();
-        }
    }

    /**
@@ -863,24 +808,13 @@ export class MatrixCall extends EventEmitter {

        logger.debug("gotUserMediaForInvite -> " + this.type);

-        const videoEl = this.getLocalVideoElement();
-
-        if (videoEl && this.type === CallType.Video) {
-            videoEl.autoplay = true;
-            if (this.screenSharingStream) {
-                logger.debug(
-                    "Setting screen sharing stream to the local video element",
-                );
-                videoEl.srcObject = this.screenSharingStream;
-            } else {
-                videoEl.srcObject = stream;
-            }
-            videoEl.muted = true;
-            try {
-                await videoEl.play();
-            } catch (e) {
-                logger.info("Failed to play local video element", e);
-            }
+        if (this.screenSharingStream) {
+            logger.debug(
+                "Setting screen sharing stream to the local video element",
+            );
+            this.pushNewFeed(this.screenSharingStream, this.client.getUserId(), SDPStreamMetadataPurpose.Screenshare);
+        } else {
+            this.pushNewFeed(stream, this.client.getUserId(), SDPStreamMetadataPurpose.Usermedia);
        }

        // why do we enable audio (and only audio) tracks here? -- matthew
@@ -950,19 +884,7 @@ export class MatrixCall extends EventEmitter {
            return;
        }

-        const localVidEl = this.getLocalVideoElement();
-
-        if (localVidEl && this.type === CallType.Video) {
-            localVidEl.autoplay = true;
-            localVidEl.srcObject = stream;
-
-            localVidEl.muted = true;
-            try {
-                await localVidEl.play();
-            } catch (e) {
-                logger.info("Failed to play local video element", e);
-            }
-        }
+        this.pushNewFeed(stream, this.client.getUserId(), SDPStreamMetadataPurpose.Usermedia);

        this.localAVStream = stream;
        logger.info("Got local AV stream with id " + this.localAVStream.id);
@@ -1377,32 +1299,31 @@ export class MatrixCall extends EventEmitter {
            logger.warn(`Streamless ${ev.track.kind} found: ignoring.`);
            return;
        }
+
+        const oldRemoteStream = this.feeds.find((feed) => {return !feed.isLocal()})?.stream;
+
        // If we already have a stream, check this track is from the same one
-        if (this.remoteStream && ev.streams[0].id !== this.remoteStream.id) {
+        // Note that we check by ID and always set the remote stream: Chrome appears
+        // to make new stream objects when tranciever directionality is changed and the 'active'
+        // status of streams change - Dave
+        if (oldRemoteStream && ev.streams[0].id !== oldRemoteStream.id) {
            logger.warn(
-                `Ignoring new stream ID ${ev.streams[0].id}: we already have stream ID ${this.remoteStream.id}`,
+                `Ignoring new stream ID ${ev.streams[0].id}: we already have stream ID ${oldRemoteStream.id}`,
            );
            return;
        }

-        if (!this.remoteStream) {
+        if (!oldRemoteStream) {
            logger.info("Got remote stream with id " + ev.streams[0].id);
        }

-        // Note that we check by ID above and always set the remote stream: Chrome appears
-        // to make new stream objects when tranciever directionality is changed and the 'active'
-        // status of streams change
-        this.remoteStream = ev.streams[0];
+        const newRemoteStream = ev.streams[0];

        logger.debug(`Track id ${ev.track.id} of kind ${ev.track.kind} added`);

-        if (ev.track.kind === 'video') {
-            if (this.remoteVideoElement) {
-                this.playRemoteVideo();
-            }
-        } else {
-            if (this.remoteAudioElement) this.playRemoteAudio();
-        }
+        this.pushNewFeed(newRemoteStream, this.getOpponentMember().userId, SDPStreamMetadataPurpose.Usermedia)
+
+        logger.info("playing remote. stream active? " + newRemoteStream.active);
    };

    onNegotiationNeeded = async () => {
@@ -1425,52 +1346,6 @@ export class MatrixCall extends EventEmitter {
        }
    };

-    async playRemoteAudio() {
-        if (this.remoteVideoElement) this.remoteVideoElement.muted = true;
-        this.remoteAudioElement.muted = false;
-
-        this.remoteAudioElement.srcObject = this.remoteStream;
-
-        // if audioOutput is non-default:
-        try {
-            if (audioOutput) {
-                // This seems quite unreliable in Chrome, although I haven't yet managed to make a jsfiddle where
-                // it fails.
-                // It seems reliable if you set the sink ID after setting the srcObject and then set the sink ID
-                // back to the default after the call is over
-                logger.info("Setting audio sink to " + audioOutput + ", was " + this.remoteAudioElement.sinkId);
-                await this.remoteAudioElement.setSinkId(audioOutput);
-            }
-        } catch (e) {
-            logger.warn("Couldn't set requested audio output device: using default", e);
-        }
-
-        try {
-            await this.remoteAudioElement.play();
-        } catch (e) {
-            logger.error("Failed to play remote audio element", e);
-        }
-    }
-
-    private async playRemoteVideo() {
-        // A note on calling methods on media elements:
-        // We used to have queues per media element to serialise all calls on those elements.
-        // The reason given for this was that load() and play() were racing. However, we now
-        // never call load() explicitly so this seems unnecessary. However, serialising every
-        // operation was causing bugs where video would not resume because some play command
-        // had got stuck and all media operations were queued up behind it. If necessary, we
-        // should serialise the ones that need to be serialised but then be able to interrupt
-        // them with another load() which will cancel the pending one, but since we don't call
-        // load() explicitly, it shouldn't be a problem.
-        this.remoteVideoElement.srcObject = this.remoteStream;
-        logger.info("playing remote video. stream active? " + this.remoteStream.active);
-        try {
-            await this.remoteVideoElement.play();
-        } catch (e) {
-            logger.info("Failed to play remote video element", e);
-        }
-    }
-
    onHangupReceived = (msg) => {
        logger.debug("Hangup received for call ID " + this.callId);

@@ -1630,33 +1505,14 @@ export class MatrixCall extends EventEmitter {
            this.inviteTimeout = null;
        }

-        const remoteVid = this.getRemoteVideoElement();
-        const remoteAud = this.getRemoteAudioElement();
-        const localVid = this.getLocalVideoElement();
+        // Order is important here: first we stopAllMedia() and only then we can deleteAllFeeds()
+        // We don't stop media if the call was replaced as we want to re-use streams in the successor
+        if (hangupReason !== CallErrorCode.Replaced) this.stopAllMedia();
+        this.deleteAllFeeds();

-        if (remoteVid) {
-            remoteVid.pause();
-            remoteVid.srcObject = null;
-        }
-        if (remoteAud) {
-            remoteAud.pause();
-            remoteAud.srcObject = null;
-            try {
-                // As per comment in playRemoteAudio, setting the sink ID back to the default
-                // once the call is over makes setSinkId work reliably.
-                await this.remoteAudioElement.setSinkId('')
-            } catch (e) {
-                logger.warn("Failed to set sink ID back to default");
-            }
-        }
-        if (localVid) {
-            localVid.pause();
-            localVid.srcObject = null;
-        }
        this.hangupParty = hangupParty;
        this.hangupReason = hangupReason;
        this.setState(CallState.Ended);
-        this.stopAllMedia();
        if (this.peerConn && this.peerConn.signalingState !== 'closed') {
            this.peerConn.close();
        }
@@ -1667,19 +1523,9 @@ export class MatrixCall extends EventEmitter {

    private stopAllMedia() {
        logger.debug(`stopAllMedia (stream=${this.localAVStream})`);
-        if (this.localAVStream) {
-            for (const track of this.localAVStream.getTracks()) {
-                track.stop();
-            }
-        }
-        if (this.screenSharingStream) {
-            for (const track of this.screenSharingStream.getTracks()) {
-                track.stop();
-            }
-        }

-        if (this.remoteStream) {
-            for (const track of this.remoteStream.getTracks()) {
+        for (const feed of this.feeds) {
+            for (const track of feed.stream.getTracks()) {
                track.stop();
            }
        }
@@ -1910,16 +1756,8 @@ async function getScreenshareContraints(selectDesktopCapturerSource?: () => Prom
    }
 }

-let audioOutput: string;
 let audioInput: string;
 let videoInput: string;
-/**
- * Set an audio output device to use for MatrixCalls
- * @function
- * @param {string=} deviceId the identifier for the device
- * undefined treated as unset
- */
-export function setAudioOutput(deviceId: string) { audioOutput = deviceId; }
 /**
 * Set an audio input device to use for MatrixCalls
 * @function
@@ -1,6 +1,11 @@
 // allow camelcase as these are events type that go onto the wire
 /* eslint-disable camelcase */

+export enum SDPStreamMetadataPurpose {
+    Usermedia = "m.usermedia",
+    Screenshare = "m.screenshare",
+}
+
 interface CallOfferAnswer {
    type: string;
    sdp: string;
@@ -0,0 +1,84 @@
+/*
+Copyright 2021 Šimon Brandner <simon.bra.ag@gmail.com>
+
+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 EventEmitter from "events";
+import {SDPStreamMetadataPurpose} from "./callEventTypes";
+import MatrixClient from "../client"
+import {RoomMember} from "../models/room-member";
+
+export enum CallFeedEvent {
+    NewStream = "new_stream",
+}
+
+export class CallFeed extends EventEmitter {
+    constructor(
+        public stream: MediaStream,
+        public userId: string,
+        public purpose: SDPStreamMetadataPurpose,
+        private client: MatrixClient,
+        private roomId: string,
+    ) {
+        super()
+    }
+
+    /**
+     * Returns callRoom member
+     * @returns member of the callRoom
+     */
+    public getMember(): RoomMember {
+        const callRoom = this.client.getRoom(this.roomId);
+        return callRoom.getMember(this.userId);
+    }
+
+    /**
+     * Returns true if CallFeed is local, otherwise returns false
+     * @returns {boolean} is local?
+     */
+    public isLocal(): boolean {
+        return this.userId === this.client.getUserId();
+    }
+
+    // TODO: The two following methods should be later replaced
+    // by something that will also check if the remote is muted
+    /**
+     * Returns true if audio is muted or if there are no audio
+     * tracks, otherwise returns false
+     * @returns {boolean} is audio muted?
+     */
+    public isAudioMuted(): boolean {
+        return this.stream.getAudioTracks().length === 0;
+    }
+
+    /**
+     * Returns true video is muted or if there are no video
+     * tracks, otherwise returns false
+     * @returns {boolean} is video muted?
+     */
+    public isVideoMuted(): boolean {
+        // We assume only one video track
+        return this.stream.getVideoTracks().length === 0;
+    }
+
+    /**
+     * Replaces the current MediaStream with a new one.
+     * This method should be only used by MatrixCall.
+     * @param newStream new stream with which to replace the current one
+     */
+    public setNewStream(newStream: MediaStream) {
+        this.stream = newStream;
+        this.emit(CallFeedEvent.NewStream, this.stream);
+    }
+}
@@ -3522,9 +3522,9 @@ hmac-drbg@^1.0.1:
    minimalistic-crypto-utils "^1.0.1"

 hosted-git-info@^2.1.4:
-  version "2.8.8"
-  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.8.tgz#7539bd4bc1e0e0a895815a2e0262420b12858488"
-  integrity sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==
+  version "2.8.9"
+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9"
+  integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==

 html-encoding-sniffer@^2.0.1:
  version "2.0.1"
Author	SHA1	Message	Date
RiotRobot	88945a6d6d	v11.0.0	2021-05-17 13:30:08 +01:00
RiotRobot	7203c5aaf0	Prepare changelog for v11.0.0	2021-05-17 13:30:07 +01:00
J. Ryan Stinnett	c305058c46	Merge pull request #1695 from matrix-org/jryans/glare-streams-release [Release] Fix regressed glare	2021-05-17 11:55:25 +01:00
Šimon Brandner	91bbf7d1a8	Fix glare Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-05-17 11:20:14 +01:00
RiotRobot	684511ff06	v11.0.0-rc.1	2021-05-11 15:03:04 +01:00
RiotRobot	88b328df7e	Prepare changelog for v11.0.0-rc.1	2021-05-11 15:03:03 +01:00
Michael Telatynski	e3583dd04e	Merge pull request #1679 from matrix-org/t3chguy/spaces-stable Switch from MSC1772 unstable prefixes to stable	2021-05-11 13:39:47 +01:00
J. Ryan Stinnett	2d73805ca3	Merge pull request #1680 from SimonBrandner/feed-example Update the VoIP example to work with the new changes	2021-05-10 14:50:18 +01:00
J. Ryan Stinnett	eedfa550a6	Merge pull request #1687 from matrix-org/dependabot/npm_and_yarn/hosted-git-info-2.8.9 Bump hosted-git-info from 2.8.8 to 2.8.9	2021-05-10 14:48:34 +01:00
dependabot[bot]	4ca718adc4	Bump hosted-git-info from 2.8.8 to 2.8.9 Bumps [hosted-git-info](https://github.com/npm/hosted-git-info) from 2.8.8 to 2.8.9. - [Release notes](https://github.com/npm/hosted-git-info/releases) - [Changelog](https://github.com/npm/hosted-git-info/blob/v2.8.9/CHANGELOG.md) - [Commits](https://github.com/npm/hosted-git-info/compare/v2.8.8...v2.8.9) Signed-off-by: dependabot[bot] <support@github.com>	2021-05-10 13:46:58 +00:00
RiotRobot	7c4ced8f46	Resetting package fields for development	2021-05-10 14:46:14 +01:00
RiotRobot	7018f4ab25	Merge branch 'master' into develop	2021-05-10 14:46:13 +01:00
Šimon Brandner	a449c5f8c2	Merge branch 'develop' into feed-example	2021-05-06 16:44:29 +02:00
J. Ryan Stinnett	57d1fa8410	Merge pull request #1660 from SimonBrandner/feed Support for multiple streams (not MSC3077)	2021-05-06 11:19:52 +01:00
Michael Telatynski	838e38d84c	Merge pull request #1683 from matrix-org/t3chguy/spaces-logs Tweak missing m.room.create errors to describe their source	2021-05-06 00:06:38 +01:00
Michael Telatynski	fc29056530	Tweak missing m.room.create errors to describe their source	2021-05-05 23:58:40 +01:00
Šimon Brandner	3b7d6f8334	This check doesn't seem to be necessary Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-04-30 14:43:00 +02:00
Šimon Brandner	4b3c8b2969	Update the example to work with the new feed code Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-04-30 14:18:20 +02:00
Šimon Brandner	ad80d69369	Add some basic styling Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-04-30 14:17:30 +02:00
Michael Telatynski	e2d2249686	Switch from MSC1772 unstable prefixes to stable	2021-04-30 11:33:45 +01:00
Šimon Brandner	41c2772cff	Merge branch 'develop' into feed Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-04-28 10:57:59 +02:00
Šimon Brandner	e11c523a75	Add getLocalFeeds() and getRemoteFeeds() Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-04-27 10:06:21 +02:00
Šimon Brandner	88b310c394	Rename stuff to make it easy to read Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-04-26 16:00:17 +02:00
Šimon Brandner	973de2db55	stopAllMedia() before deleteAllFeeds() Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-04-24 12:56:28 +02:00
Šimon Brandner	1fe92f10c1	Delint Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-04-24 12:26:54 +02:00
Šimon Brandner	0e2e906b24	Remove remoteStream prop This is done in order to be more generic Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-04-24 12:24:15 +02:00
Šimon Brandner	4667f8be03	Use feeds in stopAllMedia() Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-04-24 12:08:45 +02:00
Šimon Brandner	72a0931663	Remove comment: // Fix when client is TSified Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-04-16 11:38:01 +02:00
Šimon Brandner	67584b9cc3	Merge branch 'feed' of https://github.com/SimonBrandner/matrix-js-sdk into feed	2021-04-16 11:10:22 +02:00
Šimon Brandner	1bfaa28f9c	Fix missing types Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-04-16 11:09:28 +02:00
Šimon Brandner	07f49bcc37	Merge branch 'develop' into feed	2021-04-13 12:33:23 +02:00
Šimon Brandner	193de8d3a9	Merge branch 'feed' of https://github.com/SimonBrandner/matrix-js-sdk into feed	2021-04-08 11:15:07 +02:00
Šimon Brandner	1f2b3512c1	Move SDPStreamMetadataPurpose into callEventTypes.ts Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-04-08 11:14:42 +02:00
Šimon Brandner	ddc5bd3b36	Add prefixes to SDPStreamMetadataPurpose Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-04-08 11:07:53 +02:00
Šimon Brandner	ee828d454a	Rename CallFeedPurpose to SDPStreamMetadataPurpose This is to match MSC3077 Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-04-08 11:07:22 +02:00
Šimon Brandner	2916a73f4c	Make selectDesktopCapturerSource optional	2021-04-08 11:01:17 +02:00
Šimon Brandner	ae69af7e70	Merge branch 'develop' into feed	2021-04-07 19:14:17 +02:00
Šimon Brandner	7f4397f8ca	Use getAudioTracks() and getVideoTracks() This is much nicer. Before I hadn't realized this was possible Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-04-05 10:31:27 +02:00
Šimon Brandner	32830b93f1	Rename audioOnly to videoMuted This makes more sense and will match a possible mute events MSC Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-04-04 08:50:27 +02:00
Šimon Brandner	cdc0d5623b	Rename to match MSC3077 Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-04-04 08:37:09 +02:00
Šimon Brandner	e78b415832	Add getMember() to CallFeed Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-04-04 08:33:51 +02:00
Šimon Brandner	ff1379fd29	Merge branch 'develop' into feed	2021-04-03 08:35:05 +02:00
Šimon Brandner	d8134aa168	Merge branch 'feed' into feed-audio	2021-03-17 16:16:33 +01:00
Šimon Brandner	702b3e8473	Merge branch 'develop' into feed Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-03-17 16:16:07 +01:00
Šimon Brandner	b307a177f4	Remove handling of audio from MatrixCall Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-03-10 12:24:48 +01:00
Šimon Brandner	059430bd0a	Doc public methods Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-03-10 12:21:15 +01:00
Šimon Brandner	530b60cbc2	Make MatrixCall use CallFeed Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-03-10 12:21:07 +01:00
Šimon Brandner	ba8577f268	Add CallFeed class Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-03-10 08:43:01 +01:00