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

Side by Side Diff: webrtc/video/vie_encoder.h

Issue 1917793002: Remove SendPacer from ViEEncoder (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Renamed SenderDelegate to PacketSender. Created 4 years, 7 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 | « webrtc/video/video_send_stream.cc ('k') | webrtc/video/vie_encoder.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 /* 1 /*
2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2012 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
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 public EncodedImageCallback, 54 public EncodedImageCallback,
55 public VCMPacketizationCallback, 55 public VCMPacketizationCallback,
56 public VCMSendStatisticsCallback { 56 public VCMSendStatisticsCallback {
57 public: 57 public:
58 friend class ViEBitrateObserver; 58 friend class ViEBitrateObserver;
59 59
60 ViEEncoder(uint32_t number_of_cores, 60 ViEEncoder(uint32_t number_of_cores,
61 const std::vector<uint32_t>& ssrcs, 61 const std::vector<uint32_t>& ssrcs,
62 ProcessThread* module_process_thread, 62 ProcessThread* module_process_thread,
63 SendStatisticsProxy* stats_proxy, 63 SendStatisticsProxy* stats_proxy,
64 // TODO(nisse): Used only for tests, delete? 64 OveruseFrameDetector* overuse_detector);
65 rtc::VideoSinkInterface<VideoFrame>* pre_encode_callback,
66 OveruseFrameDetector* overuse_detector,
67 PacedSender* pacer);
68 ~ViEEncoder(); 65 ~ViEEncoder();
69 66
70 bool Init(); 67 bool Init();
71 68
72 vcm::VideoSender* video_sender(); 69 vcm::VideoSender* video_sender();
73 70
74 void SetNetworkTransmissionState(bool is_transmitting); 71 void SetNetworkTransmissionState(bool is_transmitting);
75 72
76 // Returns the id of the owning channel. 73 // Returns the id of the owning channel.
77 int Owner() const; 74 int Owner() const;
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
136 const uint32_t number_of_cores_; 133 const uint32_t number_of_cores_;
137 const std::vector<uint32_t> ssrcs_; 134 const std::vector<uint32_t> ssrcs_;
138 135
139 const std::unique_ptr<VideoProcessing> vp_; 136 const std::unique_ptr<VideoProcessing> vp_;
140 const std::unique_ptr<QMVideoSettingsCallback> qm_callback_; 137 const std::unique_ptr<QMVideoSettingsCallback> qm_callback_;
141 vcm::VideoSender video_sender_; 138 vcm::VideoSender video_sender_;
142 139
143 rtc::CriticalSection data_cs_; 140 rtc::CriticalSection data_cs_;
144 141
145 SendStatisticsProxy* const stats_proxy_; 142 SendStatisticsProxy* const stats_proxy_;
146 rtc::VideoSinkInterface<VideoFrame>* const pre_encode_callback_;
147 OveruseFrameDetector* const overuse_detector_; 143 OveruseFrameDetector* const overuse_detector_;
148 PacedSender* const pacer_;
149 144
150 // The time we last received an input frame or encoded frame. This is used to 145 // The time we last received an input frame or encoded frame. This is used to
151 // track when video is stopped long enough that we also want to stop sending 146 // track when video is stopped long enough that we also want to stop sending
152 // padding. 147 // padding.
153 int64_t time_of_last_frame_activity_ms_ GUARDED_BY(data_cs_); 148 int64_t time_of_last_frame_activity_ms_ GUARDED_BY(data_cs_);
154 VideoCodec encoder_config_ GUARDED_BY(data_cs_); 149 VideoCodec encoder_config_ GUARDED_BY(data_cs_);
155 int min_transmit_bitrate_bps_ GUARDED_BY(data_cs_); 150 int min_transmit_bitrate_bps_ GUARDED_BY(data_cs_);
156 uint32_t last_observed_bitrate_bps_ GUARDED_BY(data_cs_); 151 uint32_t last_observed_bitrate_bps_ GUARDED_BY(data_cs_);
157 bool network_is_transmitting_ GUARDED_BY(data_cs_); 152 bool network_is_transmitting_ GUARDED_BY(data_cs_);
158 bool encoder_paused_ GUARDED_BY(data_cs_); 153 bool encoder_paused_ GUARDED_BY(data_cs_);
(...skipping 11 matching lines...) Expand all
170 uint64_t picture_id_rpsi_ GUARDED_BY(data_cs_); 165 uint64_t picture_id_rpsi_ GUARDED_BY(data_cs_);
171 166
172 bool video_suspended_ GUARDED_BY(data_cs_); 167 bool video_suspended_ GUARDED_BY(data_cs_);
173 168
174 std::unique_ptr<IvfFileWriter> file_writers_[kMaxLayers] GUARDED_BY(data_cs_); 169 std::unique_ptr<IvfFileWriter> file_writers_[kMaxLayers] GUARDED_BY(data_cs_);
175 }; 170 };
176 171
177 } // namespace webrtc 172 } // namespace webrtc
178 173
179 #endif // WEBRTC_VIDEO_VIE_ENCODER_H_ 174 #endif // WEBRTC_VIDEO_VIE_ENCODER_H_
OLDNEW
« no previous file with comments | « webrtc/video/video_send_stream.cc ('k') | webrtc/video/vie_encoder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698