Chromium Code Reviews| Index: content/browser/media/capture/content_video_capture_device_core.cc |
| diff --git a/content/browser/media/capture/content_video_capture_device_core.cc b/content/browser/media/capture/content_video_capture_device_core.cc |
| index 8152b3dbe0e9cc19636190fff20137c9555ec88f..87efe021178da7de16dbaead34ed630b073f0b12 100644 |
| --- a/content/browser/media/capture/content_video_capture_device_core.cc |
| +++ b/content/browser/media/capture/content_video_capture_device_core.cc |
| @@ -150,7 +150,8 @@ void ThreadSafeCaptureOracle::UpdateCaptureSize(const gfx::Size& source_size) { |
| // If this is the first call to UpdateCaptureSize(), or the receiver supports |
| // variable resolution, then determine the capture size by treating the |
| // requested width and height as maxima. |
| - if (!capture_size_updated_ || params_.allow_resolution_change) { |
| + if (!capture_size_updated_ || params_.resolution_change_policy == |
| + media::RESOLUTION_POLICY_DYNAMIC_WITHIN_LIMIT) { |
|
perkj_chrome
2014/09/07 14:07:09
I am not sure if this is the correct intdentation
|
| // The capture resolution should not exceed the source frame size. |
| // In other words it should downscale the image but not upscale it. |
| if (source_size.width() > params_.requested_format.frame_size.width() || |