 Chromium Code Reviews
 Chromium Code Reviews Issue 1988783003:
  Use std::unique_ptr<> to pass frame ownership in DesktopCapturer impls.  (Closed) 
  Base URL: https://chromium.googlesource.com/external/webrtc.git@master
    
  
    Issue 1988783003:
  Use std::unique_ptr<> to pass frame ownership in DesktopCapturer impls.  (Closed) 
  Base URL: https://chromium.googlesource.com/external/webrtc.git@master| 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 88 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 99 | 99 | 
| 100 // Makes sure the current frame exists and matches |size|. | 100 // Makes sure the current frame exists and matches |size|. | 
| 101 void CreateCurrentFrameIfNecessary(const DesktopSize& size); | 101 void CreateCurrentFrameIfNecessary(const DesktopSize& size); | 
| 102 | 102 | 
| 103 // Start the fallback capturer and select the screen. | 103 // Start the fallback capturer and select the screen. | 
| 104 void StartFallbackCapturer(); | 104 void StartFallbackCapturer(); | 
| 105 | 105 | 
| 106 static Atomic32 tls_index_; | 106 static Atomic32 tls_index_; | 
| 107 | 107 | 
| 108 std::unique_ptr<ScreenCapturer> fallback_capturer_; | 108 std::unique_ptr<ScreenCapturer> fallback_capturer_; | 
| 109 bool fallback_capturer_started_; | 109 bool fallback_capturer_started_ = false; | 
| 110 Callback* callback_; | 110 Callback* callback_ = nullptr; | 
| 111 std::unique_ptr<SharedMemoryFactory> shared_memory_factory_; | 111 std::unique_ptr<SharedMemoryFactory> shared_memory_factory_; | 
| 112 ScreenId current_screen_id_; | 112 ScreenId current_screen_id_ = kFullDesktopScreenId; | 
| 113 std::wstring current_device_key_; | 113 std::wstring current_device_key_; | 
| 114 HWND excluded_window_; | 114 HWND excluded_window_ = nullptr; | 
| 
Wez
2016/05/18 01:29:50
nit: See comments elsewhere re leaving Windows han
 
Sergey Ulanov
2016/05/31 12:02:49
Done.
 | |
| 115 | 115 | 
| 116 // A thread-safe list of invalid rectangles, and the size of the most | 116 // A thread-safe list of invalid rectangles, and the size of the most | 
| 117 // recently captured screen. | 117 // recently captured screen. | 
| 118 ScreenCapturerHelper helper_; | 118 ScreenCapturerHelper helper_; | 
| 119 | 119 | 
| 120 // Queue of the frames buffers. | 120 // Queue of the frames buffers. | 
| 121 ScreenCaptureFrameQueue<SharedDesktopFrame> queue_; | 121 ScreenCaptureFrameQueue<SharedDesktopFrame> queue_; | 
| 122 | 122 | 
| 123 // Class to calculate the difference between two screen bitmaps. | 123 // Class to calculate the difference between two screen bitmaps. | 
| 124 std::unique_ptr<Differ> differ_; | 124 std::unique_ptr<Differ> differ_; | 
| 125 | 125 | 
| 126 // Used to suppress duplicate logging of SetThreadExecutionState errors. | 126 // Used to suppress duplicate logging of SetThreadExecutionState errors. | 
| 127 bool set_thread_execution_state_failed_; | 127 bool set_thread_execution_state_failed_ = false; | 
| 128 | 128 | 
| 129 ScopedThreadDesktop desktop_; | 129 ScopedThreadDesktop desktop_; | 
| 130 | 130 | 
| 131 // Used for getting the screen dpi. | 131 // Used for getting the screen dpi. | 
| 132 HDC desktop_dc_; | 132 HDC desktop_dc_ = nullptr; | 
| 133 | 133 | 
| 134 HMODULE mag_lib_handle_; | 134 HMODULE mag_lib_handle_ = nullptr; | 
| 135 MagInitializeFunc mag_initialize_func_; | 135 MagInitializeFunc mag_initialize_func_ = nullptr; | 
| 136 MagUninitializeFunc mag_uninitialize_func_; | 136 MagUninitializeFunc mag_uninitialize_func_ = nullptr; | 
| 137 MagSetWindowSourceFunc set_window_source_func_; | 137 MagSetWindowSourceFunc set_window_source_func_ = nullptr; | 
| 138 MagSetWindowFilterListFunc set_window_filter_list_func_; | 138 MagSetWindowFilterListFunc set_window_filter_list_func_ = nullptr; | 
| 139 MagSetImageScalingCallbackFunc set_image_scaling_callback_func_; | 139 MagSetImageScalingCallbackFunc set_image_scaling_callback_func_ = nullptr; | 
| 140 | 140 | 
| 141 // The hidden window hosting the magnifier control. | 141 // The hidden window hosting the magnifier control. | 
| 142 HWND host_window_; | 142 HWND host_window_ = nullptr; | 
| 143 // The magnifier control that captures the screen. | 143 // The magnifier control that captures the screen. | 
| 144 HWND magnifier_window_; | 144 HWND magnifier_window_ = nullptr; | 
| 145 | 145 | 
| 146 // True if the magnifier control has been successfully initialized. | 146 // True if the magnifier control has been successfully initialized. | 
| 147 bool magnifier_initialized_; | 147 bool magnifier_initialized_ = false; | 
| 148 | 148 | 
| 149 // True if the last OnMagImageScalingCallback was called and handled | 149 // True if the last OnMagImageScalingCallback was called and handled | 
| 150 // successfully. Reset at the beginning of each CaptureImage call. | 150 // successfully. Reset at the beginning of each CaptureImage call. | 
| 151 bool magnifier_capture_succeeded_; | 151 bool magnifier_capture_succeeded_ = true; | 
| 152 | 152 | 
| 153 RTC_DISALLOW_COPY_AND_ASSIGN(ScreenCapturerWinMagnifier); | 153 RTC_DISALLOW_COPY_AND_ASSIGN(ScreenCapturerWinMagnifier); | 
| 154 }; | 154 }; | 
| 155 | 155 | 
| 156 } // namespace webrtc | 156 } // namespace webrtc | 
| 157 | 157 | 
| 158 #endif // WEBRTC_MODULES_DESKTOP_CAPTURE_WIN_SCREEN_CAPTURER_WIN_MAGNIFIER_H_ | 158 #endif // WEBRTC_MODULES_DESKTOP_CAPTURE_WIN_SCREEN_CAPTURER_WIN_MAGNIFIER_H_ | 
| OLD | NEW |