| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2013 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 274 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 285 return true; | 285 return true; |
| 286 } else if (event.type == ConfigureNotify) { | 286 } else if (event.type == ConfigureNotify) { |
| 287 ScreenConfigurationChanged(); | 287 ScreenConfigurationChanged(); |
| 288 return true; | 288 return true; |
| 289 } | 289 } |
| 290 return false; | 290 return false; |
| 291 } | 291 } |
| 292 | 292 |
| 293 std::unique_ptr<DesktopFrame> ScreenCapturerLinux::CaptureScreen() { | 293 std::unique_ptr<DesktopFrame> ScreenCapturerLinux::CaptureScreen() { |
| 294 std::unique_ptr<SharedDesktopFrame> frame = queue_.current_frame()->Share(); | 294 std::unique_ptr<SharedDesktopFrame> frame = queue_.current_frame()->Share(); |
| 295 assert(x_server_pixel_buffer_.window_size().equals(frame->size())); | 295 RTC_DCHECK(x_server_pixel_buffer_.window_size().equals(frame->size())); |
| 296 | 296 |
| 297 // Pass the screen size to the helper, so it can clip the invalid region if it | 297 // Pass the screen size to the helper, so it can clip the invalid region if it |
| 298 // expands that region to a grid. | 298 // expands that region to a grid. |
| 299 helper_.set_size_most_recent(frame->size()); | 299 helper_.set_size_most_recent(frame->size()); |
| 300 | 300 |
| 301 // In the DAMAGE case, ensure the frame is up-to-date with the previous frame | 301 // In the DAMAGE case, ensure the frame is up-to-date with the previous frame |
| 302 // if any. If there isn't a previous frame, that means a screen-resolution | 302 // if any. If there isn't a previous frame, that means a screen-resolution |
| 303 // change occurred, and |invalid_rects| will be updated to include the whole | 303 // change occurred, and |invalid_rects| will be updated to include the whole |
| 304 // screen. | 304 // screen. |
| 305 if (use_damage_ && queue_.previous_frame()) | 305 if (use_damage_ && queue_.previous_frame()) |
| (...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 409 | 409 |
| 410 std::unique_ptr<ScreenCapturerLinux> capturer(new ScreenCapturerLinux()); | 410 std::unique_ptr<ScreenCapturerLinux> capturer(new ScreenCapturerLinux()); |
| 411 if (!capturer.get()->Init(options)) { | 411 if (!capturer.get()->Init(options)) { |
| 412 return nullptr; | 412 return nullptr; |
| 413 } | 413 } |
| 414 | 414 |
| 415 return capturer; | 415 return capturer; |
| 416 } | 416 } |
| 417 | 417 |
| 418 } // namespace webrtc | 418 } // namespace webrtc |
| OLD | NEW |