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

Support for screen-sharing using multi-stream VoIP (MSC3077) #1685

Merged
merged 72 commits into from
Jul 27, 2021
Merged

Support for screen-sharing using multi-stream VoIP (MSC3077) #1685

merged 72 commits into from
Jul 27, 2021

Conversation

SimonBrandner
Copy link
Contributor

@SimonBrandner SimonBrandner commented May 6, 2021 •
edited
Loading

Requires #5992
Support for MSC3077

  • Adds support for MSC3077 - types and sending/receiving/using sdp_stream_metadata
  • Removes placeScreensharingCall() - it isn't very useful, could lead to problems and it always combines user-media and screen-sharing, even if it is not necessary
  • Adds setScreensharingEnabled(enabled: boolean) - this methods adds/removes screen-sharing stream as needed during the call. It also falls beck to replaceTrack() if necessary

A note about tests: I don't have much experience writing tests but hopefully they're ok 😅

@SimonBrandner
Add types for MSC3077
a4e853e 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
@SimonBrandner
Send SDPStreamMetadata
631faa2 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
@SimonBrandner
Get sdpStreamMetadata from invite
6a920fe 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
@SimonBrandner
Use somicolons instead
4d4a6ed 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
@SimonBrandner
Add a separate method to push local feed
23f5c2e 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
@SimonBrandner
Set remoteSDPStreamMetadata from answer
cebdc44 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
@SimonBrandner
Send SDPStreamMetadata in answer
25eb6de 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
@SimonBrandner
Rework pushing of remote feeds for MSC3077
30f2263 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
@SimonBrandner
Move adding tracks into pushLocalFeed()
50e0f63 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
@SimonBrandner
Set remoteSDPStreamMetadata in onNegotiateReceived()
640d13a 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
@SimonBrandner
Add methods useful for screensharing
b1ace49 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
@SimonBrandner
Send SDPStreamMetadata in negotiation response
4d74b5c 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
@SimonBrandner SimonBrandner mentioned this pull request May 7, 2021
Merged
@SimonBrandner
Add methods to delete feeds
8c8a68d 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
@SimonBrandner
Hook up methods to delete feeds
0e6b43a 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
@SimonBrandner SimonBrandner mentioned this pull request May 7, 2021
Merged
@SimonBrandner
Add a method to start screensharing
a35559b 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
@SimonBrandner
Merge feed delete methods and add sender arrays
972aef7 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
@SimonBrandner
Add getScreensharingStream()
377ca0c 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
@SimonBrandner
Use getScreensharingStream() in setScreensharingEnabled()
e9b802d 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
@SimonBrandner
Use getScreensharingStream()
cbc7481 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
@SimonBrandner
Merge screenshare track into usermedia stream
d250e73 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
@SimonBrandner
Add setScreensharingEnabledWithoutMetadataSupport as a fallback()
82c530d 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
@SimonBrandner
Add ()!!!
fc68bb3 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
@SimonBrandner
Remove log line
df28d87 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
@SimonBrandner
Add addToPeerConnection param
fa3b246 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
@SimonBrandner
Make shift-click work again
d0707e1 
This is VERY ugly but it works

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
@SimonBrandner
Warn level
7b333a3 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
@SimonBrandner
Use opponentSupportsSDPStreamMetadata()
1858062 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
@SimonBrandner
Use for loop
c676449 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
@t3chguy t3chguy requested a review from a team May 21, 2021 19:34
@SimonBrandner
Merge branch 'develop' into fix/12652/screen-share
4aa2c03
@SimonBrandner
Disable RTX only for screen-sharing transceivers
43198b0 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
@SimonBrandner
Simplifie code - don't be an idiot
7532122 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
@SimonBrandner
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen…
f461905 
…-share

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
@SimonBrandner
Add missing space
0a04897 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
@SimonBrandner
Delint
5724462 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
@SimonBrandner SimonBrandner requested a review from dbkr May 28, 2021 15:49
@SimonBrandner
Merge branch 'develop' into fix/12652/screen-share
d8fd121 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
dbkr
dbkr approved these changes Jun 3, 2021
View reviewed changes
Copy link
Member

@dbkr dbkr left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm - let's wait for design review on the react-sdk side I guess. This will be another major version bump.

@SimonBrandner
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen…
090c2c0 
…-share
@SimonBrandner
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen…
ef7595b 
…-share

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
@SimonBrandner
Styling
0e05f9f 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
@SimonBrandner
More styling :(
c1625e5 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
@SimonBrandner
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen…
ca37ae6 
…-share

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
@SimonBrandner
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen…
641c852 
…-share
@SimonBrandner
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen…
0318c65 
…-share
@SimonBrandner
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen…
1607ad2 
…-share
@SimonBrandner
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen…
019e93e 
…-share
@SimonBrandner
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen…
bee840c 
…-share
@SimonBrandner
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen…
80d7c88 
…-share
@SimonBrandner
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen…
ceafb1c 
…-share
@SimonBrandner
Always return true for voice calls
fcbbcc0 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
@SimonBrandner SimonBrandner mentioned this pull request Jul 24, 2021
Open
@dbkr dbkr merged commit a69d9a9 into matrix-org:develop Jul 27, 2021
@SimonBrandner SimonBrandner deleted the fix/12652/screen-share branch July 27, 2021 14:37
@menturion menturion mentioned this pull request Sep 9, 2021
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dbkr dbkr dbkr approved these changes

Assignees
No one assigned
Labels
T-Enhancement
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@SimonBrandner @dbkr