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

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

Issue 1902323002: Modify ScreenCaptureFrameQueue into a template (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Fix build break in linux Created 4 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
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 <memory>
15
14 #include "webrtc/base/scoped_ref_ptr.h" 16 #include "webrtc/base/scoped_ref_ptr.h"
15 #include "webrtc/modules/desktop_capture/desktop_frame.h" 17 #include "webrtc/modules/desktop_capture/desktop_frame.h"
16 18
17 namespace webrtc { 19 namespace webrtc {
18 20
19 // SharedDesktopFrame is a DesktopFrame that may have multiple instances all 21 // SharedDesktopFrame is a DesktopFrame that may have multiple instances all
20 // sharing the same buffer. 22 // sharing the same buffer.
21 class SharedDesktopFrame : public DesktopFrame { 23 class SharedDesktopFrame : public DesktopFrame {
22 public: 24 public:
23 virtual ~SharedDesktopFrame(); 25 virtual ~SharedDesktopFrame();
24 26
25 static SharedDesktopFrame* Wrap(DesktopFrame* desktop_frame); 27 static std::unique_ptr<SharedDesktopFrame> Wrap(
Sergey Ulanov 2016/04/20 21:22:34 This will break code in chromium that currently us
Hzj_jie 2016/04/20 23:56:16 Oh, I thought this function is only used in webrtc
28 std::unique_ptr<DesktopFrame>&& desktop_frame);
26 29
27 // Returns the underlying instance of DesktopFrame. 30 // Returns the underlying instance of DesktopFrame.
28 DesktopFrame* GetUnderlyingFrame(); 31 DesktopFrame* GetUnderlyingFrame();
29 32
30 // Creates a clone of this object. 33 // Creates a clone of this object.
31 SharedDesktopFrame* Share(); 34 SharedDesktopFrame* Share();
32 35
33 // Checks if the frame is currently shared. If it returns false it's 36 // Checks if the frame is currently shared. If it returns false it's
34 // guaranteed that there are no clones of the object. 37 // guaranteed that there are no clones of the object.
35 bool IsShared(); 38 bool IsShared();
36 39
37 private: 40 private:
38 class Core; 41 class Core;
39 42
40 SharedDesktopFrame(rtc::scoped_refptr<Core> core); 43 SharedDesktopFrame(rtc::scoped_refptr<Core> core);
41 44
42 rtc::scoped_refptr<Core> core_; 45 rtc::scoped_refptr<Core> core_;
43 46
44 RTC_DISALLOW_COPY_AND_ASSIGN(SharedDesktopFrame); 47 RTC_DISALLOW_COPY_AND_ASSIGN(SharedDesktopFrame);
45 }; 48 };
46 49
47 } // namespace webrtc 50 } // namespace webrtc
48 51
49 #endif // WEBRTC_MODULES_DESKTOP_CAPTURE_SHARED_DESKTOP_FRAME_H_ 52 #endif // WEBRTC_MODULES_DESKTOP_CAPTURE_SHARED_DESKTOP_FRAME_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698