OLD | NEW |
1 /* | 1 /* |
2 * Copyright (c) 2014 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2014 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 |
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
72 | 72 |
73 bool CroppingWindowCapturer::BringSelectedWindowToFront() { | 73 bool CroppingWindowCapturer::BringSelectedWindowToFront() { |
74 return window_capturer_->BringSelectedWindowToFront(); | 74 return window_capturer_->BringSelectedWindowToFront(); |
75 } | 75 } |
76 | 76 |
77 void CroppingWindowCapturer::OnCaptureResult( | 77 void CroppingWindowCapturer::OnCaptureResult( |
78 DesktopCapturer::Result result, | 78 DesktopCapturer::Result result, |
79 std::unique_ptr<DesktopFrame> screen_frame) { | 79 std::unique_ptr<DesktopFrame> screen_frame) { |
80 if (!ShouldUseScreenCapturer()) { | 80 if (!ShouldUseScreenCapturer()) { |
81 LOG(LS_INFO) << "Window no longer on top when ScreenCapturer finishes"; | 81 LOG(LS_INFO) << "Window no longer on top when ScreenCapturer finishes"; |
82 window_capturer_->Capture(DesktopRegion()); | 82 window_capturer_->CaptureFrame(); |
83 return; | 83 return; |
84 } | 84 } |
85 | 85 |
86 if (result != Result::SUCCESS) { | 86 if (result != Result::SUCCESS) { |
87 LOG(LS_WARNING) << "ScreenCapturer failed to capture a frame"; | 87 LOG(LS_WARNING) << "ScreenCapturer failed to capture a frame"; |
88 callback_->OnCaptureResult(result, nullptr); | 88 callback_->OnCaptureResult(result, nullptr); |
89 return; | 89 return; |
90 } | 90 } |
91 | 91 |
92 DesktopRect window_rect = GetWindowRectInVirtualScreen(); | 92 DesktopRect window_rect = GetWindowRectInVirtualScreen(); |
(...skipping 10 matching lines...) Expand all Loading... |
103 | 103 |
104 #if !defined(WEBRTC_WIN) | 104 #if !defined(WEBRTC_WIN) |
105 // static | 105 // static |
106 WindowCapturer* | 106 WindowCapturer* |
107 CroppingWindowCapturer::Create(const DesktopCaptureOptions& options) { | 107 CroppingWindowCapturer::Create(const DesktopCaptureOptions& options) { |
108 return WindowCapturer::Create(options); | 108 return WindowCapturer::Create(options); |
109 } | 109 } |
110 #endif | 110 #endif |
111 | 111 |
112 } // namespace webrtc | 112 } // namespace webrtc |
OLD | NEW |