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

Side by Side Diff: webrtc/modules/desktop_capture/x11/x_server_pixel_buffer.h

Issue 2775793003: Update XServerPixelBuffer to handle shmget() errors properly. (Closed)
Patch Set: . Created 3 years, 8 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
« no previous file with comments | « no previous file | webrtc/modules/desktop_capture/x11/x_server_pixel_buffer.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 // beginning. 51 // beginning.
52 void Synchronize(); 52 void Synchronize();
53 53
54 // Capture the specified rectangle and stores it in the |frame|. In the case 54 // Capture the specified rectangle and stores it in the |frame|. In the case
55 // where the full-screen data is captured by Synchronize(), this simply 55 // where the full-screen data is captured by Synchronize(), this simply
56 // returns the pointer without doing any more work. The caller must ensure 56 // returns the pointer without doing any more work. The caller must ensure
57 // that |rect| is not larger than window_size(). 57 // that |rect| is not larger than window_size().
58 bool CaptureRect(const DesktopRect& rect, DesktopFrame* frame); 58 bool CaptureRect(const DesktopRect& rect, DesktopFrame* frame);
59 59
60 private: 60 private:
61 void ReleaseSharedMemorySegment();
62
61 void InitShm(const XWindowAttributes& attributes); 63 void InitShm(const XWindowAttributes& attributes);
62 bool InitPixmaps(int depth); 64 bool InitPixmaps(int depth);
63 65
64 // We expose two forms of blitting to handle variations in the pixel format. 66 // We expose two forms of blitting to handle variations in the pixel format.
65 // In FastBlit(), the operation is effectively a memcpy. 67 // In FastBlit(), the operation is effectively a memcpy.
66 void FastBlit(uint8_t* image, 68 void FastBlit(uint8_t* image,
67 const DesktopRect& rect, 69 const DesktopRect& rect,
68 DesktopFrame* frame); 70 DesktopFrame* frame);
69 void SlowBlit(uint8_t* image, 71 void SlowBlit(uint8_t* image,
70 const DesktopRect& rect, 72 const DesktopRect& rect,
71 DesktopFrame* frame); 73 DesktopFrame* frame);
72 74
73 Display* display_ = nullptr; 75 Display* display_ = nullptr;
74 Window window_ = 0; 76 Window window_ = 0;
75 DesktopSize window_size_; 77 DesktopSize window_size_;
76 XImage* x_image_ = nullptr; 78 XImage* x_image_ = nullptr;
77 XShmSegmentInfo* shm_segment_info_ = nullptr; 79 XShmSegmentInfo* shm_segment_info_ = nullptr;
78 Pixmap shm_pixmap_ = 0; 80 Pixmap shm_pixmap_ = 0;
79 GC shm_gc_ = nullptr; 81 GC shm_gc_ = nullptr;
80 bool xshm_get_image_succeeded_ = false; 82 bool xshm_get_image_succeeded_ = false;
81 83
82 RTC_DISALLOW_COPY_AND_ASSIGN(XServerPixelBuffer); 84 RTC_DISALLOW_COPY_AND_ASSIGN(XServerPixelBuffer);
83 }; 85 };
84 86
85 } // namespace webrtc 87 } // namespace webrtc
86 88
87 #endif // WEBRTC_MODULES_DESKTOP_CAPTURE_X11_X_SERVER_PIXEL_BUFFER_H_ 89 #endif // WEBRTC_MODULES_DESKTOP_CAPTURE_X11_X_SERVER_PIXEL_BUFFER_H_
OLDNEW
« no previous file with comments | « no previous file | webrtc/modules/desktop_capture/x11/x_server_pixel_buffer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698