Bug 1368875 - Count {video: true} and {audio: true} toward cam and mic counts respectively.
MozReview-Commit-ID: BgdvRLpueit
--- a/dom/media/MediaManager.cpp
+++ b/dom/media/MediaManager.cpp
@@ -2225,16 +2225,18 @@ MediaManager::GetUserMedia(nsPIDOMWindow
if (cs.mBrowserWindow.WasPassed()) {
cs.mBrowserWindow.Value() = -1;
}
}
}
}
} else if (IsOn(c.mVideo)) {
videoType = MediaSourceEnum::Camera;
+ Telemetry::Accumulate(Telemetry::WEBRTC_GET_USER_MEDIA_TYPE,
+ (uint32_t) videoType);
}
if (c.mAudio.IsMediaTrackConstraints()) {
auto& ac = c.mAudio.GetAsMediaTrackConstraints();
MediaConstraintsHelper::ConvertOldWithWarning(ac.mMozAutoGainControl,
ac.mAutoGainControl,
"MozAutoGainControlWarning",
aWindow);
@@ -2287,17 +2289,19 @@ MediaManager::GetUserMedia(nsPIDOMWindow
MediaSourceEnum::Camera);
for (MediaTrackConstraintSet& cs : ac.mAdvanced.Value()) {
if (cs.mMediaSource.EqualsASCII(unset)) {
cs.mMediaSource = ac.mMediaSource;
}
}
}
} else if (IsOn(c.mAudio)) {
- audioType = MediaSourceEnum::Microphone;
+ audioType = MediaSourceEnum::Microphone;
+ Telemetry::Accumulate(Telemetry::WEBRTC_GET_USER_MEDIA_TYPE,
+ (uint32_t) audioType);
}
// Create a window listener if it doesn't already exist.
RefPtr<GetUserMediaWindowListener> windowListener =
GetWindowListener(windowID);
if (windowListener) {
PrincipalHandle existingPrincipalHandle = windowListener->GetPrincipalHandle();
MOZ_ASSERT(PrincipalHandleMatches(existingPrincipalHandle, principal));