OLD | NEW |
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_VIDEO_FRAME_PUMP_H_ | 5 #ifndef REMOTING_PROTOCOL_VIDEO_FRAME_PUMP_H_ |
6 #define REMOTING_PROTOCOL_VIDEO_FRAME_PUMP_H_ | 6 #define REMOTING_PROTOCOL_VIDEO_FRAME_PUMP_H_ |
7 | 7 |
8 #include <stddef.h> | 8 #include <stddef.h> |
9 #include <stdint.h> | 9 #include <stdint.h> |
10 | 10 |
11 #include <memory> | 11 #include <memory> |
| 12 #include <vector> |
12 | 13 |
13 #include "base/macros.h" | 14 #include "base/macros.h" |
14 #include "base/memory/scoped_vector.h" | |
15 #include "base/threading/thread_checker.h" | 15 #include "base/threading/thread_checker.h" |
16 #include "base/time/time.h" | 16 #include "base/time/time.h" |
17 #include "base/timer/timer.h" | 17 #include "base/timer/timer.h" |
18 #include "remoting/codec/video_encoder.h" | 18 #include "remoting/codec/video_encoder.h" |
19 #include "remoting/proto/video.pb.h" | 19 #include "remoting/proto/video.pb.h" |
20 #include "remoting/protocol/capture_scheduler.h" | 20 #include "remoting/protocol/capture_scheduler.h" |
21 #include "remoting/protocol/video_stream.h" | 21 #include "remoting/protocol/video_stream.h" |
22 #include "third_party/webrtc/modules/desktop_capture/desktop_capturer.h" | 22 #include "third_party/webrtc/modules/desktop_capture/desktop_capturer.h" |
23 | 23 |
24 namespace base { | 24 namespace base { |
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
172 | 172 |
173 // CaptureScheduler calls CaptureNextFrame() whenever a new frame needs to be | 173 // CaptureScheduler calls CaptureNextFrame() whenever a new frame needs to be |
174 // captured. | 174 // captured. |
175 CaptureScheduler capture_scheduler_; | 175 CaptureScheduler capture_scheduler_; |
176 | 176 |
177 // Timestamps for the frame that's being captured. | 177 // Timestamps for the frame that's being captured. |
178 std::unique_ptr<FrameTimestamps> captured_frame_timestamps_; | 178 std::unique_ptr<FrameTimestamps> captured_frame_timestamps_; |
179 | 179 |
180 bool send_pending_ = false; | 180 bool send_pending_ = false; |
181 | 181 |
182 ScopedVector<PacketWithTimestamps> pending_packets_; | 182 std::vector<std::unique_ptr<PacketWithTimestamps>> pending_packets_; |
183 | 183 |
184 base::ThreadChecker thread_checker_; | 184 base::ThreadChecker thread_checker_; |
185 | 185 |
186 base::WeakPtrFactory<VideoFramePump> weak_factory_; | 186 base::WeakPtrFactory<VideoFramePump> weak_factory_; |
187 | 187 |
188 DISALLOW_COPY_AND_ASSIGN(VideoFramePump); | 188 DISALLOW_COPY_AND_ASSIGN(VideoFramePump); |
189 }; | 189 }; |
190 | 190 |
191 } // namespace protocol | 191 } // namespace protocol |
192 } // namespace remoting | 192 } // namespace remoting |
193 | 193 |
194 #endif // REMOTING_PROTOCOL_VIDEO_FRAME_PUMP_H_ | 194 #endif // REMOTING_PROTOCOL_VIDEO_FRAME_PUMP_H_ |
OLD | NEW |