Make CongestionController::remote_bitrate_estimator_ a non-pointer.

webrtc/modules/congestion_controller/include/congestion_controller.h

 /*
  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 #ifndef WEBRTC_MODULES_CONGESTION_CONTROLLER_INCLUDE_CONGESTION_CONTROLLER_H_
 #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"
 #include "webrtc/modules/include/module.h"
 #include "webrtc/modules/include/module_common_types.h"
 #include "webrtc/modules/pacing/packet_router.h"
 #include "webrtc/modules/pacing/paced_sender.h"
 #include "webrtc/modules/remote_bitrate_estimator/remote_estimator_proxy.h"
 
 namespace rtc {
 struct SentPacket;
@@ skipping 82 matching lines @@
   virtual void OnSentPacket(const rtc::SentPacket& sent_packet);
 
   // Implements CallStatsObserver.
   void OnRttUpdate(int64_t avg_rtt_ms, int64_t max_rtt_ms) override;
 
   // Implements Module.
   int64_t TimeUntilNextProcess() override;
   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;
   bool IsNetworkDown() const;
   bool HasNetworkParametersToReportChanged(uint32_t bitrate_bps,
                                            uint8_t fraction_loss,
                                            int64_t rtt);
   Clock* const clock_;
   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_;
   RemoteEstimatorProxy remote_estimator_proxy_;
   TransportFeedbackAdapter transport_feedback_adapter_;
   int min_bitrate_bps_;
   int max_bitrate_bps_;
   rtc::CriticalSection critsect_;
   uint32_t last_reported_bitrate_bps_ GUARDED_BY(critsect_);
   uint8_t last_reported_fraction_loss_ GUARDED_BY(critsect_);
   int64_t last_reported_rtt_ GUARDED_BY(critsect_);
   NetworkState network_state_ GUARDED_BY(critsect_);
 
   RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(CongestionController);
 };
 
 }  // namespace webrtc
 
 #endif  // WEBRTC_MODULES_CONGESTION_CONTROLLER_INCLUDE_CONGESTION_CONTROLLER_H_