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

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

Issue 1958113003: Remove SendPacer from ViEEncoder and make sure SendPacer starts at a valid bitrate (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Removed initial bitrate from PacedSender. Updated unittests. 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 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 // 6. For each available raw video frame call EncodeVideoFrame. 52 // 6. For each available raw video frame call EncodeVideoFrame.
53 class ViEEncoder : public VideoEncoderRateObserver, 53 class ViEEncoder : public VideoEncoderRateObserver,
54 public EncodedImageCallback, 54 public EncodedImageCallback,
55 public VCMSendStatisticsCallback { 55 public VCMSendStatisticsCallback {
56 public: 56 public:
57 friend class ViEBitrateObserver; 57 friend class ViEBitrateObserver;
58 58
59 ViEEncoder(uint32_t number_of_cores, 59 ViEEncoder(uint32_t number_of_cores,
60 ProcessThread* module_process_thread, 60 ProcessThread* module_process_thread,
61 SendStatisticsProxy* stats_proxy, 61 SendStatisticsProxy* stats_proxy,
62 // TODO(nisse): Used only for tests, delete? 62 OveruseFrameDetector* overuse_detector);
63 rtc::VideoSinkInterface<VideoFrame>* pre_encode_callback,
64 OveruseFrameDetector* overuse_detector,
65 PacedSender* pacer);
66 ~ViEEncoder(); 63 ~ViEEncoder();
67 64
68 vcm::VideoSender* video_sender(); 65 vcm::VideoSender* video_sender();
69 66
70 void SetNetworkTransmissionState(bool is_transmitting); 67 void SetNetworkTransmissionState(bool is_transmitting);
71 68
72 // Returns the id of the owning channel. 69 // Returns the id of the owning channel.
73 int Owner() const; 70 int Owner() const;
74 71
75 void Start(); 72 void Start();
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
126 123
127 const uint32_t number_of_cores_; 124 const uint32_t number_of_cores_;
128 125
129 const std::unique_ptr<VideoProcessing> vp_; 126 const std::unique_ptr<VideoProcessing> vp_;
130 const std::unique_ptr<QMVideoSettingsCallback> qm_callback_; 127 const std::unique_ptr<QMVideoSettingsCallback> qm_callback_;
131 vcm::VideoSender video_sender_; 128 vcm::VideoSender video_sender_;
132 129
133 rtc::CriticalSection data_cs_; 130 rtc::CriticalSection data_cs_;
134 131
135 SendStatisticsProxy* const stats_proxy_; 132 SendStatisticsProxy* const stats_proxy_;
136 rtc::VideoSinkInterface<VideoFrame>* const pre_encode_callback_;
137 OveruseFrameDetector* const overuse_detector_; 133 OveruseFrameDetector* const overuse_detector_;
138 PacedSender* const pacer_;
139 134
140 // The time we last received an input frame or encoded frame. This is used to 135 // The time we last received an input frame or encoded frame. This is used to
141 // track when video is stopped long enough that we also want to stop sending 136 // track when video is stopped long enough that we also want to stop sending
142 // padding. 137 // padding.
143 int64_t time_of_last_frame_activity_ms_ GUARDED_BY(data_cs_); 138 int64_t time_of_last_frame_activity_ms_ GUARDED_BY(data_cs_);
144 VideoCodec encoder_config_ GUARDED_BY(data_cs_); 139 VideoCodec encoder_config_ GUARDED_BY(data_cs_);
145 int min_transmit_bitrate_bps_ GUARDED_BY(data_cs_); 140 int min_transmit_bitrate_bps_ GUARDED_BY(data_cs_);
146 uint32_t last_observed_bitrate_bps_ GUARDED_BY(data_cs_); 141 uint32_t last_observed_bitrate_bps_ GUARDED_BY(data_cs_);
147 bool network_is_transmitting_ GUARDED_BY(data_cs_); 142 bool network_is_transmitting_ GUARDED_BY(data_cs_);
148 bool encoder_paused_ GUARDED_BY(data_cs_); 143 bool encoder_paused_ GUARDED_BY(data_cs_);
149 bool encoder_paused_and_dropped_frame_ GUARDED_BY(data_cs_); 144 bool encoder_paused_and_dropped_frame_ GUARDED_BY(data_cs_);
150 145
151 rtc::CriticalSection sink_cs_; 146 rtc::CriticalSection sink_cs_;
152 EncodedImageCallback* sink_ GUARDED_BY(sink_cs_); 147 EncodedImageCallback* sink_ GUARDED_BY(sink_cs_);
153 148
154 ProcessThread* module_process_thread_; 149 ProcessThread* module_process_thread_;
155 150
156 bool has_received_sli_ GUARDED_BY(data_cs_); 151 bool has_received_sli_ GUARDED_BY(data_cs_);
157 uint8_t picture_id_sli_ GUARDED_BY(data_cs_); 152 uint8_t picture_id_sli_ GUARDED_BY(data_cs_);
158 bool has_received_rpsi_ GUARDED_BY(data_cs_); 153 bool has_received_rpsi_ GUARDED_BY(data_cs_);
159 uint64_t picture_id_rpsi_ GUARDED_BY(data_cs_); 154 uint64_t picture_id_rpsi_ GUARDED_BY(data_cs_);
160 155
161 bool video_suspended_ GUARDED_BY(data_cs_); 156 bool video_suspended_ GUARDED_BY(data_cs_);
162 }; 157 };
163 158
164 } // namespace webrtc 159 } // namespace webrtc
165 160
166 #endif // WEBRTC_VIDEO_VIE_ENCODER_H_ 161 #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