提交 59d6e632 authored 作者: Anthony Minessale's avatar Anthony Minessale

FS-7746 #resolve this should work now

上级 4582498b
......@@ -468,6 +468,8 @@ var iceTimer;
}
var video = {};
var bestFrameRate = obj.options.videoParams.vertoBestFrameRate;
delete obj.options.videoParams.vertoBestFrameRate;
if (window.moz) {
video = obj.options.videoParams;
......@@ -485,8 +487,13 @@ var iceTimer;
if (useVideo && obj.options.useCamera && obj.options.useCamera !== "none") {
if (obj.options.useCamera !== "any") {
video.optional = [{sourceId: obj.options.useCamera}]
video.optional.push({sourceId: obj.options.useCamera});
}
if (bestFrameRate && !window.moz) {
video.optional.push({minFrameRate: bestFrameRate});
}
} else {
video = null;
useVideo = null;
......
This diff was suppressed by a .gitattributes entry.
......@@ -179,7 +179,8 @@ function check_vid_res()
"minHeight": vid_height,
"maxWidth": vid_width,
"maxHeight": vid_height,
"minFrameRate": 30,
"minFrameRate": 15,
"vertoBestFrameRate": 30,
//chromeMediaSource: 'screen',
//mediaSource: 'screen'
});
......@@ -1165,7 +1166,8 @@ function init() {
"minHeight": vid_height,
"maxWidth": vid_width,
"maxHeight": vid_height,
"minFrameRate": 30,
"minFrameRate": 15,
"vertoBestFrameRate": 30,
//chromeMediaSource: 'screen',
//mediaSource: 'screen'
},
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论