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

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

Issue 1231273004: Base padding bitrate for an encoder on the bitrate allocated for that encoder, rather than the tota… (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Addressed comments Created 5 years, 5 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_engine/vie_channel_group.cc ('k') | webrtc/video_engine/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 159 matching lines...) Expand 10 before | Expand all | Expand 10 after
170 170
171 // New-style callbacks, used by VideoSendStream. 171 // New-style callbacks, used by VideoSendStream.
172 void RegisterPreEncodeCallback(I420FrameCallback* pre_encode_callback); 172 void RegisterPreEncodeCallback(I420FrameCallback* pre_encode_callback);
173 void RegisterPostEncodeImageCallback( 173 void RegisterPostEncodeImageCallback(
174 EncodedImageCallback* post_encode_callback); 174 EncodedImageCallback* post_encode_callback);
175 175
176 void RegisterSendStatisticsProxy(SendStatisticsProxy* send_statistics_proxy); 176 void RegisterSendStatisticsProxy(SendStatisticsProxy* send_statistics_proxy);
177 177
178 int channel_id() const { return channel_id_; } 178 int channel_id() const { return channel_id_; }
179 179
180 int GetPaddingNeededBps(int bitrate_bps) const; 180 int GetPaddingNeededBps() const;
181 181
182 protected: 182 protected:
183 // Called by BitrateObserver. 183 // Called by BitrateObserver.
184 void OnNetworkChanged(uint32_t bitrate_bps, 184 void OnNetworkChanged(uint32_t bitrate_bps,
185 uint8_t fraction_lost, 185 uint8_t fraction_lost,
186 int64_t round_trip_time_ms); 186 int64_t round_trip_time_ms);
187 187
188 private: 188 private:
189 bool EncoderPaused() const EXCLUSIVE_LOCKS_REQUIRED(data_cs_); 189 bool EncoderPaused() const EXCLUSIVE_LOCKS_REQUIRED(data_cs_);
190 void TraceFrameDropStart() EXCLUSIVE_LOCKS_REQUIRED(data_cs_); 190 void TraceFrameDropStart() EXCLUSIVE_LOCKS_REQUIRED(data_cs_);
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
238 bool video_suspended_ GUARDED_BY(data_cs_); 238 bool video_suspended_ GUARDED_BY(data_cs_);
239 I420FrameCallback* pre_encode_callback_ GUARDED_BY(callback_cs_); 239 I420FrameCallback* pre_encode_callback_ GUARDED_BY(callback_cs_);
240 const int64_t start_ms_; 240 const int64_t start_ms_;
241 241
242 SendStatisticsProxy* send_statistics_proxy_ GUARDED_BY(callback_cs_); 242 SendStatisticsProxy* send_statistics_proxy_ GUARDED_BY(callback_cs_);
243 }; 243 };
244 244
245 } // namespace webrtc 245 } // namespace webrtc
246 246
247 #endif // WEBRTC_VIDEO_ENGINE_VIE_ENCODER_H_ 247 #endif // WEBRTC_VIDEO_ENGINE_VIE_ENCODER_H_
OLDNEW
« no previous file with comments | « webrtc/video_engine/vie_channel_group.cc ('k') | webrtc/video_engine/vie_encoder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698