FS-8599 #resolve [Workaround for Mozilla is no longer needed for video size]

This commit is contained in:
Anthony Minessale
2015-12-02 10:23:25 -06:00
parent ba9a480912
commit 51d402dfdd
2 changed files with 6 additions and 21 deletions

View File

@@ -542,17 +542,10 @@
var bestFrameRate = obj.options.videoParams.vertoBestFrameRate;
delete obj.options.videoParams.vertoBestFrameRate;
if (window.moz) {
video = obj.options.videoParams;
if (!video.width) video.width = video.minWidth;
if (!video.height) video.height = video.minHeight;
if (!video.frameRate) video.frameRate = video.minFrameRate;
} else {
video = {
mandatory: obj.options.videoParams,
optional: []
}
}
video = {
mandatory: obj.options.videoParams,
optional: []
}
var useVideo = obj.options.useVideo;
@@ -1124,13 +1117,6 @@
"maxHeight": h
};
if (window.moz) {
video = video.mandatory;
if (!video.width) video.width = video.minWidth;
if (!video.height) video.height = video.minHeight;
if (!video.frameRate) video.frameRate = video.minFrameRate;
}
getUserMedia({
constraints: {
audio: ttl++ == 0,