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

Screen was flickering when the picker for desktop medias showed up in Windows platform. Keeping track of window size for each window so that BitBlt() instead of PrintWindow() will be called for windows with unchanged sizes.

Browse Source 
BUG=472857

Review URL: https://codereview.webrtc.org/1705183002

Cr-Commit-Position: refs/heads/master@{#11721}
This commit is contained in:
gyzhou 2016-02-23 08:57:45 -08:00 committed by Commit bot
parent b1eaa8df0d
commit 77f3e0da5a
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
webrtc/modules/desktop_capture/window_capturer_win.cc
View File

@ -103,6 +103,10 @@ class WindowCapturerWin : public WindowCapturer {
AeroChecker aero_checker_;
// This map is used to avoid flickering for the case when SelectWindow() calls
// are interleaved with Capture() calls.
std::map<HWND, DesktopSize> window_size_map_;
RTC_DISALLOW_COPY_AND_ASSIGN(WindowCapturerWin);
};
@ -120,6 +124,14 @@ bool WindowCapturerWin::GetWindowList(WindowList* windows) {
if (!EnumWindows(&WindowsEnumerationHandler, param))
return false;
windows->swap(result);
std::map<HWND, DesktopSize> new_map;
for (const auto& item : *windows) {
HWND hwnd = reinterpret_cast<HWND>(item.id);
new_map[hwnd] = window_size_map_[hwnd];
}
window_size_map_.swap(new_map);
return true;
}
@ -128,7 +140,9 @@ bool WindowCapturerWin::SelectWindow(WindowId id) {
if (!IsWindow(window) || !IsWindowVisible(window) || IsIconic(window))
return false;
window_ = window;
previous_size_.set(0, 0);
// When a window is not in the map, window_size_map_[window] will create an
// item with DesktopSize (0, 0).
previous_size_ = window_size_map_[window];
return true;
}
@ -170,6 +184,7 @@ void WindowCapturerWin::Capture(const DesktopRegion& region) {
memset(frame->data(), 0, frame->stride() * frame->size().height());
previous_size_ = frame->size();
window_size_map_[window_] = previous_size_;
callback_->OnCaptureCompleted(frame);
return;
}
@ -236,6 +251,7 @@ void WindowCapturerWin::Capture(const DesktopRegion& region) {
ReleaseDC(window_, window_dc);
previous_size_ = frame->size();
window_size_map_[window_] = previous_size_;
frame->mutable_updated_region()->SetRect(
DesktopRect::MakeSize(frame->size()));