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

Side by Side Diff: webrtc/call/bitrate_allocator.h

Issue 1441673002: Move BitrateAllocator from BitrateController logic to Call. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebase Created 5 years, 1 month 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 * Usage: this class will register multiple RtcpBitrateObserver's one at each 10 * Usage: this class will register multiple RtcpBitrateObserver's one at each
11 * RTCP module. It will aggregate the results and run one bandwidth estimation 11 * RTCP module. It will aggregate the results and run one bandwidth estimation
12 * and push the result to the encoders via BitrateObserver(s). 12 * and push the result to the encoders via BitrateObserver(s).
13 */ 13 */
14 14
15 #ifndef WEBRTC_MODULES_BITRATE_CONTROLLER_INCLUDE_BITRATE_ALLOCATOR_H_ 15 #ifndef WEBRTC_CALL_BITRATE_ALLOCATOR_H_
16 #define WEBRTC_MODULES_BITRATE_CONTROLLER_INCLUDE_BITRATE_ALLOCATOR_H_ 16 #define WEBRTC_CALL_BITRATE_ALLOCATOR_H_
17 17
18 #include <list> 18 #include <list>
19 #include <map> 19 #include <map>
20 #include <utility> 20 #include <utility>
21 21
22 #include "webrtc/base/scoped_ptr.h" 22 #include "webrtc/base/scoped_ptr.h"
23 #include "webrtc/base/thread_annotations.h" 23 #include "webrtc/base/thread_annotations.h"
24 #include "webrtc/system_wrappers/include/critical_section_wrapper.h" 24 #include "webrtc/system_wrappers/include/critical_section_wrapper.h"
25 25
26 namespace webrtc { 26 namespace webrtc {
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 rtc::scoped_ptr<CriticalSectionWrapper> crit_sect_; 92 rtc::scoped_ptr<CriticalSectionWrapper> crit_sect_;
93 // Stored in a list to keep track of the insertion order. 93 // Stored in a list to keep track of the insertion order.
94 BitrateObserverConfList bitrate_observers_ GUARDED_BY(crit_sect_); 94 BitrateObserverConfList bitrate_observers_ GUARDED_BY(crit_sect_);
95 bool bitrate_observers_modified_ GUARDED_BY(crit_sect_); 95 bool bitrate_observers_modified_ GUARDED_BY(crit_sect_);
96 bool enforce_min_bitrate_ GUARDED_BY(crit_sect_); 96 bool enforce_min_bitrate_ GUARDED_BY(crit_sect_);
97 uint32_t last_bitrate_bps_ GUARDED_BY(crit_sect_); 97 uint32_t last_bitrate_bps_ GUARDED_BY(crit_sect_);
98 uint8_t last_fraction_loss_ GUARDED_BY(crit_sect_); 98 uint8_t last_fraction_loss_ GUARDED_BY(crit_sect_);
99 int64_t last_rtt_ GUARDED_BY(crit_sect_); 99 int64_t last_rtt_ GUARDED_BY(crit_sect_);
100 }; 100 };
101 } // namespace webrtc 101 } // namespace webrtc
102 #endif // WEBRTC_MODULES_BITRATE_CONTROLLER_INCLUDE_BITRATE_ALLOCATOR_H_ 102 #endif // WEBRTC_CALL_BITRATE_ALLOCATOR_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698