Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-04 11:26:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1561569 - Put limits to width and height constraints in MediaEngineVideoDefault. r=jib

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D36028

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Andreas Pehrson 2019-07-08 14:56:13 +00:00
parent bb7857b872
commit cf67d306f8
2 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
dom/media/webrtc/MediaEngineDefault.cpp
View File

@ -29,6 +29,10 @@
# include "YuvStamper.h"
#endif
#define VIDEO_WIDTH_MIN 160
#define VIDEO_WIDTH_MAX 4096
#define VIDEO_HEIGHT_MIN 90
#define VIDEO_HEIGHT_MAX 2160
#define DEFAULT_AUDIO_TIMER_MS 10
namespace mozilla {
@ -103,10 +107,21 @@ uint32_t MediaEngineDefaultVideoSource::GetBestFitnessDistance(
for (const auto* cs : aConstraintSets) {
distance +=
MediaConstraintsHelper::FitnessDistance(Some(aDeviceId), cs->mDeviceId);
Maybe<nsString> facingMode = Nothing();
distance +=
MediaConstraintsHelper::FitnessDistance(facingMode, cs->mFacingMode);
if (cs->mWidth.mMax < VIDEO_WIDTH_MIN ||
cs->mWidth.mMin > VIDEO_WIDTH_MAX) {
distance += UINT32_MAX;
}
if (cs->mHeight.mMax < VIDEO_HEIGHT_MIN ||
cs->mHeight.mMin > VIDEO_HEIGHT_MAX) {
distance += UINT32_MAX;
}
break; // distance is read from first entry only
}
#endif
@ -155,8 +170,11 @@ nsresult MediaEngineDefaultVideoSource::Allocate(
MediaEnginePrefs::DEFAULT_43_VIDEO_HEIGHT
#endif
);
mOpts.mWidth = std::max(160, std::min(mOpts.mWidth, 4096)) & ~1;
mOpts.mHeight = std::max(90, std::min(mOpts.mHeight, 2160)) & ~1;
mOpts.mWidth =
std::max(VIDEO_WIDTH_MIN, std::min(mOpts.mWidth, VIDEO_WIDTH_MAX)) & ~1;
mOpts.mHeight =
std::max(VIDEO_HEIGHT_MIN, std::min(mOpts.mHeight, VIDEO_HEIGHT_MAX)) &
~1;
NS_DispatchToMainThread(NS_NewRunnableFunction(
__func__, [settings = mSettings, frameRate = mOpts.mFPS,

4
testing/web-platform/meta/mediacapture-streams/GUM-impossible-constraint.https.html.ini
View File

@ -1,4 +0,0 @@
[GUM-impossible-constraint.https.html]
[Tests that setting an impossible constraint in getUserMedia fails]
expected: FAIL