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

Side by Side Diff: webrtc/video/video_send_stream.cc

Issue 2390463002: Remove OnLocalSsrcChanged and rename EncoderStateFeedback. (Closed)
Patch Set: Rebase Created 4 years, 2 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.h ('k') | webrtc/video/webrtc_video.gypi » ('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) 2013 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2013 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 #include "webrtc/video/video_send_stream.h" 10 #include "webrtc/video/video_send_stream.h"
(...skipping 315 matching lines...) Expand 10 before | Expand all | Expand 10 after
326 rtc::CriticalSection ivf_writers_crit_; 326 rtc::CriticalSection ivf_writers_crit_;
327 std::unique_ptr<IvfFileWriter> file_writers_[kMaxSimulcastStreams] GUARDED_BY( 327 std::unique_ptr<IvfFileWriter> file_writers_[kMaxSimulcastStreams] GUARDED_BY(
328 ivf_writers_crit_); 328 ivf_writers_crit_);
329 329
330 int max_padding_bitrate_; 330 int max_padding_bitrate_;
331 int encoder_min_bitrate_bps_; 331 int encoder_min_bitrate_bps_;
332 uint32_t encoder_max_bitrate_bps_; 332 uint32_t encoder_max_bitrate_bps_;
333 uint32_t encoder_target_rate_bps_; 333 uint32_t encoder_target_rate_bps_;
334 334
335 ViEEncoder* const vie_encoder_; 335 ViEEncoder* const vie_encoder_;
336 EncoderStateFeedback encoder_feedback_; 336 EncoderRtcpFeedback encoder_feedback_;
337 ProtectionBitrateCalculator protection_bitrate_calculator_; 337 ProtectionBitrateCalculator protection_bitrate_calculator_;
338 338
339 const std::unique_ptr<RtcpBandwidthObserver> bandwidth_observer_; 339 const std::unique_ptr<RtcpBandwidthObserver> bandwidth_observer_;
340 // RtpRtcp modules, declared here as they use other members on construction. 340 // RtpRtcp modules, declared here as they use other members on construction.
341 const std::vector<RtpRtcp*> rtp_rtcp_modules_; 341 const std::vector<RtpRtcp*> rtp_rtcp_modules_;
342 PayloadRouter payload_router_; 342 PayloadRouter payload_router_;
343 343
344 // |weak_ptr_| to our self. This is used since we can not call 344 // |weak_ptr_| to our self. This is used since we can not call
345 // |weak_ptr_factory_.GetWeakPtr| from multiple sequences but it is ok to copy 345 // |weak_ptr_factory_.GetWeakPtr| from multiple sequences but it is ok to copy
346 // an existing WeakPtr. 346 // an existing WeakPtr.
(...skipping 760 matching lines...) Expand 10 before | Expand all | Expand 10 after
1107 &module_nack_rate); 1107 &module_nack_rate);
1108 *sent_video_rate_bps += module_video_rate; 1108 *sent_video_rate_bps += module_video_rate;
1109 *sent_nack_rate_bps += module_nack_rate; 1109 *sent_nack_rate_bps += module_nack_rate;
1110 *sent_fec_rate_bps += module_fec_rate; 1110 *sent_fec_rate_bps += module_fec_rate;
1111 } 1111 }
1112 return 0; 1112 return 0;
1113 } 1113 }
1114 1114
1115 } // namespace internal 1115 } // namespace internal
1116 } // namespace webrtc 1116 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/video/video_send_stream.h ('k') | webrtc/video/webrtc_video.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698