webrtc config electron by t3chguy · Pull Request #850 · matrix-org/matrix-react-sdk

t3chguy · 2017-04-28T17:23:02Z

needs testing with webcam

allows configurabilty of input devices used for webrtc calls
depends on matrix-org/matrix-js-sdk#427

init on LoggedInView mounting configurable via UserSettings new class: CallMediaHandler Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

matrixbot · 2017-04-28T17:23:07Z

Can one of the admins verify this patch?

ara4n · 2017-04-29T01:31:52Z

src/CallMediaHandler.js

+*/
+
+import UserSettingsStore from './UserSettingsStore';
+import * as Matrix from 'matrix-js-sdk';


this feels a bit weird - shouldn't this be operating on a MatrixClient rather than importing the whole js-sdk as Matrix?

@ara4n it's in the same class as createNewMatrixCall is in, which looking at VectorConferenceHandler is used in the same manner. Just following the patterns I see. The other way to do it would be to pass the devices when initiating/answering a call, would you prefer this?

hm, ok. i guess this is ok

ara4n · 2017-04-29T01:32:17Z

src/components/structures/LoggedInView.js


+        // Only run these in electron, at least until a better mechanism for perms exists
+        // https://w3c.github.io/permissions/#dom-permissionname-device-info
+        if (window && window.process && window.process.type) CallMediaHandler.loadDevices();


ah, so the picker only works when in electron?

PR is to fix element-hq/element-web#2822 primarily so that's what its designed for, I did no testing in a browser but should work given microphone+camera permissions at browser level

ara4n · 2017-04-29T01:34:22Z

this generally looks good to me, other than questions, although it's a bit of a shame it only works for electron. (plus i need to test it; i can do so against an external UVC webcam).

any idea what's needed on the permissions front to make it work on the browser?

t3chguy · 2017-04-29T03:37:09Z

we could run it on the browser but if the device-info permission is missing then all the devices have an empty label which makes it pointless having it as its impossible to know which device is which.
the W3C spec seems to be including a device-info prop within the Permissions API so once that hits we could base it on that but it didn't work in Electron && Chrome when I tested it

I guess I could remove that check and instead see whether the returned labels != ''

ara4n · 2017-05-15T01:05:52Z

yeah, i think this would be very useful (and easier to test, critically) for non-electron too. I suggest doing the returned labels != '' check, and then i can test & merge.

… webrtc_settings

loadDevices not only in electron Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

t3chguy · 2017-05-25T00:35:46Z

NEEDS TESTING

/me has no webcam </3

ara4n · 2017-06-01T21:01:35Z

src/components/structures/UserSettings.js

