Bug 1094539 - Fix getUserMedia video resolution. r=jesup, a=lsblakk
authorAlfredo Yang <ayang@mozilla.com>
Wed, 05 Nov 2014 23:52:24 -0500
changeset 234325 74a720385cb5cd3b2a881b008fb4ef5c97033566
parent 234324 a0c7fb4511b3b9e277647ddb5f0c5aa4fe4e5dee
child 234326 ab950c65d1c8b48e8cae46ad4fad8e7d8fdc7a3c
push id4268
push userryanvm@gmail.com
push dateMon, 22 Dec 2014 22:22:50 +0000
treeherdermozilla-beta@e83d78f377b6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjesup, lsblakk
bugs1094539
milestone35.0
Bug 1094539 - Fix getUserMedia video resolution. r=jesup, a=lsblakk Remove mCapability from sub class
content/media/webrtc/MediaEngineWebRTC.h
--- a/content/media/webrtc/MediaEngineWebRTC.h
+++ b/content/media/webrtc/MediaEngineWebRTC.h
@@ -118,17 +118,16 @@ private:
   void Init();
   void Shutdown();
 
   // Engine variables.
   webrtc::VideoEngine* mVideoEngine; // Weak reference, don't free.
   webrtc::ViEBase* mViEBase;
   webrtc::ViECapture* mViECapture;
   webrtc::ViERender* mViERender;
-  webrtc::CaptureCapability mCapability; // Doesn't work on OS X.
 
   int mMinFps; // Min rate we want to accept
   MediaSourceType mMediaSource; // source of media (camera | application | screen)
 
   static bool SatisfyConstraintSet(const dom::MediaTrackConstraintSet& aConstraints,
                                    const webrtc::CaptureCapability& aCandidate);
   void ChooseCapability(const VideoTrackConstraintsN& aConstraints,
                         const MediaEnginePrefs& aPrefs);