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

Side by Side Diff: webrtc/modules/bitrate_controller/bitrate_controller_impl.h

Issue 2111813002: Revert of Move RtcEventLog object from inside VoiceEngine to Call. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 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 * Usage: this class will register multiple RtcpBitrateObserver's one at each 10 * Usage: this class will register multiple RtcpBitrateObserver's one at each
(...skipping 12 matching lines...) Expand all
23 #include "webrtc/base/constructormagic.h" 23 #include "webrtc/base/constructormagic.h"
24 #include "webrtc/base/criticalsection.h" 24 #include "webrtc/base/criticalsection.h"
25 #include "webrtc/modules/bitrate_controller/send_side_bandwidth_estimation.h" 25 #include "webrtc/modules/bitrate_controller/send_side_bandwidth_estimation.h"
26 26
27 namespace webrtc { 27 namespace webrtc {
28 28
29 class BitrateControllerImpl : public BitrateController { 29 class BitrateControllerImpl : public BitrateController {
30 public: 30 public:
31 // TODO(perkj): BitrateObserver has been deprecated and is not used in WebRTC. 31 // TODO(perkj): BitrateObserver has been deprecated and is not used in WebRTC.
32 // |observer| is left for project that is not yet updated. 32 // |observer| is left for project that is not yet updated.
33 BitrateControllerImpl(Clock* clock, 33 BitrateControllerImpl(Clock* clock, BitrateObserver* observer);
34 BitrateObserver* observer,
35 RtcEventLog* event_log);
36 virtual ~BitrateControllerImpl() {} 34 virtual ~BitrateControllerImpl() {}
37 35
38 bool AvailableBandwidth(uint32_t* bandwidth) const override; 36 bool AvailableBandwidth(uint32_t* bandwidth) const override;
39 37
40 RtcpBandwidthObserver* CreateRtcpBandwidthObserver() override; 38 RtcpBandwidthObserver* CreateRtcpBandwidthObserver() override;
41 39
42 // Deprecated 40 // Deprecated
43 void SetStartBitrate(int start_bitrate_bps) override; 41 void SetStartBitrate(int start_bitrate_bps) override;
44 // Deprecated 42 // Deprecated
45 void SetMinMaxBitrate(int min_bitrate_bps, int max_bitrate_bps) override; 43 void SetMinMaxBitrate(int min_bitrate_bps, int max_bitrate_bps) override;
46 44
47 void SetBitrates(int start_bitrate_bps, 45 void SetBitrates(int start_bitrate_bps,
48 int min_bitrate_bps, 46 int min_bitrate_bps,
49 int max_bitrate_bps) override; 47 int max_bitrate_bps) override;
50 48
51 void ResetBitrates(int bitrate_bps, 49 void ResetBitrates(int bitrate_bps,
52 int min_bitrate_bps, 50 int min_bitrate_bps,
53 int max_bitrate_bps) override; 51 int max_bitrate_bps) override;
54 52
55 void UpdateDelayBasedEstimate(uint32_t bitrate_bps) override; 53 void UpdateDelayBasedEstimate(uint32_t bitrate_bps) override;
56 54
57 void SetReservedBitrate(uint32_t reserved_bitrate_bps) override; 55 void SetReservedBitrate(uint32_t reserved_bitrate_bps) override;
58 56
57 void SetEventLog(RtcEventLog* event_log) override;
58
59 // Returns true if the parameters have changed since the last call. 59 // Returns true if the parameters have changed since the last call.
60 bool GetNetworkParameters(uint32_t* bitrate, 60 bool GetNetworkParameters(uint32_t* bitrate,
61 uint8_t* fraction_loss, 61 uint8_t* fraction_loss,
62 int64_t* rtt) override; 62 int64_t* rtt) override;
63 63
64 int64_t TimeUntilNextProcess() override; 64 int64_t TimeUntilNextProcess() override;
65 void Process() override; 65 void Process() override;
66 66
67 private: 67 private:
68 class RtcpBandwidthObserverImpl; 68 class RtcpBandwidthObserverImpl;
(...skipping 10 matching lines...) Expand all
79 void MaybeTriggerOnNetworkChanged(); 79 void MaybeTriggerOnNetworkChanged();
80 80
81 void OnNetworkChanged(uint32_t bitrate, 81 void OnNetworkChanged(uint32_t bitrate,
82 uint8_t fraction_loss, // 0 - 255. 82 uint8_t fraction_loss, // 0 - 255.
83 int64_t rtt) EXCLUSIVE_LOCKS_REQUIRED(critsect_); 83 int64_t rtt) EXCLUSIVE_LOCKS_REQUIRED(critsect_);
84 84
85 // Used by process thread. 85 // Used by process thread.
86 Clock* const clock_; 86 Clock* const clock_;
87 BitrateObserver* const observer_; 87 BitrateObserver* const observer_;
88 int64_t last_bitrate_update_ms_; 88 int64_t last_bitrate_update_ms_;
89 RtcEventLog* const event_log_;
90 89
91 rtc::CriticalSection critsect_; 90 rtc::CriticalSection critsect_;
92 SendSideBandwidthEstimation bandwidth_estimation_ GUARDED_BY(critsect_); 91 SendSideBandwidthEstimation bandwidth_estimation_ GUARDED_BY(critsect_);
93 uint32_t reserved_bitrate_bps_ GUARDED_BY(critsect_); 92 uint32_t reserved_bitrate_bps_ GUARDED_BY(critsect_);
94 93
95 uint32_t last_bitrate_bps_ GUARDED_BY(critsect_); 94 uint32_t last_bitrate_bps_ GUARDED_BY(critsect_);
96 uint8_t last_fraction_loss_ GUARDED_BY(critsect_); 95 uint8_t last_fraction_loss_ GUARDED_BY(critsect_);
97 int64_t last_rtt_ms_ GUARDED_BY(critsect_); 96 int64_t last_rtt_ms_ GUARDED_BY(critsect_);
98 uint32_t last_reserved_bitrate_bps_ GUARDED_BY(critsect_); 97 uint32_t last_reserved_bitrate_bps_ GUARDED_BY(critsect_);
99 98
100 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(BitrateControllerImpl); 99 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(BitrateControllerImpl);
101 }; 100 };
102 } // namespace webrtc 101 } // namespace webrtc
103 #endif // WEBRTC_MODULES_BITRATE_CONTROLLER_BITRATE_CONTROLLER_IMPL_H_ 102 #endif // WEBRTC_MODULES_BITRATE_CONTROLLER_BITRATE_CONTROLLER_IMPL_H_
OLDNEW
« no previous file with comments | « webrtc/media/engine/webrtcvoiceengine.cc ('k') | webrtc/modules/bitrate_controller/bitrate_controller_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698