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

Side by Side Diff: remoting/protocol/webrtc_video_capturer_adapter.h

Issue 1821153003: Avoid using MakeExclusive, which is going to be deleted in webrtc. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed to compile with latest webrtc. 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
« no previous file with comments | « no previous file | remoting/protocol/webrtc_video_capturer_adapter.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 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef REMOTING_PROTOCOL_WEBRTC_VIDEO_CAPTURER_ADAPTER_H_ 5 #ifndef REMOTING_PROTOCOL_WEBRTC_VIDEO_CAPTURER_ADAPTER_H_
6 #define REMOTING_PROTOCOL_WEBRTC_VIDEO_CAPTURER_ADAPTER_H_ 6 #define REMOTING_PROTOCOL_WEBRTC_VIDEO_CAPTURER_ADAPTER_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 #include <stdint.h> 9 #include <stdint.h>
10 10
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 76
77 scoped_ptr<webrtc::DesktopCapturer> desktop_capturer_; 77 scoped_ptr<webrtc::DesktopCapturer> desktop_capturer_;
78 78
79 SizeCallback size_callback_; 79 SizeCallback size_callback_;
80 80
81 // Timer to call CaptureNextFrame(). 81 // Timer to call CaptureNextFrame().
82 scoped_ptr<base::RepeatingTimer> capture_timer_; 82 scoped_ptr<base::RepeatingTimer> capture_timer_;
83 83
84 // Video frame is kept between captures to avoid YUV conversion for static 84 // Video frame is kept between captures to avoid YUV conversion for static
85 // parts of the screen. 85 // parts of the screen.
86 scoped_ptr<cricket::VideoFrame> yuv_frame_; 86 rtc::scoped_refptr<webrtc::I420Buffer> yuv_frame_;
perkj_chrome 2016/03/30 14:58:26 nit: This should use Chromes scoped_refptr - not R
87 87
88 bool capture_pending_ = false; 88 bool capture_pending_ = false;
89 bool paused_ = false; 89 bool paused_ = false;
90 90
91 base::WeakPtrFactory<WebrtcVideoCapturerAdapter> weak_factory_; 91 base::WeakPtrFactory<WebrtcVideoCapturerAdapter> weak_factory_;
92 92
93 DISALLOW_COPY_AND_ASSIGN(WebrtcVideoCapturerAdapter); 93 DISALLOW_COPY_AND_ASSIGN(WebrtcVideoCapturerAdapter);
94 }; 94 };
95 95
96 } // namespace protocol 96 } // namespace protocol
97 } // namespace remoting 97 } // namespace remoting
98 98
99 #endif // REMOTING_PROTOCOL_WEBRTC_VIDEO_CAPTURER_ADAPTER_H_ 99 #endif // REMOTING_PROTOCOL_WEBRTC_VIDEO_CAPTURER_ADAPTER_H_
100
OLDNEW
« no previous file with comments | « no previous file | remoting/protocol/webrtc_video_capturer_adapter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698