Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(34)

Side by Side Diff: webrtc/modules/desktop_capture/win/dxgi_adapter_duplicator.cc

Issue 2852783002: Revert of Allow Windows to return a monitor out of the first quadrant (Closed)
Patch Set: Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2016 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
11 #include "webrtc/modules/desktop_capture/win/dxgi_adapter_duplicator.h" 11 #include "webrtc/modules/desktop_capture/win/dxgi_adapter_duplicator.h"
12 12
13 #include <comdef.h> 13 #include <comdef.h>
14 #include <DXGI.h> 14 #include <DXGI.h>
15 15
16 #include <algorithm> 16 #include <algorithm>
17 17
18 #include "webrtc/base/checks.h" 18 #include "webrtc/base/checks.h"
19 #include "webrtc/base/logging.h" 19 #include "webrtc/base/logging.h"
20 20
21 namespace webrtc { 21 namespace webrtc {
22 22
23 using Microsoft::WRL::ComPtr; 23 using Microsoft::WRL::ComPtr;
24 24
25 namespace { 25 namespace {
26 26
27 bool IsValidRect(const RECT& rect) { 27 bool IsValidRect(const RECT& rect) {
28 return rect.right > rect.left && rect.bottom > rect.top; 28 return rect.left >= 0 && rect.top >= 0 && rect.right > rect.left &&
29 rect.bottom > rect.top;
29 } 30 }
30 31
31 } // namespace 32 } // namespace
32 33
33 DxgiAdapterDuplicator::DxgiAdapterDuplicator(const D3dDevice& device) 34 DxgiAdapterDuplicator::DxgiAdapterDuplicator(const D3dDevice& device)
34 : device_(device) {} 35 : device_(device) {}
35 DxgiAdapterDuplicator::DxgiAdapterDuplicator(DxgiAdapterDuplicator&&) = default; 36 DxgiAdapterDuplicator::DxgiAdapterDuplicator(DxgiAdapterDuplicator&&) = default;
36 DxgiAdapterDuplicator::~DxgiAdapterDuplicator() = default; 37 DxgiAdapterDuplicator::~DxgiAdapterDuplicator() = default;
37 38
38 bool DxgiAdapterDuplicator::Initialize() { 39 bool DxgiAdapterDuplicator::Initialize() {
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
145 146
146 int64_t DxgiAdapterDuplicator::GetNumFramesCaptured() const { 147 int64_t DxgiAdapterDuplicator::GetNumFramesCaptured() const {
147 int64_t min = INT64_MAX; 148 int64_t min = INT64_MAX;
148 for (const auto& duplicator : duplicators_) { 149 for (const auto& duplicator : duplicators_) {
149 min = std::min(min, duplicator.num_frames_captured()); 150 min = std::min(min, duplicator.num_frames_captured());
150 } 151 }
151 152
152 return min; 153 return min;
153 } 154 }
154 155
155 void DxgiAdapterDuplicator::TranslateRect(const DesktopVector& position) {
156 desktop_rect_.Translate(position);
157 RTC_DCHECK(desktop_rect_.left() >= 0 && desktop_rect_.top() >= 0);
158 for (auto& duplicator : duplicators_) {
159 duplicator.TranslateRect(position);
160 }
161 }
162
163 } // namespace webrtc 156 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698