Bug 1254102 - Don't skip Tab sources if the camera is in use. r=jesup a=ritu
authorGian-Carlo Pascutto <gcp@mozilla.com>
Tue, 15 Mar 2016 20:39:37 +0100
changeset 310292 455208471bc2d721af129c1678e369b69b8e706b
parent 310291 261a56c9e3487b42c3e73418f69ec51609afa505
child 310293 559ec5c54ac6293ed68625130cc6f7ab78ae61ab
push id9319
push userkwierso@gmail.com
push dateMon, 28 Mar 2016 18:09:46 +0000
treeherdermozilla-aurora@236975b1c252 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjesup, ritu
bugs1254102
milestone47.0a2
Bug 1254102 - Don't skip Tab sources if the camera is in use. r=jesup a=ritu MozReview-Commit-ID: 7ZaebdnWj3R
dom/media/webrtc/MediaEngineWebRTC.cpp
--- a/dom/media/webrtc/MediaEngineWebRTC.cpp
+++ b/dom/media/webrtc/MediaEngineWebRTC.cpp
@@ -167,19 +167,16 @@ MediaEngineWebRTC::EnumerateVideoDevices
    * Enumeration is not neccessary if GIPS reports the same set of devices
    * for a given instance of the engine. Likewise, if a device was plugged out,
    * mVideoSources must be updated.
    */
   int num;
   num = mozilla::camera::GetChildAndCall(
     &mozilla::camera::CamerasChild::NumberOfCaptureDevices,
     capEngine);
-  if (num <= 0) {
-    return;
-  }
 
   for (int i = 0; i < num; i++) {
     char deviceName[MediaEngineSource::kMaxDeviceNameLength];
     char uniqueId[MediaEngineSource::kMaxUniqueIdLength];
 
     // paranoia
     deviceName[0] = '\0';
     uniqueId[0] = '\0';