+        let webcamDropdown = <p>No Webcams detected</p>;
+
+        const audioInputs = this.state.mediaDevices.audioinput;
+        if ('default' in audioInputs) {


needs if (Object.keys(audioInputs).length > 0) {

ara4n · 2017-06-01T21:01:47Z

src/components/structures/UserSettings.js

+        }
+
+        const videoInputs = this.state.mediaDevices.videoinput;
+        if ('default' in videoInputs) {


needs if (Object.keys(videoInputs).length > 0) {

ara4n · 2017-06-01T21:01:58Z

src/components/structures/UserSettings.js

+        }
+
+        return <div>
+            <h3>WebRTC</h3>


Let's call it VoIP, and i18n please

ara4n · 2017-06-01T21:02:23Z

src/components/structures/UserSettings.js

+    _renderWebRtcSettings: function() {
+        if (this.state.mediaDevices === false) {
+            return <div>
+                <h3>WebRTC</h3>


let's call it VoIP. needs i18n

ara4n · 2017-06-01T21:03:05Z

@t3chguy if you can i18nize, fix the merge conflict & and fix 'defaults' bug then i'll merge this immediately. thanks

… webrtc_settings and i18nize webrtc stufffs Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> # Conflicts: # src/components/structures/UserSettings.js

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

t3chguy · 2017-06-01T22:03:05Z

src/components/structures/UserSettings.js

+            this.setState({
+                mediaDevices,
+                activeAudioInput: this._localSettings['webrtc_audioinput'] || 'default',
+                activeVideoInput: this._localSettings['webrtc_videoinput'] || 'default',


do these need changing also?

so that we can set falsey values, for unsetting device most dolphinately needs testing Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

ara4n · 2017-06-01T23:48:23Z

lgtm after epic :)

t3chguy · 2017-06-01T23:58:06Z

I HATE WEBRTC

webrtc config electron

c6262d6

init on LoggedInView mounting configurable via UserSettings new class: CallMediaHandler Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

ara4n reviewed Apr 29, 2017

View reviewed changes

ara4n assigned t3chguy Apr 29, 2017

t3chguy assigned ara4n and t3chguy and unassigned t3chguy May 5, 2017

t3chguy added 2 commits May 5, 2017 20:56

Merge branch 'develop' into webrtc_settings

110ca22

unscrew merge

b944fff

ara4n assigned t3chguy and unassigned ara4n May 15, 2017

t3chguy added 3 commits May 25, 2017 00:26

Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into…

a4b2bac

… webrtc_settings

attempt to make media selector work everywhere (TM)

09d0ab7

loadDevices not only in electron Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

touchups

8158ec6

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

t3chguy assigned ara4n and unassigned t3chguy May 25, 2017

t3chguy mentioned this pull request May 25, 2017

styling for webrtc settings element-hq/element-web#4019

Merged

ara4n added the X-Release-Blocker This affects the current release cycle and must be solved for a release to happen label May 30, 2017

ara4n suggested changes Jun 1, 2017

View reviewed changes

ara4n assigned t3chguy and unassigned ara4n Jun 1, 2017

t3chguy added 2 commits June 1, 2017 22:56

Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into…

04b86e5

… webrtc_settings and i18nize webrtc stufffs Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> # Conflicts: # src/components/structures/UserSettings.js

i18nize all the things and change show logic

dbba1de

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

t3chguy added 2 commits June 1, 2017 22:59

fix bad indentation

0c36778

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

fix **AMAZING** C&P derp

aa90d6b

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

t3chguy commented Jun 1, 2017

View reviewed changes

t3chguy added 11 commits June 1, 2017 23:26

change device data structure to array of objects

dd4480f

so that we can set falsey values, for unsetting device most dolphinately needs testing Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

only unshift default if there is no deviceId===default

4e36c10

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

lets actually make things work, eh?

0f2c89d

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

copy the arrays so we're not making a mess

beedeec

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

this is just endless

3eb519b

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

special case default - CallMediaHandler can figure it out

46a9326

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

missed a thing

4976cbb

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

Revert voodoo

0bafd64

i18 missed things

6b4daf0

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

try empty string as falsey key

f4db83a

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

undefined =/= ''

b1973d7

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

ara4n merged commit ec43390 into matrix-org:develop Jun 1, 2017

real-or-random mentioned this pull request Mar 8, 2019

Option to select camera stanfieldr/ghetto-skype#157

Closed

aaronraimist mentioned this pull request Nov 26, 2019

Add a button to mark all rooms as read #3676

Closed

Uh oh!

Conversation

t3chguy commented Apr 28, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

matrixbot commented Apr 28, 2017

Uh oh!

Choose a reason for hiding this comment

Uh oh!

t3chguy Apr 29, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

t3chguy Apr 29, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

ara4n commented Apr 29, 2017

Uh oh!

t3chguy commented Apr 29, 2017

Uh oh!

ara4n commented May 15, 2017

Uh oh!

t3chguy commented May 25, 2017

NEEDS TESTING

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

ara4n commented Jun 1, 2017

Uh oh!

Choose a reason for hiding this comment

Uh oh!

ara4n commented Jun 1, 2017

Uh oh!

t3chguy commented Jun 1, 2017

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

t3chguy commented Apr 28, 2017 •

edited

Loading

t3chguy Apr 29, 2017 •

edited

Loading

t3chguy Apr 29, 2017 •

edited

Loading