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

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

Issue 2390463002: Remove OnLocalSsrcChanged and rename EncoderStateFeedback. (Closed)
Patch Set: 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
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 314 matching lines...) Expand 10 before | Expand all | Expand 10 after
325 rtc::CriticalSection ivf_writers_crit_; 325 rtc::CriticalSection ivf_writers_crit_;
326 std::unique_ptr<IvfFileWriter> file_writers_[kMaxSimulcastStreams] GUARDED_BY( 326 std::unique_ptr<IvfFileWriter> file_writers_[kMaxSimulcastStreams] GUARDED_BY(
327 ivf_writers_crit_); 327 ivf_writers_crit_);
328 328
329 int max_padding_bitrate_; 329 int max_padding_bitrate_;
330 int encoder_min_bitrate_bps_; 330 int encoder_min_bitrate_bps_;
331 uint32_t encoder_max_bitrate_bps_; 331 uint32_t encoder_max_bitrate_bps_;
332 uint32_t encoder_target_rate_bps_; 332 uint32_t encoder_target_rate_bps_;
333 333
334 ViEEncoder* const vie_encoder_; 334 ViEEncoder* const vie_encoder_;
335 EncoderStateFeedback encoder_feedback_; 335 EncoderRtcpFeedback encoder_feedback_;
336 ProtectionBitrateCalculator protection_bitrate_calculator_; 336 ProtectionBitrateCalculator protection_bitrate_calculator_;
337 337
338 const std::unique_ptr<RtcpBandwidthObserver> bandwidth_observer_; 338 const std::unique_ptr<RtcpBandwidthObserver> bandwidth_observer_;
339 // RtpRtcp modules, declared here as they use other members on construction. 339 // RtpRtcp modules, declared here as they use other members on construction.
340 const std::vector<RtpRtcp*> rtp_rtcp_modules_; 340 const std::vector<RtpRtcp*> rtp_rtcp_modules_;
341 PayloadRouter payload_router_; 341 PayloadRouter payload_router_;
342 }; 342 };
343 343
344 // TODO(tommi): See if there's a more elegant way to create a task that creates 344 // TODO(tommi): See if there's a more elegant way to create a task that creates
345 // an object on the correct task queue. 345 // an object on the correct task queue.
(...skipping 762 matching lines...) Expand 10 before | Expand all | Expand 10 after
1108 &module_nack_rate); 1108 &module_nack_rate);
1109 *sent_video_rate_bps += module_video_rate; 1109 *sent_video_rate_bps += module_video_rate;
1110 *sent_nack_rate_bps += module_nack_rate; 1110 *sent_nack_rate_bps += module_nack_rate;
1111 *sent_fec_rate_bps += module_fec_rate; 1111 *sent_fec_rate_bps += module_fec_rate;
1112 } 1112 }
1113 return 0; 1113 return 0;
1114 } 1114 }
1115 1115
1116 } // namespace internal 1116 } // namespace internal
1117 } // namespace webrtc 1117 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698