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

Side by Side Diff: webrtc/modules/remote_bitrate_estimator/transport_feedback_adapter.cc

Issue 2086633002: Revert of Remove audio/video distinction for probe packets. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 6 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) 2015 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2015 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 52
53 void TransportFeedbackAdapter::SetBitrateEstimator( 53 void TransportFeedbackAdapter::SetBitrateEstimator(
54 RemoteBitrateEstimator* rbe) { 54 RemoteBitrateEstimator* rbe) {
55 if (bitrate_estimator_.get() != rbe) { 55 if (bitrate_estimator_.get() != rbe) {
56 bitrate_estimator_.reset(rbe); 56 bitrate_estimator_.reset(rbe);
57 } 57 }
58 } 58 }
59 59
60 void TransportFeedbackAdapter::AddPacket(uint16_t sequence_number, 60 void TransportFeedbackAdapter::AddPacket(uint16_t sequence_number,
61 size_t length, 61 size_t length,
62 bool was_paced,
62 int probe_cluster_id) { 63 int probe_cluster_id) {
63 rtc::CritScope cs(&lock_); 64 rtc::CritScope cs(&lock_);
64 send_time_history_.AddAndRemoveOld(sequence_number, length, probe_cluster_id); 65 send_time_history_.AddAndRemoveOld(sequence_number, length, was_paced,
66 probe_cluster_id);
65 } 67 }
66 68
67 void TransportFeedbackAdapter::OnSentPacket(uint16_t sequence_number, 69 void TransportFeedbackAdapter::OnSentPacket(uint16_t sequence_number,
68 int64_t send_time_ms) { 70 int64_t send_time_ms) {
69 rtc::CritScope cs(&lock_); 71 rtc::CritScope cs(&lock_);
70 send_time_history_.OnSentPacket(sequence_number, send_time_ms); 72 send_time_history_.OnSentPacket(sequence_number, send_time_ms);
71 } 73 }
72 74
73 void TransportFeedbackAdapter::OnTransportFeedback( 75 void TransportFeedbackAdapter::OnTransportFeedback(
74 const rtcp::TransportFeedback& feedback) { 76 const rtcp::TransportFeedback& feedback) {
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
136 bitrate_controller_->UpdateDelayBasedEstimate(bitrate); 138 bitrate_controller_->UpdateDelayBasedEstimate(bitrate);
137 } 139 }
138 140
139 void TransportFeedbackAdapter::OnRttUpdate(int64_t avg_rtt_ms, 141 void TransportFeedbackAdapter::OnRttUpdate(int64_t avg_rtt_ms,
140 int64_t max_rtt_ms) { 142 int64_t max_rtt_ms) {
141 RTC_DCHECK(bitrate_estimator_.get() != nullptr); 143 RTC_DCHECK(bitrate_estimator_.get() != nullptr);
142 bitrate_estimator_->OnRttUpdate(avg_rtt_ms, max_rtt_ms); 144 bitrate_estimator_->OnRttUpdate(avg_rtt_ms, max_rtt_ms);
143 } 145 }
144 146
145 } // namespace webrtc 147 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698