diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-01-20 13:40:20 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-01-22 12:41:23 +0000 |
commit | 7961cea6d1041e3e454dae6a1da660b453efd238 (patch) | |
tree | c0eeb4a9ff9ba32986289c1653d9608e53ccb444 /chromium/components/mirroring/service/mirror_settings.cc | |
parent | b7034d0803538058e5c9d904ef03cf5eab34f6ef (diff) | |
download | qtwebengine-chromium-7961cea6d1041e3e454dae6a1da660b453efd238.tar.gz |
BASELINE: Update Chromium to 78.0.3904.130
Change-Id: If185e0c0061b3437531c97c9c8c78f239352a68b
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/components/mirroring/service/mirror_settings.cc')
-rw-r--r-- | chromium/components/mirroring/service/mirror_settings.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/chromium/components/mirroring/service/mirror_settings.cc b/chromium/components/mirroring/service/mirror_settings.cc index 14f337dd974..b0392f8901f 100644 --- a/chromium/components/mirroring/service/mirror_settings.cc +++ b/chromium/components/mirroring/service/mirror_settings.cc @@ -8,10 +8,10 @@ #include "media/base/audio_parameters.h" -using media::cast::FrameSenderConfig; +using media::ResolutionChangePolicy; using media::cast::Codec; +using media::cast::FrameSenderConfig; using media::cast::RtpPayloadType; -using media::ResolutionChangePolicy; namespace mirroring { @@ -108,8 +108,7 @@ media::VideoCaptureParams MirrorSettings::GetVideoCaptureParams() { kMaxFrameRate, media::PIXEL_FORMAT_I420); if (max_height_ == min_height_ && max_width_ == min_width_) { params.resolution_change_policy = ResolutionChangePolicy::FIXED_RESOLUTION; - } else if ((100 * min_width_ / min_height_) == - (100 * max_width_ / max_height_)) { + } else if (enable_sender_side_letterboxing_) { params.resolution_change_policy = ResolutionChangePolicy::FIXED_ASPECT_RATIO; } else { @@ -133,7 +132,8 @@ base::Value MirrorSettings::ToDictionaryValue() { settings.SetKey("maxHeight", base::Value(max_height_)); settings.SetKey("minWidth", base::Value(min_width_)); settings.SetKey("minHeight", base::Value(min_height_)); - settings.SetKey("senderSideLetterboxing", base::Value(true)); + settings.SetKey("senderSideLetterboxing", + base::Value(enable_sender_side_letterboxing_)); settings.SetKey("minFrameRate", base::Value(0)); settings.SetKey("maxFrameRate", base::Value(kMaxFrameRate)); settings.SetKey("minVideoBitrate", base::Value(kMinVideoBitrate)); |