haskal
/
jiti-meet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #113 from jitsi/whydoeschromegivemeweirdresolutions 

specify constraints in a way which doesnt define the AR
This commit is contained in:
Philipp Hancke 2014-09-01 15:12:45 +02:00
parent d148161a42 eb461d1f65
commit f046051ac7
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libs/strophe/strophe.jingle.adapter.js
View File

@ -577,23 +577,19 @@ function getUserMediaWithConstraints(um, success_callback, failure_callback, res
case 'fullhd': case 'fullhd':
constraints.video.mandatory.minWidth = 1920; constraints.video.mandatory.minWidth = 1920;
constraints.video.mandatory.minHeight = 1080; constraints.video.mandatory.minHeight = 1080;
constraints.video.optional.push({ minAspectRatio: 1.77 });
break; break;
case '720': case '720':
case 'hd': case 'hd':
constraints.video.mandatory.minWidth = 1280; constraints.video.mandatory.minWidth = 1280;
constraints.video.mandatory.minHeight = 720; constraints.video.mandatory.minHeight = 720;
constraints.video.optional.push({ minAspectRatio: 1.77 });
break; break;
case '360': case '360':
constraints.video.mandatory.minWidth = 640; constraints.video.mandatory.minWidth = 640;
constraints.video.mandatory.minHeight = 360; constraints.video.mandatory.minHeight = 360;
constraints.video.optional.push({ minAspectRatio: 1.77 });
break; break;
case '180': case '180':
constraints.video.mandatory.minWidth = 320; constraints.video.mandatory.minWidth = 320;
constraints.video.mandatory.minHeight = 180; constraints.video.mandatory.minHeight = 180;
constraints.video.optional.push({ minAspectRatio: 1.77 });
break; break;
// 4:3 // 4:3
case '960': case '960':
@ -617,6 +613,10 @@ function getUserMediaWithConstraints(um, success_callback, failure_callback, res
} }
break; break;
} }
if (constraints.video.mandatory.minWidth)
constraints.video.mandatory.maxWidth = constraints.video.mandatory.minWidth;
if (constraints.video.mandatory.minHeight)
constraints.video.mandatory.maxHeight = constraints.video.mandatory.minHeight;
if (bandwidth) { // doesn't work currently, see webrtc issue 1846 if (bandwidth) { // doesn't work currently, see webrtc issue 1846
if (!constraints.video) constraints.video = {mandatory: {}, optional: []};//same behaviour as true if (!constraints.video) constraints.video = {mandatory: {}, optional: []};//same behaviour as true