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

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

Issue 1748403002: Move RtcEventLog object from inside VoiceEngine to Call. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: More fixes for bots. Created 4 years, 8 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
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 encoder via VideoEncoderCallback. 12 * and push the result to the encoder via VideoEncoderCallback.
13 */ 13 */
14 14
15 #ifndef WEBRTC_MODULES_BITRATE_CONTROLLER_BITRATE_CONTROLLER_IMPL_H_ 15 #ifndef WEBRTC_MODULES_BITRATE_CONTROLLER_BITRATE_CONTROLLER_IMPL_H_
16 #define WEBRTC_MODULES_BITRATE_CONTROLLER_BITRATE_CONTROLLER_IMPL_H_ 16 #define WEBRTC_MODULES_BITRATE_CONTROLLER_BITRATE_CONTROLLER_IMPL_H_
17 17
18 #include "webrtc/modules/bitrate_controller/include/bitrate_controller.h" 18 #include "webrtc/modules/bitrate_controller/include/bitrate_controller.h"
19 19
20 #include <list> 20 #include <list>
21 #include <utility> 21 #include <utility>
22 22
23 #include "webrtc/base/criticalsection.h" 23 #include "webrtc/base/criticalsection.h"
24 #include "webrtc/modules/bitrate_controller/send_side_bandwidth_estimation.h" 24 #include "webrtc/modules/bitrate_controller/send_side_bandwidth_estimation.h"
25 25
26 namespace webrtc { 26 namespace webrtc {
27 27
28 class BitrateControllerImpl : public BitrateController { 28 class BitrateControllerImpl : public BitrateController {
29 public: 29 public:
30 BitrateControllerImpl(Clock* clock, BitrateObserver* observer); 30 BitrateControllerImpl(Clock* clock,
31 BitrateObserver* observer,
32 RtcEventLog* event_log);
31 virtual ~BitrateControllerImpl() {} 33 virtual ~BitrateControllerImpl() {}
32 34
33 bool AvailableBandwidth(uint32_t* bandwidth) const override; 35 bool AvailableBandwidth(uint32_t* bandwidth) const override;
34 36
35 RtcpBandwidthObserver* CreateRtcpBandwidthObserver() override; 37 RtcpBandwidthObserver* CreateRtcpBandwidthObserver() override;
36 38
37 void SetStartBitrate(int start_bitrate_bps) override; 39 void SetStartBitrate(int start_bitrate_bps) override;
38 void SetMinMaxBitrate(int min_bitrate_bps, int max_bitrate_bps) override; 40 void SetMinMaxBitrate(int min_bitrate_bps, int max_bitrate_bps) override;
39 41
40 void UpdateDelayBasedEstimate(uint32_t bitrate_bps) override; 42 void UpdateDelayBasedEstimate(uint32_t bitrate_bps) override;
41 43
42 void SetReservedBitrate(uint32_t reserved_bitrate_bps) override; 44 void SetReservedBitrate(uint32_t reserved_bitrate_bps) override;
43 45
44 void SetEventLog(RtcEventLog* event_log) override;
45
46 int64_t TimeUntilNextProcess() override; 46 int64_t TimeUntilNextProcess() override;
47 void Process() override; 47 void Process() override;
48 48
49 private: 49 private:
50 class RtcpBandwidthObserverImpl; 50 class RtcpBandwidthObserverImpl;
51 51
52 // Called by BitrateObserver's direct from the RTCP module. 52 // Called by BitrateObserver's direct from the RTCP module.
53 void OnReceivedEstimatedBitrate(uint32_t bitrate); 53 void OnReceivedEstimatedBitrate(uint32_t bitrate);
54 54
55 void OnReceivedRtcpReceiverReport(uint8_t fraction_loss, 55 void OnReceivedRtcpReceiverReport(uint8_t fraction_loss,
(...skipping 23 matching lines...) Expand all
79 79
80 uint32_t last_bitrate_bps_ GUARDED_BY(critsect_); 80 uint32_t last_bitrate_bps_ GUARDED_BY(critsect_);
81 uint8_t last_fraction_loss_ GUARDED_BY(critsect_); 81 uint8_t last_fraction_loss_ GUARDED_BY(critsect_);
82 int64_t last_rtt_ms_ GUARDED_BY(critsect_); 82 int64_t last_rtt_ms_ GUARDED_BY(critsect_);
83 uint32_t last_reserved_bitrate_bps_ GUARDED_BY(critsect_); 83 uint32_t last_reserved_bitrate_bps_ GUARDED_BY(critsect_);
84 84
85 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(BitrateControllerImpl); 85 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(BitrateControllerImpl);
86 }; 86 };
87 } // namespace webrtc 87 } // namespace webrtc
88 #endif // WEBRTC_MODULES_BITRATE_CONTROLLER_BITRATE_CONTROLLER_IMPL_H_ 88 #endif // WEBRTC_MODULES_BITRATE_CONTROLLER_BITRATE_CONTROLLER_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698