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 242922 ee09df3331d0
parent 242921 b269b8f5102c
child 242923 be5eee20bba5
push id4341
push userryanvm@gmail.com
push date2015-01-20 15:33 +0000
treeherdermozilla-beta@595835cd60a0 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjesup, sledru
bugs1119852
milestone36.0
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;
     }