Bug 1084035 - Add the ability to mirror tabs from desktop to a second screen, don't block browser sources when specified in constraints from chrome code. r=jesup, a=lmandel
authorBrad Lassey <blassey@mozilla.com>
Tue, 21 Oct 2014 18:06:27 -0400
changeset 225807 47065beeef20
parent 225806 d9664db594e9
child 225808 46916559304f
push id4023
push userryanvm@gmail.com
push date2014-10-24 20:40 +0000
treeherdermozilla-beta@184b704568ff [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjesup, lmandel
bugs1084035
milestone34.0
Bug 1084035 - Add the ability to mirror tabs from desktop to a second screen, don't block browser sources when specified in constraints from chrome code. r=jesup, a=lmandel
content/media/webrtc/MediaEngineWebRTC.cpp
--- a/content/media/webrtc/MediaEngineWebRTC.cpp
+++ b/content/media/webrtc/MediaEngineWebRTC.cpp
@@ -272,17 +272,17 @@ MediaEngineWebRTC::EnumerateVideoDevices
       aVSources->AppendElement(vSource.get());
     } else {
       vSource = new MediaEngineWebRTCVideoSource(videoEngine, i, aMediaSource);
       mVideoSources.Put(uuid, vSource); // Hashtable takes ownership.
       aVSources->AppendElement(vSource);
     }
   }
 
-  if (mHasTabVideoSource)
+  if (mHasTabVideoSource || MediaSourceType::Browser == aMediaSource)
     aVSources->AppendElement(new MediaEngineTabVideoSource());
 
   return;
 #endif
 }
 
 void
 MediaEngineWebRTC::EnumerateAudioDevices(MediaSourceType aMediaSource,