Make CongestionController::remote_bitrate_estimator_ a non-pointer.

webrtc/modules/congestion_controller/include/congestion_controller.h

Index: webrtc/modules/congestion_controller/include/congestion_controller.h
diff --git a/webrtc/modules/congestion_controller/include/congestion_controller.h b/webrtc/modules/congestion_controller/include/congestion_controller.h
index 1fcb03dd57f0fd74ed6dca6ceac644a82c336bc9..64a4b391614e81c48ff2f69b51e62b5f15b59d94 100644
--- a/webrtc/modules/congestion_controller/include/congestion_controller.h
+++ b/webrtc/modules/congestion_controller/include/congestion_controller.h
@@ -12,8 +12,10 @@
 #define WEBRTC_MODULES_CONGESTION_CONTROLLER_INCLUDE_CONGESTION_CONTROLLER_H_
 
 #include <memory>
+#include <vector>
 
 #include "webrtc/base/constructormagic.h"
+#include "webrtc/base/criticalsection.h"
 #include "webrtc/base/deprecation.h"

[stefan-webrtc, 2017/01/23 10:38:12]

Looks like this can be removed, could you do that too? Thanks

[nisse-webrtc, 2017/01/23 10:47:02]

Done.

 #include "webrtc/common_types.h"
 #include "webrtc/modules/congestion_controller/transport_feedback_adapter.h"
@@ -117,6 +119,44 @@ class CongestionController : public CallStatsObserver, public Module {
   void Process() override;
 
  private:
+  class WrappingBitrateEstimator : public RemoteBitrateEstimator {
+   public:
+    WrappingBitrateEstimator(RemoteBitrateObserver* observer, Clock* clock);
+
+    virtual ~WrappingBitrateEstimator() {}
+
+    void IncomingPacket(int64_t arrival_time_ms,
+                        size_t payload_size,
+                        const RTPHeader& header) override;
+
+    void Process() override;
+
+    int64_t TimeUntilNextProcess() override;
+
+    void OnRttUpdate(int64_t avg_rtt_ms, int64_t max_rtt_ms) override;
+
+    void RemoveStream(unsigned int ssrc) override;
+
+    bool LatestEstimate(std::vector<unsigned int>* ssrcs,
+                        unsigned int* bitrate_bps) const override;
+
+    void SetMinBitrate(int min_bitrate_bps) override;
+
+   private:
+    void PickEstimatorFromHeader(const RTPHeader& header)
+        EXCLUSIVE_LOCKS_REQUIRED(crit_sect_);
+    void PickEstimator() EXCLUSIVE_LOCKS_REQUIRED(crit_sect_);
+    RemoteBitrateObserver* observer_;
+    Clock* const clock_;
+    rtc::CriticalSection crit_sect_;
+    std::unique_ptr<RemoteBitrateEstimator> rbe_;
+    bool using_absolute_send_time_;
+    uint32_t packets_since_absolute_send_time_;
+    int min_bitrate_bps_;
+
+    RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(WrappingBitrateEstimator);
+  };
+
   void MaybeTriggerOnNetworkChanged();
 
   bool IsSendQueueFull() const;
@@ -128,7 +168,7 @@ class CongestionController : public CallStatsObserver, public Module {
   Observer* const observer_;
   PacketRouter* const packet_router_;
   const std::unique_ptr<PacedSender> pacer_;
-  const std::unique_ptr<RemoteBitrateEstimator> remote_bitrate_estimator_;
+  WrappingBitrateEstimator remote_bitrate_estimator_;

[stefan-webrtc, 2017/01/23 10:38:12]

Move this down to RemoteEstimatorProxy just to group const ptrs together?

[nisse-webrtc, 2017/01/23 10:47:01]

Done.

   const std::unique_ptr<BitrateController> bitrate_controller_;
   const std::unique_ptr<ProbeController> probe_controller_;
   const std::unique_ptr<RateLimiter> retransmission_rate_limiter_;