| 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 |
| 11 #include <string.h> | 11 #include <string.h> |
| 12 | 12 |
| 13 #include <memory> | 13 #include <memory> |
| 14 #include <set> | 14 #include <set> |
| 15 #include <utility> | 15 #include <utility> |
| 16 | 16 |
| 17 #include <X11/extensions/Xdamage.h> | 17 #include <X11/extensions/Xdamage.h> |
| 18 #include <X11/extensions/Xfixes.h> | 18 #include <X11/extensions/Xfixes.h> |
| 19 #include <X11/Xlib.h> | 19 #include <X11/Xlib.h> |
| 20 #include <X11/Xutil.h> | 20 #include <X11/Xutil.h> |
| 21 | 21 |
| 22 #include "webrtc/base/checks.h" | 22 #include "webrtc/base/checks.h" |
| 23 #include "webrtc/base/constructormagic.h" | 23 #include "webrtc/base/constructormagic.h" |
| 24 #include "webrtc/base/logging.h" |
| 24 #include "webrtc/base/timeutils.h" | 25 #include "webrtc/base/timeutils.h" |
| 25 #include "webrtc/modules/desktop_capture/desktop_capturer.h" | 26 #include "webrtc/modules/desktop_capture/desktop_capturer.h" |
| 26 #include "webrtc/modules/desktop_capture/desktop_capture_options.h" | 27 #include "webrtc/modules/desktop_capture/desktop_capture_options.h" |
| 27 #include "webrtc/modules/desktop_capture/desktop_frame.h" | 28 #include "webrtc/modules/desktop_capture/desktop_frame.h" |
| 28 #include "webrtc/modules/desktop_capture/screen_capture_frame_queue.h" | 29 #include "webrtc/modules/desktop_capture/screen_capture_frame_queue.h" |
| 29 #include "webrtc/modules/desktop_capture/screen_capturer_helper.h" | 30 #include "webrtc/modules/desktop_capture/screen_capturer_helper.h" |
| 30 #include "webrtc/modules/desktop_capture/shared_desktop_frame.h" | 31 #include "webrtc/modules/desktop_capture/shared_desktop_frame.h" |
| 31 #include "webrtc/modules/desktop_capture/x11/x_server_pixel_buffer.h" | 32 #include "webrtc/modules/desktop_capture/x11/x_server_pixel_buffer.h" |
| 32 #include "webrtc/system_wrappers/include/logging.h" | |
| 33 | 33 |
| 34 namespace webrtc { | 34 namespace webrtc { |
| 35 namespace { | 35 namespace { |
| 36 | 36 |
| 37 // A class to perform video frame capturing for Linux. | 37 // A class to perform video frame capturing for Linux. |
| 38 // | 38 // |
| 39 // If XDamage is used, this class sets DesktopFrame::updated_region() according | 39 // If XDamage is used, this class sets DesktopFrame::updated_region() according |
| 40 // to the areas reported by XDamage. Otherwise this class does not detect | 40 // to the areas reported by XDamage. Otherwise this class does not detect |
| 41 // DesktopFrame::updated_region(), the field is always set to the entire frame | 41 // DesktopFrame::updated_region(), the field is always set to the entire frame |
| 42 // rectangle. ScreenCapturerDifferWrapper should be used if that functionality | 42 // rectangle. ScreenCapturerDifferWrapper should be used if that functionality |
| (...skipping 367 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 410 | 410 |
| 411 std::unique_ptr<ScreenCapturerLinux> capturer(new ScreenCapturerLinux()); | 411 std::unique_ptr<ScreenCapturerLinux> capturer(new ScreenCapturerLinux()); |
| 412 if (!capturer.get()->Init(options)) { | 412 if (!capturer.get()->Init(options)) { |
| 413 return nullptr; | 413 return nullptr; |
| 414 } | 414 } |
| 415 | 415 |
| 416 return std::move(capturer); | 416 return std::move(capturer); |
| 417 } | 417 } |
| 418 | 418 |
| 419 } // namespace webrtc | 419 } // namespace webrtc |
| OLD | NEW |