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

Side by Side Diff: webrtc/modules/congestion_controller/congestion_controller.cc

Issue 2964773002: Revert "Update includes for webrtc/{base => rtc_base} rename (1/3)" (Closed)
Patch Set: Created 3 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
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
11 #include "webrtc/modules/congestion_controller/include/congestion_controller.h" 11 #include "webrtc/modules/congestion_controller/include/congestion_controller.h"
12 12
13 #include <algorithm> 13 #include <algorithm>
14 #include <memory> 14 #include <memory>
15 #include <vector> 15 #include <vector>
16 16
17 #include "webrtc/base/checks.h"
18 #include "webrtc/base/logging.h"
19 #include "webrtc/base/rate_limiter.h"
20 #include "webrtc/base/socket.h"
17 #include "webrtc/modules/bitrate_controller/include/bitrate_controller.h" 21 #include "webrtc/modules/bitrate_controller/include/bitrate_controller.h"
18 #include "webrtc/modules/congestion_controller/probe_controller.h" 22 #include "webrtc/modules/congestion_controller/probe_controller.h"
19 #include "webrtc/modules/remote_bitrate_estimator/include/bwe_defines.h" 23 #include "webrtc/modules/remote_bitrate_estimator/include/bwe_defines.h"
20 #include "webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_s end_time.h" 24 #include "webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_s end_time.h"
21 #include "webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_singl e_stream.h" 25 #include "webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_singl e_stream.h"
22 #include "webrtc/rtc_base/checks.h"
23 #include "webrtc/rtc_base/logging.h"
24 #include "webrtc/rtc_base/rate_limiter.h"
25 #include "webrtc/rtc_base/socket.h"
26 26
27 namespace webrtc { 27 namespace webrtc {
28 28
29 void CongestionController::OnReceivedPacket(int64_t arrival_time_ms, 29 void CongestionController::OnReceivedPacket(int64_t arrival_time_ms,
30 size_t payload_size, 30 size_t payload_size,
31 const RTPHeader& header) { 31 const RTPHeader& header) {
32 receive_side_cc_.OnReceivedPacket(arrival_time_ms, payload_size, header); 32 receive_side_cc_.OnReceivedPacket(arrival_time_ms, payload_size, header);
33 } 33 }
34 34
35 void CongestionController::SetBweBitrates(int min_bitrate_bps, 35 void CongestionController::SetBweBitrates(int min_bitrate_bps,
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
117 const rtcp::TransportFeedback& feedback) { 117 const rtcp::TransportFeedback& feedback) {
118 send_side_cc_.OnTransportFeedback(feedback); 118 send_side_cc_.OnTransportFeedback(feedback);
119 } 119 }
120 120
121 std::vector<PacketFeedback> CongestionController::GetTransportFeedbackVector() 121 std::vector<PacketFeedback> CongestionController::GetTransportFeedbackVector()
122 const { 122 const {
123 return send_side_cc_.GetTransportFeedbackVector(); 123 return send_side_cc_.GetTransportFeedbackVector();
124 } 124 }
125 125
126 } // namespace webrtc 126 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698