提交 e610134b authored 作者: Anthony Minessale's avatar Anthony Minessale

FS-8180 addtl patch

上级 e7d11375
...@@ -102,18 +102,26 @@ ...@@ -102,18 +102,26 @@
if (moz) { if (moz) {
this.constraints = { this.constraints = {
offerToReceiveAudio: true, offerToReceiveAudio: true
offerToReceiveVideo: this.options.useVideo ? true : false,
}; };
if (this.options.useVideo) {
this.constraints.offerToReceiveVideo = true;
}
} else { } else {
this.constraints = { this.constraints = {
optional: [{ optional: [{
'DtlsSrtpKeyAgreement': 'true' 'DtlsSrtpKeyAgreement': 'true'
}],mandatory: { }],mandatory: {
OfferToReceiveAudio: true, OfferToReceiveAudio: true
OfferToReceiveVideo: this.options.useVideo ? true : false,
} }
}; };
if (this.options.useVideo) {
console.error(this.options.useVideo);
this.constraints.manditory.OfferToReceiveVideo = true;
}
} }
if (self.options.useVideo) { if (self.options.useVideo) {
...@@ -141,9 +149,9 @@ ...@@ -141,9 +149,9 @@
self.options.useVideo = null; self.options.useVideo = null;
self.options.localVideo = null; self.options.localVideo = null;
if (moz) { if (moz) {
self.constraints.offerToReceiveVideo = false; delete self.constraints.offerToReceiveVideo;
} else { } else {
self.constraints.mandatory.OfferToReceiveVideo = false; delete self.constraints.mandatory.OfferToReceiveVideo;
} }
} }
...@@ -398,6 +406,7 @@ ...@@ -398,6 +406,7 @@
console.log("Audio constraints", mediaParams.audio); console.log("Audio constraints", mediaParams.audio);
console.log("Video constraints", mediaParams.video); console.log("Video constraints", mediaParams.video);
console.log("Device constraints", self.constraints);
if (self.options.useVideo && self.options.localVideo) { if (self.options.useVideo && self.options.localVideo) {
getUserMedia({ getUserMedia({
...@@ -526,9 +535,9 @@ ...@@ -526,9 +535,9 @@
if (screen) { if (screen) {
if (moz) { if (moz) {
self.constraints.OfferToReceiveVideo = false; delete self.constraints.OfferToReceiveVideo;
} else { } else {
self.constraints.mandatory.OfferToReceiveVideo = false; delete self.constraints.mandatory.OfferToReceiveVideo;
} }
} }
...@@ -568,12 +577,12 @@ ...@@ -568,12 +577,12 @@
console.log("Audio constraints", mediaParams.audio); console.log("Audio constraints", mediaParams.audio);
console.log("Video constraints", mediaParams.video); console.log("Video constraints", mediaParams.video);
console.log("Device constraints", self.constraints);
getUserMedia({ getUserMedia({
constraints: { constraints: {
audio: mediaParams.audio, audio: mediaParams.audio
video: mediaParams.video //video: mediaParams.video
}, },
video: mediaParams.useVideo, video: mediaParams.useVideo,
onsuccess: onSuccess, onsuccess: onSuccess,
......
This diff was suppressed by a .gitattributes entry.
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论