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 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
63 | 63 |
64 // We expose two forms of blitting to handle variations in the pixel format. | 64 // We expose two forms of blitting to handle variations in the pixel format. |
65 // In FastBlit(), the operation is effectively a memcpy. | 65 // In FastBlit(), the operation is effectively a memcpy. |
66 void FastBlit(uint8_t* image, | 66 void FastBlit(uint8_t* image, |
67 const DesktopRect& rect, | 67 const DesktopRect& rect, |
68 DesktopFrame* frame); | 68 DesktopFrame* frame); |
69 void SlowBlit(uint8_t* image, | 69 void SlowBlit(uint8_t* image, |
70 const DesktopRect& rect, | 70 const DesktopRect& rect, |
71 DesktopFrame* frame); | 71 DesktopFrame* frame); |
72 | 72 |
73 Display* display_; | 73 Display* display_ = nullptr; |
74 Window window_; | 74 Window window_ = 0; |
75 DesktopSize window_size_; | 75 DesktopSize window_size_; |
76 XImage* x_image_; | 76 XImage* x_image_ = nullptr; |
77 XShmSegmentInfo* shm_segment_info_; | 77 XShmSegmentInfo* shm_segment_info_ = nullptr; |
78 Pixmap shm_pixmap_; | 78 Pixmap shm_pixmap_ = 0; |
79 GC shm_gc_; | 79 GC shm_gc_ = nullptr; |
| 80 bool xshm_get_image_succeeded_ = false; |
80 | 81 |
81 RTC_DISALLOW_COPY_AND_ASSIGN(XServerPixelBuffer); | 82 RTC_DISALLOW_COPY_AND_ASSIGN(XServerPixelBuffer); |
82 }; | 83 }; |
83 | 84 |
84 } // namespace webrtc | 85 } // namespace webrtc |
85 | 86 |
86 #endif // WEBRTC_MODULES_DESKTOP_CAPTURE_X11_X_SERVER_PIXEL_BUFFER_H_ | 87 #endif // WEBRTC_MODULES_DESKTOP_CAPTURE_X11_X_SERVER_PIXEL_BUFFER_H_ |
OLD | NEW |