commit 38018ba67d5c62ff1171760f4d4899dacd3e7a7f
author Danil Chapovalov <danilchap@webrtc.org> Mon Jun 12 16:29:45 2017 +0200
committer Commit Bot <commit-bot@chromium.org> Mon Jun 12 15:21:59 2017 +0000
tree 951029ee8c828700de37d189675241f503003c04
parent 42742a56efbe4726555339a0e1a7858f8563a8f0

Merge BitrateControllerImpl::RtcpBandwidthObserverImpl into BitrateControllerImpl

This allows to protect ssrc_to_last_received_extended_high_seq_num_ member and
make calls to OnReceivedRtcpReceiverReport thread-safe without introducing new critical section.

Bug: webrtc:7735
Change-Id: Iee23bb780d07b0f906f1f8eeddde2b74cc0a2b89
Reviewed-on: https://chromium-review.googlesource.com/518130
Reviewed-by: Stefan Holmer <stefan@webrtc.org>
Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#18540}

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 194c99b..c6695e9 100644
--- a/webrtc/modules/bitrate_controller/include/bitrate_controller.h
+++ b/webrtc/modules/bitrate_controller/include/bitrate_controller.h
@@ -15,8 +15,6 @@
 #ifndef WEBRTC_MODULES_BITRATE_CONTROLLER_INCLUDE_BITRATE_CONTROLLER_H_
 #define WEBRTC_MODULES_BITRATE_CONTROLLER_INCLUDE_BITRATE_CONTROLLER_H_
 
-#include <map>
-
 #include "webrtc/modules/congestion_controller/delay_based_bwe.h"
 #include "webrtc/modules/include/module.h"
 #include "webrtc/modules/pacing/paced_sender.h"
@@ -42,7 +40,8 @@
   virtual ~BitrateObserver() {}
 };
 
-class BitrateController : public Module {
+class BitrateController : public Module,
+                          public RtcpBandwidthObserver {
   // This class collects feedback from all streams sent to a peer (via
   // RTCPBandwidthObservers). It does one  aggregated send side bandwidth
   // estimation and divide the available bitrate between all its registered
@@ -62,6 +61,7 @@
 
   virtual ~BitrateController() {}
 
+  // Creates RtcpBandwidthObserver caller responsible to delete.
   virtual RtcpBandwidthObserver* CreateRtcpBandwidthObserver() = 0;
 
   // Deprecated