Merge branch 'release-0.24'

strukturag · Aug 13, 2015 · 873314e · 873314e
2 parents e40ca05 + 7ea04e9
commit 873314e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,9 @@
+spreed-webrtc-server (0.24.8) trusty; urgency=medium
+
+  * Avoid to scale up screen sharing when sharing not full screen. 
+
+ -- Simon Eisenmann <[email protected]>  Thu, 13 Aug 2015 16:21:22 +0200
+
 spreed-webrtc-server (0.24.7) trusty; urgency=medium
 
   * Fixed a problem where Chrome did not apply screen sharing constraints correctly and screen sharing was using a low resolution.

diff --git a/static/js/mediastream/peerscreenshare.js b/static/js/mediastream/peerscreenshare.js
@@ -80,8 +80,8 @@ define(['jquery', 'underscore', 'mediastream/peercall', 'mediastream/tokens'], f
 		var mandatoryVideoConstraints = $.extend(true, {}, {
 			maxWidth: screenWidth,
 			maxHeight: screenHeight,
-			minWidth: screenWidth,
-			minHeight: screenHeight
+			minWidth: 1,
+			minHeight: 1
 		}, webrtc.settings.screensharing.mediaConstraints.video.mandatory, options);
 		var mediaConstraints = $.extend(true, {}, webrtc.settings.screensharing.mediaConstraints, {
 			audio: false