webrtc-streamer 0.8.3 → 0.8.4-2-g68e8d8e

package/html/admin.html

@@ -75,7 +75,7 @@
 			let streamid = "";
 			let frameHeight = 0;
 			let frameWidth = 0;
-			if (peerConnection && peerConnection.hasOwnProperty("streams")){
+			if (peerConnection && peerConnection.hasOwnProperty("streams") && peerConnection.streams){
 				streamid = Object.keys(peerConnection.streams)[0];
 
 				var stream = Object.values(peerConnection.streams)[0];

package/html/styles.css

@@ -30,6 +30,11 @@ div {
     text-align: center; 
 }
 
+#video {
+    width: auto;
+    height: 100%;    
+}
+
 video {
     margin: auto;
     left: 0;

package/html/webrtcstreamer.html

@@ -6,8 +6,9 @@
 <script src="webrtcstreamer.js" ></script>
 <script>        
 	if (location.search.slice(1)) {
-		var url = { video:location.search.slice(1) };  
-		var options = webrtcConfig.options;
+		let url = { video:location.search.slice(1) };  
+		let options = webrtcConfig.options;
+		let codec = webrtcConfig.codec;
 		if (typeof URLSearchParams != 'undefined') {
 			var params = new URLSearchParams(location.search);
 			if (params.has("video") || params.has("audio")) {
@@ -16,11 +17,14 @@
 			if (params.has("options")) {
 				options = params.get("options");
 			}
+			if (params.has("codec")) {
+				codec = params.get("codec");
+			}
 		} 	    
 		window.onload         = function() {
 			this.webRtcServer = new WebRtcStreamer("video", webrtcConfig.url);
-			document.getElementById("title").innerHTML=url.video; 
-			webRtcServer.connect(url.video,url.audio,options);
+			document.getElementById("title").innerText = url.video; 
+			webRtcServer.connect(url.video, url.audio, options, undefined, codec);
 			fetch(webrtcConfig.url + "/api/version").then(r => r.text()).then( (response) => { 
 				document.getElementById("footer").innerHTML = "<p><a href='https://github.com/mpromonet/webrtc-streamer'>WebRTC-Streamer</a> " + response.split(" ")[0] + "</p>";			
 			});			

package/html/webrtcstreamer.js

@@ -32,10 +32,11 @@ WebRtcStreamer.prototype._handleHttpErrors = function (response) {
  * Connect a WebRTC Stream to videoElement 
  * @param {string} videourl - id of WebRTC video stream
  * @param {string} audiourl - id of WebRTC audio stream
- * @param {string} options -  options of WebRTC call
- * @param {string} stream  -  local stream to send
+ * @param {string} options  -  options of WebRTC call
+ * @param {string} stream   -  local stream to send
+ * @param {string} prefmime -  prefered mime
 */
-WebRtcStreamer.prototype.connect = function(videourl, audiourl, options, localstream) {
+WebRtcStreamer.prototype.connect = function(videourl, audiourl, options, localstream, prefmime) {
 	this.disconnect();
 	
 	// getIceServers is not already received
@@ -45,11 +46,11 @@ WebRtcStreamer.prototype.connect = function(videourl, audiourl, options, localst
 		fetch(this.srvurl + "/api/getIceServers")
 			.then(this._handleHttpErrors)
 			.then( (response) => (response.json()) )
-			.then( (response) =>  this.onReceiveGetIceServers(response, videourl, audiourl, options, localstream))
+			.then( (response) =>  this.onReceiveGetIceServers(response, videourl, audiourl, options, localstream, prefmime))
 			.catch( (error) => this.onError("getIceServers " + error ))
 				
 	} else {
-		this.onReceiveGetIceServers(this.iceServers, videourl, audiourl, options, localstream);
+		this.onReceiveGetIceServers(this.iceServers, videourl, audiourl, options, localstream, prefmime);
 	}
 }
 
@@ -82,7 +83,7 @@ WebRtcStreamer.prototype.disconnect = function() {
 /*
 * GetIceServers callback
 */
-WebRtcStreamer.prototype.onReceiveGetIceServers = function(iceServers, videourl, audiourl, options, stream) {
+WebRtcStreamer.prototype.onReceiveGetIceServers = function(iceServers, videourl, audiourl, options, stream, prefmime) {
 	this.iceServers       = iceServers;
 	this.pcConfig         = iceServers || {"iceServers": [] };
 	try {            
@@ -106,6 +107,22 @@ WebRtcStreamer.prototype.onReceiveGetIceServers = function(iceServers, videourl,
 		// create Offer
 		this.pc.createOffer(this.mediaConstraints).then((sessionDescription) => {
 			console.log("Create offer:" + JSON.stringify(sessionDescription));
+
+			if (prefmime != undefined) {
+				//set prefered codec
+				let [prefkind] = prefmime.split('/');
+				let codecs = RTCRtpReceiver.getCapabilities(prefkind).codecs;
+				console.log(`codecs:${JSON.stringify(codecs)}`)
+				let preferedCodecs = codecs.filter(codec => codec.mimeType === prefmime);
+
+				console.log(`preferedCodecs:${JSON.stringify(preferedCodecs)}`);
+				this.pc.getTransceivers().filter(transceiver => transceiver.receiver.track.kind === prefkind).forEach(tcvr => {
+					if(tcvr.setCodecPreferences != undefined) {
+						tcvr.setCodecPreferences(preferedCodecs);
+					}
+				});
+			}
+		
 			
 			this.pc.setLocalDescription(sessionDescription)
 				.then(() => {
@@ -146,7 +163,7 @@ WebRtcStreamer.prototype.createPeerConnection = function() {
 	console.log("createPeerConnection  config: " + JSON.stringify(this.pcConfig));
 	this.pc = new RTCPeerConnection(this.pcConfig);
 	var pc = this.pc;
-	pc.peerid = Math.random();		
+	pc.peerid = Math.random();			
 	
 	pc.onicecandidate = (evt) => this.onIceCandidate(evt);
 	pc.onaddstream    = (evt) => this.onAddStream(evt);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webrtc-streamer",
-  "version": "0.8.3",
+  "version": "0.8.4-2-g68e8d8e",
   "description": "",
   "main": "joinjanusvideoroom.js",
   "dependencies": {