Bug 1368875 - Count {video: true} and {audio: true} toward cam and mic counts respectively. draft
authorJan-Ivar Bruaroey <jib@mozilla.com>
Tue, 30 May 2017 21:57:37 -0400
changeset 586748 38aa72d8e18849164942372c3be4db6a1d32978c
parent 586536 39d5cc0fda5e16c49a59d29d4ca186a5534cc88b
child 631089 fb61a1504bee0e8571cc0215020b682f4b67a928
push id61513
push userjbruaroey@mozilla.com
push dateWed, 31 May 2017 01:58:08 +0000
bugs1368875
milestone55.0a1
Bug 1368875 - Count {video: true} and {audio: true} toward cam and mic counts respectively. MozReview-Commit-ID: BgdvRLpueit
dom/media/MediaManager.cpp
--- 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));