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

Side by Side Diff: webrtc/modules/congestion_controller/transport_feedback_adapter.h

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) 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
11 #ifndef WEBRTC_MODULES_CONGESTION_CONTROLLER_TRANSPORT_FEEDBACK_ADAPTER_H_ 11 #ifndef WEBRTC_MODULES_CONGESTION_CONTROLLER_TRANSPORT_FEEDBACK_ADAPTER_H_
12 #define WEBRTC_MODULES_CONGESTION_CONTROLLER_TRANSPORT_FEEDBACK_ADAPTER_H_ 12 #define WEBRTC_MODULES_CONGESTION_CONTROLLER_TRANSPORT_FEEDBACK_ADAPTER_H_
13 13
14 #include <vector> 14 #include <vector>
15 15
16 #include "webrtc/base/criticalsection.h"
17 #include "webrtc/base/thread_annotations.h"
18 #include "webrtc/base/thread_checker.h"
16 #include "webrtc/modules/remote_bitrate_estimator/include/send_time_history.h" 19 #include "webrtc/modules/remote_bitrate_estimator/include/send_time_history.h"
17 #include "webrtc/rtc_base/criticalsection.h"
18 #include "webrtc/rtc_base/thread_annotations.h"
19 #include "webrtc/rtc_base/thread_checker.h"
20 #include "webrtc/system_wrappers/include/clock.h" 20 #include "webrtc/system_wrappers/include/clock.h"
21 21
22 namespace webrtc { 22 namespace webrtc {
23 23
24 class PacketFeedbackObserver; 24 class PacketFeedbackObserver;
25 25
26 namespace rtcp { 26 namespace rtcp {
27 class TransportFeedback; 27 class TransportFeedback;
28 } // namespace rtcp 28 } // namespace rtcp
29 29
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 uint16_t local_net_id_ GUARDED_BY(&lock_); 66 uint16_t local_net_id_ GUARDED_BY(&lock_);
67 uint16_t remote_net_id_ GUARDED_BY(&lock_); 67 uint16_t remote_net_id_ GUARDED_BY(&lock_);
68 68
69 rtc::CriticalSection observers_lock_; 69 rtc::CriticalSection observers_lock_;
70 std::vector<PacketFeedbackObserver*> observers_ GUARDED_BY(&observers_lock_); 70 std::vector<PacketFeedbackObserver*> observers_ GUARDED_BY(&observers_lock_);
71 }; 71 };
72 72
73 } // namespace webrtc 73 } // namespace webrtc
74 74
75 #endif // WEBRTC_MODULES_CONGESTION_CONTROLLER_TRANSPORT_FEEDBACK_ADAPTER_H_ 75 #endif // WEBRTC_MODULES_CONGESTION_CONTROLLER_TRANSPORT_FEEDBACK_ADAPTER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698