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

Side by Side Diff: webrtc/modules/desktop_capture/shared_desktop_frame.h

Issue 1988783003: 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) 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 #ifndef WEBRTC_MODULES_DESKTOP_CAPTURE_SHARED_DESKTOP_FRAME_H_ 11 #ifndef WEBRTC_MODULES_DESKTOP_CAPTURE_SHARED_DESKTOP_FRAME_H_
12 #define WEBRTC_MODULES_DESKTOP_CAPTURE_SHARED_DESKTOP_FRAME_H_ 12 #define WEBRTC_MODULES_DESKTOP_CAPTURE_SHARED_DESKTOP_FRAME_H_
13 13
14 #include "webrtc/base/constructormagic.h" 14 #include "webrtc/base/constructormagic.h"
15 #include "webrtc/base/refcount.h"
15 #include "webrtc/base/scoped_ref_ptr.h" 16 #include "webrtc/base/scoped_ref_ptr.h"
16 #include "webrtc/modules/desktop_capture/desktop_frame.h" 17 #include "webrtc/modules/desktop_capture/desktop_frame.h"
17 18
18 namespace webrtc { 19 namespace webrtc {
19 20
20 // SharedDesktopFrame is a DesktopFrame that may have multiple instances all 21 // SharedDesktopFrame is a DesktopFrame that may have multiple instances all
21 // sharing the same buffer. 22 // sharing the same buffer.
22 class SharedDesktopFrame : public DesktopFrame { 23 class SharedDesktopFrame : public DesktopFrame {
23 public: 24 public:
24 virtual ~SharedDesktopFrame(); 25 virtual ~SharedDesktopFrame();
25 26
27 static std::unique_ptr<SharedDesktopFrame> Wrap(
28 std::unique_ptr<DesktopFrame> desktop_frame);
29
30 // Deprecated.
31 // TODO(sergeyu): remove this method.
26 static SharedDesktopFrame* Wrap(DesktopFrame* desktop_frame); 32 static SharedDesktopFrame* Wrap(DesktopFrame* desktop_frame);
27 33
28 // Returns the underlying instance of DesktopFrame. 34 // Returns the underlying instance of DesktopFrame.
29 DesktopFrame* GetUnderlyingFrame(); 35 DesktopFrame* GetUnderlyingFrame();
30 36
31 // Creates a clone of this object. 37 // Creates a clone of this object.
32 SharedDesktopFrame* Share(); 38 std::unique_ptr<SharedDesktopFrame> Share();
33 39
34 // Checks if the frame is currently shared. If it returns false it's 40 // Checks if the frame is currently shared. If it returns false it's
35 // guaranteed that there are no clones of the object. 41 // guaranteed that there are no clones of the object.
36 bool IsShared(); 42 bool IsShared();
37 43
38 private: 44 private:
39 class Core; 45 typedef rtc::RefCountedObject<std::unique_ptr<DesktopFrame>> Core;
40 46
41 SharedDesktopFrame(rtc::scoped_refptr<Core> core); 47 SharedDesktopFrame(rtc::scoped_refptr<Core> core);
42 48
43 rtc::scoped_refptr<Core> core_; 49 rtc::scoped_refptr<Core> core_;
44 50
45 RTC_DISALLOW_COPY_AND_ASSIGN(SharedDesktopFrame); 51 RTC_DISALLOW_COPY_AND_ASSIGN(SharedDesktopFrame);
46 }; 52 };
47 53
48 } // namespace webrtc 54 } // namespace webrtc
49 55
50 #endif // WEBRTC_MODULES_DESKTOP_CAPTURE_SHARED_DESKTOP_FRAME_H_ 56 #endif // WEBRTC_MODULES_DESKTOP_CAPTURE_SHARED_DESKTOP_FRAME_H_
OLDNEW
« no previous file with comments | « webrtc/modules/desktop_capture/screen_capturer_x11.cc ('k') | webrtc/modules/desktop_capture/shared_desktop_frame.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698