admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Respect DesktopCaptureOptions::detect_updated_region() in ScreenCapturerMac

Browse Source 
Bug: NONE
Change-Id: I5606f2d1fcf2546cb5647b3f86a374a66ceac200
Reviewed-on: https://chromium-review.googlesource.com/609380
Reviewed-by: Jamie Walch <jamiewalch@chromium.org>
Commit-Queue: Zijie He <zijiehe@chromium.org>
Cr-Commit-Position: refs/heads/master@{#19439}
This commit is contained in:
Zijie He 2017-08-09 14:38:10 -07:00 committed by Commit Bot
parent 296b64eb25
commit 97c3fc13b5
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
webrtc/modules/desktop_capture/screen_capturer_mac.mm
View File

@ -276,7 +276,8 @@ CGImageRef CreateExcludedWindowRegionImage(const DesktopRect& pixel_bounds,
class ScreenCapturerMac : public DesktopCapturer {
public:
explicit ScreenCapturerMac(
rtc::scoped_refptr<DesktopConfigurationMonitor> desktop_config_monitor);
rtc::scoped_refptr<DesktopConfigurationMonitor> desktop_config_monitor,
bool detect_updated_region);
~ScreenCapturerMac() override;
bool Init();
@ -311,6 +312,8 @@ class ScreenCapturerMac : public DesktopCapturer {
std::unique_ptr<DesktopFrame> CreateFrame();
const bool detect_updated_region_;
Callback* callback_ = nullptr;
CGLContextObj cgl_context_ = nullptr;
@ -383,8 +386,10 @@ class InvertedDesktopFrame : public DesktopFrame {
};
ScreenCapturerMac::ScreenCapturerMac(
rtc::scoped_refptr<DesktopConfigurationMonitor> desktop_config_monitor)
: desktop_config_monitor_(desktop_config_monitor) {
rtc::scoped_refptr<DesktopConfigurationMonitor> desktop_config_monitor,
bool detect_updated_region)
: detect_updated_region_(detect_updated_region),
desktop_config_monitor_(desktop_config_monitor) {
display_stream_manager_ = new DisplayStreamManager;
}
@ -479,7 +484,12 @@ void ScreenCapturerMac::CaptureFrame() {
}
std::unique_ptr<DesktopFrame> new_frame = queue_.current_frame()->Share();
*new_frame->mutable_updated_region() = region;
if (detect_updated_region_) {
*new_frame->mutable_updated_region() = region;
} else {
new_frame->mutable_updated_region()->AddRect(
DesktopRect::MakeSize(new_frame->size()));
}
if (flip)
new_frame.reset(new InvertedDesktopFrame(std::move(new_frame)));
@ -1033,8 +1043,8 @@ std::unique_ptr<DesktopCapturer> DesktopCapturer::CreateRawScreenCapturer(
if (!options.configuration_monitor())
return nullptr;
std::unique_ptr<ScreenCapturerMac> capturer(
new ScreenCapturerMac(options.configuration_monitor()));
std::unique_ptr<ScreenCapturerMac> capturer(new ScreenCapturerMac(
options.configuration_monitor(), options.detect_updated_region()));
if (!capturer.get()->Init()) {
return nullptr;
}