Chromium Code Reviews| Index: webrtc/modules/bitrate_controller/include/bitrate_controller.h |
| diff --git a/webrtc/modules/bitrate_controller/include/bitrate_controller.h b/webrtc/modules/bitrate_controller/include/bitrate_controller.h |
| index a9c247acf179df5b7e087a286bfd98d31caec40b..8c16aeee460eb9e7564c0ed026a08ef191ce053f 100644 |
| --- a/webrtc/modules/bitrate_controller/include/bitrate_controller.h |
| +++ b/webrtc/modules/bitrate_controller/include/bitrate_controller.h |
| @@ -17,6 +17,7 @@ |
| #include <map> |
| +#include "webrtc/base/deprecation.h" |
| #include "webrtc/modules/include/module.h" |
| #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" |
| @@ -48,8 +49,14 @@ class BitrateController : public Module { |
| public: |
| static const int kDefaultStartBitrateKbps = 300; |
| + // TODO(ivoc): Remove this function. |
| + RTC_DEPRECATED static BitrateController* CreateBitrateController( |
| + Clock* clock, |
| + BitrateObserver* observer); |
| + |
| static BitrateController* CreateBitrateController(Clock* clock, |
| - BitrateObserver* observer); |
| + BitrateObserver* observer, |
| + RtcEventLog* event_log); |
|
tommi
2016/04/04 14:26:47
is the ownership/lifetime of |observer| and |event
ivoc
2016/04/05 08:02:58
The |observer| is Call itself in this case, and |e
tommi
2016/04/07 13:21:53
I see. Well, that does sound a bit fragile but OK
|
| virtual ~BitrateController() {} |
| virtual RtcpBandwidthObserver* CreateRtcpBandwidthObserver() = 0; |
| @@ -59,8 +66,6 @@ class BitrateController : public Module { |
| virtual void UpdateDelayBasedEstimate(uint32_t bitrate_bps) = 0; |
| - virtual void SetEventLog(RtcEventLog* event_log) = 0; |
| - |
| // Gets the available payload bandwidth in bits per second. Note that |
| // this bandwidth excludes packet headers. |
| virtual bool AvailableBandwidth(uint32_t* bandwidth) const = 0; |