зеркало из https://github.com/mozilla/gecko-dev.git
Bug 802326 - make getUserMedia fail if required video constraints aren't met, regardless of audio. r=jesup
MozReview-Commit-ID: BVT7vyNbatH --HG-- extra : rebase_source : 81c90431da89f6e78bbb7db9e3120e34ab197323
This commit is contained in:
Родитель
a0cec16a10
Коммит
f8910bc751
|
@ -1095,13 +1095,15 @@ MediaManager::SelectSettings(
|
|||
if (videos.Length() && IsOn(aConstraints.mVideo)) {
|
||||
badConstraint = MediaConstraintsHelper::SelectSettings(
|
||||
GetInvariant(aConstraints.mVideo), videos);
|
||||
}
|
||||
if (!badConstraint && audios.Length() && IsOn(aConstraints.mAudio)) {
|
||||
badConstraint = MediaConstraintsHelper::SelectSettings(
|
||||
GetInvariant(aConstraints.mAudio), audios);
|
||||
}
|
||||
if (!badConstraint) {
|
||||
for (auto& video : videos) {
|
||||
sources.AppendElement(video);
|
||||
}
|
||||
}
|
||||
if (audios.Length() && IsOn(aConstraints.mAudio)) {
|
||||
badConstraint = MediaConstraintsHelper::SelectSettings(
|
||||
GetInvariant(aConstraints.mAudio), audios);
|
||||
for (auto& audio : audios) {
|
||||
sources.AppendElement(audio);
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче