diff --git a/README.md b/README.md index 82f4cdb9..b34f325b 100644 --- a/README.md +++ b/README.md @@ -90,8 +90,15 @@ mvn install -DskipTests=true ``` **/openvidu/openvidu-server** ``` -mvn compile exec:java -Dexec.mainClass="org.openvidu.server.OpenViduServer" +mvn compile exec:java ``` + +*(or if you prefer you can just run the Java application in your favourite IDE)* + + +---------- + + At these point, you can start modifying *openvidu-ng-testapp*, *openvidu-browser* or *openvidu-server*. - *openvidu-ng-testapp*: the previous "ng serve" command will take care of refreshing the browser's page whenever any change takes place. @@ -105,7 +112,6 @@ At these point, you can start modifying *openvidu-ng-testapp*, *openvidu-browser **/openvidu/openvidu-server** ``` - mvn compile exec:java -Dexec.mainClass="org.openvidu.server.OpenViduServer" + mvn compile exec:java ``` - - +*(or re-launch the Java application in your IDE)* diff --git a/openvidu-browser/src/main/resources/ts/Participant.ts b/openvidu-browser/src/main/resources/ts/Participant.ts index 29957e93..7c849510 100644 --- a/openvidu-browser/src/main/resources/ts/Participant.ts +++ b/openvidu-browser/src/main/resources/ts/Participant.ts @@ -33,7 +33,8 @@ export class Participant { recvAudio: ( streamOptions.recvAudio == undefined ? true : streamOptions.recvAudio ), audio: streamOptions.audio, video: streamOptions.video, - data: streamOptions.data + data: streamOptions.data, + mediaConstraints: streamOptions.mediaConstraints } let stream = new Stream( openVidu, false, room, streamOpts ); diff --git a/openvidu-browser/src/main/resources/ts/Stream.ts b/openvidu-browser/src/main/resources/ts/Stream.ts index 53429b2d..a8995745 100644 --- a/openvidu-browser/src/main/resources/ts/Stream.ts +++ b/openvidu-browser/src/main/resources/ts/Stream.ts @@ -35,6 +35,7 @@ export interface StreamOptions { video: boolean; audio: boolean; data: boolean; + mediaConstraints: any; } export interface VideoOptions { @@ -55,6 +56,9 @@ export class Stream { private speechEvent: any; private recvVideo: any; private recvAudio: any; + private sendVideo: boolean; + private sendAudio: boolean; + private mediaConstraints: any; private showMyRemote = false; private localMirrored = false; private chanId = 0; @@ -73,6 +77,9 @@ export class Stream { this.recvVideo = options.recvVideo; this.recvAudio = options.recvAudio; this.dataChannel = options.data || false; + this.sendVideo = options.video; + this.sendAudio = options.audio; + this.mediaConstraints = options.mediaConstraints; } getRecvVideo() { @@ -262,6 +269,9 @@ export class Stream { }; navigator.getUserMedia( constraints, userStream => { + userStream.getAudioTracks()[0].enabled = this.sendAudio; + userStream.getVideoTracks()[0].enabled = this.sendVideo; + this.wrStream = userStream; callback(undefined, this); }, error => { @@ -316,9 +326,15 @@ export class Stream { private initWebRtcPeer( sdpOfferCallback ) { if ( this.local ) { + + let userMediaConstraints = { + audio : this.sendAudio, + video : this.sendVideo + } let options: any = { videoStream: this.wrStream, + mediaConstraints: userMediaConstraints, onicecandidate: this.participant.sendIceCandidate.bind( this.participant ), } diff --git a/openvidu-ng-testapp/src/app/app.component.html b/openvidu-ng-testapp/src/app/app.component.html index b607fe69..e45f6506 100644 --- a/openvidu-ng-testapp/src/app/app.component.html +++ b/openvidu-ng-testapp/src/app/app.component.html @@ -9,6 +9,12 @@
++ Send video +
++ Send audio +
@@ -18,6 +24,10 @@