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

Side by Side Diff: webrtc/modules/desktop_capture/win/screen_capturer_win_directx.h

Issue 2030333003: Revert of Use std::unique_ptr<> to pass frame ownership in DesktopCapturer impls. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 6 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
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2016 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2016 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 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 // ProcessFrame will insert a whole desktop size as updated region instead. 75 // ProcessFrame will insert a whole desktop size as updated region instead.
76 static bool DetectUpdatedRegion(const DXGI_OUTDUPL_FRAME_INFO& frame_info, 76 static bool DetectUpdatedRegion(const DXGI_OUTDUPL_FRAME_INFO& frame_info,
77 DesktopRegion* updated_region); 77 DesktopRegion* updated_region);
78 78
79 // A helper function to handle _com_error result in DetectUpdatedRegion. 79 // A helper function to handle _com_error result in DetectUpdatedRegion.
80 // Returns false if the _com_error shows an error. 80 // Returns false if the _com_error shows an error.
81 static bool HandleDetectUpdatedRegionError(const _com_error& error, 81 static bool HandleDetectUpdatedRegionError(const _com_error& error,
82 const char* stage); 82 const char* stage);
83 83
84 // Processes one frame received from AcquireNextFrame function, returns a 84 // Processes one frame received from AcquireNextFrame function, returns a
85 // nullptr if anything wrong. 85 // nullptr if anything wrong, and Capture function will call
86 // callback_->OnCaptureCompleted(nullptr), otherwise
87 // callback_->OnCaptureCompleted(frame) will be called.
86 std::unique_ptr<DesktopFrame> ProcessFrame( 88 std::unique_ptr<DesktopFrame> ProcessFrame(
87 const DXGI_OUTDUPL_FRAME_INFO& frame_info, 89 const DXGI_OUTDUPL_FRAME_INFO& frame_info,
88 IDXGIResource* resource); 90 IDXGIResource* resource);
89 91
90 // A shortcut to execute callback with current frame in frames. 92 // A shortcut to execute callback with current frame in frames.
91 void EmitCurrentFrame(); 93 void EmitCurrentFrame();
92 94
93 ScreenCaptureFrameQueue<rtc::scoped_refptr<Texture>> surfaces_; 95 ScreenCaptureFrameQueue<rtc::scoped_refptr<Texture>> surfaces_;
94 ScreenCaptureFrameQueue<SharedDesktopFrame> frames_; 96 ScreenCaptureFrameQueue<SharedDesktopFrame> frames_;
95 std::unique_ptr<SharedMemoryFactory> shared_memory_factory_; 97 std::unique_ptr<SharedMemoryFactory> shared_memory_factory_;
96 Callback* callback_ = nullptr; 98 Callback* callback_ = nullptr;
97 99
98 bool set_thread_execution_state_failed_ = false; 100 bool set_thread_execution_state_failed_ = false;
99 101
100 RTC_DISALLOW_COPY_AND_ASSIGN(ScreenCapturerWinDirectx); 102 RTC_DISALLOW_COPY_AND_ASSIGN(ScreenCapturerWinDirectx);
101 }; 103 };
102 104
103 } // namespace webrtc 105 } // namespace webrtc
104 106
105 #endif // WEBRTC_MODULES_DESKTOP_CAPTURE_WIN_SCREEN_CAPTURER_WIN_DIRECTX_H_ 107 #endif // WEBRTC_MODULES_DESKTOP_CAPTURE_WIN_SCREEN_CAPTURER_WIN_DIRECTX_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698