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

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

Issue 1745923002: Remove use of deprecated methods to cricket::VideoCapturer in WebrtcVideoCapturerAdapter (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 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 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 class WebrtcVideoCapturerAdapter : public cricket::VideoCapturer, 43 class WebrtcVideoCapturerAdapter : public cricket::VideoCapturer,
44 public webrtc::DesktopCapturer::Callback { 44 public webrtc::DesktopCapturer::Callback {
45 public: 45 public:
46 typedef base::Callback<void(const webrtc::DesktopSize& size)> SizeCallback; 46 typedef base::Callback<void(const webrtc::DesktopSize& size)> SizeCallback;
47 47
48 explicit WebrtcVideoCapturerAdapter( 48 explicit WebrtcVideoCapturerAdapter(
49 scoped_ptr<webrtc::DesktopCapturer> capturer); 49 scoped_ptr<webrtc::DesktopCapturer> capturer);
50 ~WebrtcVideoCapturerAdapter() override; 50 ~WebrtcVideoCapturerAdapter() override;
51 51
52 void SetSizeCallback(const SizeCallback& size_callback); 52 void SetSizeCallback(const SizeCallback& size_callback);
53 bool PauseCapturer(bool pause);
53 base::WeakPtr<WebrtcVideoCapturerAdapter> GetWeakPtr(); 54 base::WeakPtr<WebrtcVideoCapturerAdapter> GetWeakPtr();
54 55
55 // cricket::VideoCapturer implementation. 56 // cricket::VideoCapturer implementation.
56 bool GetBestCaptureFormat(const cricket::VideoFormat& desired, 57 bool GetBestCaptureFormat(const cricket::VideoFormat& desired,
57 cricket::VideoFormat* best_format) override; 58 cricket::VideoFormat* best_format) override;
58 cricket::CaptureState Start( 59 cricket::CaptureState Start(
59 const cricket::VideoFormat& capture_format) override; 60 const cricket::VideoFormat& capture_format) override;
60 bool Pause(bool pause) override;
61 void Stop() override; 61 void Stop() override;
62 bool IsRunning() override; 62 bool IsRunning() override;
63 bool IsScreencast() const override; 63 bool IsScreencast() const override;
64 bool GetPreferredFourccs(std::vector<uint32_t>* fourccs) override; 64 bool GetPreferredFourccs(std::vector<uint32_t>* fourccs) override;
65 65
66 private: 66 private:
67 // webrtc::DesktopCapturer::Callback implementation. 67 // webrtc::DesktopCapturer::Callback implementation.
68 webrtc::SharedMemory* CreateSharedMemory(size_t size) override; 68 webrtc::SharedMemory* CreateSharedMemory(size_t size) override;
69 void OnCaptureCompleted(webrtc::DesktopFrame* frame) override; 69 void OnCaptureCompleted(webrtc::DesktopFrame* frame) override;
70 70
71 // Kicks off the next frame capture using |desktop_capturer_|. The captured 71 // Kicks off the next frame capture using |desktop_capturer_|. The captured
72 // frame will be passed to OnCaptureCompleted(). 72 // frame will be passed to OnCaptureCompleted().
73 void CaptureNextFrame(); 73 void CaptureNextFrame();
74 74
75 base::ThreadChecker thread_checker_; 75 base::ThreadChecker thread_checker_;
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 scoped_ptr<cricket::VideoFrame> yuv_frame_;
87 87
88 bool capture_pending_ = false; 88 bool capture_pending_ = false;
89 bool paused_ = false;
89 90
90 base::WeakPtrFactory<WebrtcVideoCapturerAdapter> weak_factory_; 91 base::WeakPtrFactory<WebrtcVideoCapturerAdapter> weak_factory_;
91 92
92 DISALLOW_COPY_AND_ASSIGN(WebrtcVideoCapturerAdapter); 93 DISALLOW_COPY_AND_ASSIGN(WebrtcVideoCapturerAdapter);
93 }; 94 };
94 95
95 } // namespace protocol 96 } // namespace protocol
96 } // namespace remoting 97 } // namespace remoting
97 98
98 #endif // REMOTING_PROTOCOL_WEBRTC_VIDEO_CAPTURER_ADAPTER_H_ 99 #endif // REMOTING_PROTOCOL_WEBRTC_VIDEO_CAPTURER_ADAPTER_H_
99 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