Bug 1119852 - Don't forget to update _requestedCapability in Windows camera driver. r=jesup, a=sledru
authorGian-Carlo Pascutto <gpascutto@mozilla.com>
Mon, 12 Jan 2015 02:09:00 +0100
changeset 249268 2f41efcb45d69a16fbfdabaaf222bfa047502317
parent 249267 849a57bb974edaacd3bbe14e5fcb5cddaf0765bf
child 249269 396932c3a4aa685136201a3d7f760eb3c0060456
push id4489
push userraliiev@mozilla.com
push dateMon, 23 Feb 2015 15:17:55 +0000
treeherdermozilla-beta@fd7c3dc24146 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjesup, sledru
bugs1119852
milestone37.0a2
Bug 1119852 - Don't forget to update _requestedCapability in Windows camera driver. r=jesup, a=sledru
media/webrtc/trunk/webrtc/modules/video_capture/windows/video_capture_ds.cc
--- a/media/webrtc/trunk/webrtc/modules/video_capture/windows/video_capture_ds.cc
+++ b/media/webrtc/trunk/webrtc/modules/video_capture/windows/video_capture_ds.cc
@@ -207,16 +207,18 @@ int32_t VideoCaptureDS::CaptureSettings(
 
 int32_t VideoCaptureDS::SetCameraOutputIfNeeded(
     const VideoCaptureCapability& requestedCapability)
 {
     // Get the best matching capability
     VideoCaptureCapability capability;
     int32_t capabilityIndex;
 
+    // Store the new requested size
+    _requestedCapability = requestedCapability;
     // Match the requested capability with the supported.
     if ((capabilityIndex = _dsInfo.GetBestMatchedCapability(_deviceUniqueId,
                                                             _requestedCapability,
                                                             capability)) < 0)
     {
         return -1;
     }