Deprecated 'getUserMedia' fixed. webrtc-adapter from 2.0.4 to 3.2.0

README.md

@@ -17,20 +17,13 @@ First of all, you will need these packages:
 
 ```sudo apt-get update```
 
-**node**
+| Dependecy     | Command                                |
-```sudo apt-get install nodejs```
+| ------------- | -------------------------------------- |
-
+| node          | ```sudo apt-get install -g nodejs```   |
-**npm**
+| npm           | ```sudo apt-get install -g npm```      |
-```sudo apt-get install npm```
+| maven         | ```sudo apt-get install -g maven```    |
-
+| angular-cli   | ```sudo npm install -g @angular/cli``` |
-**maven**
+| typescript    | ```sudo npm install -g typescript```   |
-```sudo apt-get install maven```
-
-**angular-cli**
-```sudo npm install -g @angular/cli```
-
-**typescript**
-```sudo npm install -g typescript```
 
 
 OpenVidu structure
@@ -40,12 +33,13 @@ OpenVidu is composed by several modules which require some interconnections in o
 
 Here's a simple summary about the structure of OpenVidu:
 
-![OpenVidu structure](https://drive.google.com/uc?export=view&id=0B61cQ4sbhmWScEVBaG00N3l4N00)
+<center>![OpenVidu structure](https://drive.google.com/uc?export=view&id=0B61cQ4sbhmWSQ1AwaXlnRTR4djA)</center>
 
 
- - **Kurento Media Server**: External module which provides the low-level functionalities related to the media transmission. 
+- **Kurento Media Server**: External module which provides the low-level functionalities related to the media transmission. 
 How to *install* and *run* KMS in your development machine:
 
+Ubuntu 14.04 LTS Trusty (64 bits)
 ```
 echo "deb http://ubuntu.kurento.org trusty kms6" | sudo tee /etc/apt/sources.list.d/kurento.list
 wget -O - http://ubuntu.kurento.org/kurento.gpg.key | sudo apt-key add -
@@ -53,16 +47,26 @@ sudo apt-get update
 sudo apt-get install kurento-media-server-6.0
 ```
 
+Ubuntu 16.04 LTS Xenial (64 bits)
+```
+echo "deb http://ubuntu.kurento.org xenial kms6" | sudo tee /etc/apt/sources.list.d/kurento.list
+wget -O - http://ubuntu.kurento.org/kurento.gpg.key | sudo apt-key add -
+sudo apt-get update
+sudo apt-get install kurento-media-server-6.0
+```
+
+Start and stop the service
 ```
 sudo service kurento-media-server-6.0 start
 sudo service kurento-media-server-6.0 stop
 ```
 
-[Here](http://doc-kurento.readthedocs.io/en/stable/installation_guide.html) you can check the Kurento's official documentation.
+[Here](http://doc-kurento.readthedocs.io/en/stable/installation_guide.html) you can check Kurento's official documentation.
 
- - [**openvidu-browser**](https://github.com/pabloFuente/openvidu/tree/master/openvidu-browser): Javascript library used to connect the application with openvidu-server
+- [**openvidu-browser**](https://github.com/pabloFuente/openvidu/tree/master/openvidu-browser): Javascript library used to connect the application with openvidu-server
- - [**openvidu-server**](https://github.com/pabloFuente/openvidu/tree/master/openvidu-server): Java API which provides the connection with Kurento Media Server
+- [**kurento-utils-js**](https://github.com/pabloFuente/openvidu/tree/master/kurento-utils-js): Javascript set of reusable components that have been found useful during the development of WebRTC applications with Kurento
- - **app**: The application that makes use of OpenVidu. In this repo, [**openvidu-ng-testapp**](https://github.com/pabloFuente/openvidu/tree/master/openvidu-ng-testapp).
+- [**openvidu-server**](https://github.com/pabloFuente/openvidu/tree/master/openvidu-server): Java API which provides the connection with Kurento Media Server
+- **app**: The application that makes use of OpenVidu. In this repo, [**openvidu-ng-testapp**](https://github.com/pabloFuente/openvidu/tree/master/openvidu-ng-testapp).
 
 
 Setup for development
@@ -72,16 +76,15 @@ After installing Kurento Media Server and forking or downloading the repo, these
 ```
 sudo service kurento-media-server-6.0 start
 ```
-
 **/openvidu/openvidu-browser/src/main/resources**
 ```
 npm install
-npm link
+sudo npm link
 ```
 **/openvidu/openvidu-ng-testapp**
 ```
 npm install
-npm link openvidu-browser
+sudo npm link openvidu-browser
 ng serve
 ```
 **/openvidu**

openvidu-browser/README.md

@@ -7,13 +7,16 @@
 
 Copyright © 2013-2016 [Kurento]. Licensed under [Apache 2.0 License].
 
-kurento-room-client-js
+openvidu-browser
 ======================
 
-Kurento Room Client JS is a Javascript library that can be used to implement
+openvidu-browser is a Javascript library that can be used to implement the client-side of group communications applications based on WebRTC.
-the client-side of group communications applications based on WebRTC.
 It uses WebSockets and JSON-RPC to interact with the server-side of the Room API.
 
+Typescript is currently used to develop openvidu-browser. The class diagram is shown below:
+
+<center>![OpenVidu structure](https://drive.google.com/uc?export=view&id=0B61cQ4sbhmWSM1N3SmE5amt3TzA)</center>
+
 What is Kurento
 ---------------
 

openvidu-browser/src/main/resources/package.json

@@ -16,7 +16,7 @@
 		"kurento-jsonrpc": "5.1.3",
 		"wolfy87-eventemitter": "4.2.9",
 		"@types/wolfy87-eventemitter": "4.2.31",
-		"webrtc-adapter":"2.0.4",
+		"webrtc-adapter":"3.2.0",
 		"kurento-utils":"6.6.0",
 		"uuid": "~2.0.1",
 		"sdp-translator": "^0.1.15"

openvidu-browser/src/main/resources/ts/OpenVidu.ts

@@ -30,7 +30,7 @@ export class OpenVidu {
     
     constructor( private wsUri: string ) {
         if(this.wsUri.charAt(wsUri.length-1) != '/'){
-            this.wsUri = '/';
+            this.wsUri += '/';
         }
         this.wsUri += 'room';
         
@@ -262,4 +262,23 @@ export class OpenVidu {
 
 
 
+
+    toggleLocalVideoTrack(activate: boolean){
+        this.getCamera().getWebRtcPeer().videoEnabled = activate;
+    }
+
+    toggleLocalAudioTrack(activate: boolean){
+        this.getCamera().getWebRtcPeer().audioEnabled = activate;
+    }
+
+    publishLocalVideoAudio() {
+        this.toggleLocalVideoTrack(true);
+        this.toggleLocalAudioTrack(true);  
+    }
+    
+    unpublishLocalVideoAudio() {
+        this.toggleLocalVideoTrack(false);
+        this.toggleLocalAudioTrack(false);
+    }
+
 }

openvidu-browser/src/main/resources/ts/Stream.ts

@@ -268,15 +268,26 @@ export class Stream {
             }
         };
 
-        navigator.getUserMedia( constraints, userStream => {
+         navigator.mediaDevices.getUserMedia({
+            audio: true,
+            video: {
+                width: {
+                    ideal: 1280
+                },
+                frameRate: {
+                    ideal: 15
+                }
+            }
+        })
+        .then(userStream => {
             userStream.getAudioTracks()[0].enabled = this.sendAudio;
             userStream.getVideoTracks()[0].enabled = this.sendVideo;
 
             this.wrStream = userStream;
-            callback(undefined, this);
+            callback(undefined, this);})
-        },  error => {
+        .catch(function(e) {
-            console.error( "Access denied", error );
+            console.error( "Access denied", e );
-            callback(error, undefined);
+            callback(e, undefined);
         });
     }
 

openvidu-demo/.project

@@ -16,12 +16,12 @@
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<name>org.springframework.ide.eclipse.core.springbuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.springframework.ide.eclipse.core.springbuilder</name>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>

openvidu-ng-testapp/src/app/app.component.ts

@@ -92,10 +92,12 @@ export class AppComponent {
 
           session.addEventListener("stream-added", streamEvent => {
             this.addVideoTag(streamEvent.stream);
+            console.log("Stream " + streamEvent.stream + " added");
           });
 
           session.addEventListener("stream-removed", streamEvent => {
             this.removeVideoTag(streamEvent.stream);
+            console.log("Stream " + streamEvent.stream + " removed");
           });
 
         });
@@ -111,33 +113,15 @@ export class AppComponent {
   }
 
   updateToggleVideo(event) {
-    this.toggleVideoTrack(event.target.checked);
+    this.openVidu.toggleLocalVideoTrack(event.target.checked);
     let msg = (event.target.checked) ? 'Publishing video...' : 'Unpublishing video...'
     console.log(msg);
   }
 
   updateToggleAudio(event) {
-    this.toggleAudioTrack(event.target.checked);
+    this.openVidu.toggleLocalAudioTrack(event.target.checked);
     let msg = (event.target.checked) ? 'Publishing audio...' : 'Unpublishing audio...'
     console.log(msg);
   }
 
-  toggleVideoTrack(activate: boolean) {
-    this.openVidu.getCamera().getWebRtcPeer().videoEnabled = activate;
-  }
-
-  toggleAudioTrack(activate: boolean) {
-    this.openVidu.getCamera().getWebRtcPeer().audioEnabled = activate;
-  }
-
-  publishVideoAudio() {
-    this.toggleVideoTrack(true);
-    this.toggleAudioTrack(true);
-  }
-
-  unpublishVideoAudio() {
-    this.toggleVideoTrack(false);
-    this.toggleAudioTrack(false);
-  }
-
 }

openvidu-test/.project

@@ -6,12 +6,12 @@
 	</projects>
 	<buildSpec>
 		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
+			<name>org.eclipse.wst.common.project.facet.core.builder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
@@ -20,10 +20,16 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.springframework.ide.eclipse.core.springnature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
 	</natures>
 </projectDescription>