Revert of Move delay_based_bwe_ into CongestionController

Revert of Move delay_based_bwe_ into CongestionController (patchset #7 id:120001 of https://codereview.webrtc.org/2725823002/ )

Reason for revert:
Deleting the GetTransportFeedbackObserver methods breaks an internal project. 

Keeping the method and letting it return |this| will likely work.

Original issue's description:
> Move delay_based_bwe_ into CongestionController
> 
> BUG=webrtc:7058
> 
> Review-Url: https://codereview.webrtc.org/2725823002
> Cr-Commit-Position: refs/heads/master@{#17146}
> Committed: https://chromium.googlesource.com/external/webrtc/+/5bbf43f9d480f89fa57bbdbff0b028a413202695

TBR=stefan@webrtc.org,sprang@webrtc.org,minyue@webrtc.org,ossu@webrtc.org,michaelt@webrtc.org,solenberg@webrtc.org,terelius@webrtc.org,elad.alon@webrtc.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=webrtc:7058

[nisse-webrtc, 2017-03-09 16:23:48]

The CQ bit was checked by nisse@webrtc.org

[nisse-webrtc, 2017-03-09 16:23:48]

Created Revert of Move delay_based_bwe_ into CongestionController

[commit-bot: I haz the power, 2017-03-09 16:23:57]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.webrtc.org/...

[commit-bot: I haz the power, 2017-03-09 16:24:03]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2017-03-09 16:24:05]

Failed to apply patch for
webrtc/modules/congestion_controller/include/congestion_controller.h:
While running git apply --index -p1;
  error: patch failed:
webrtc/modules/congestion_controller/include/congestion_controller.h:174
  error: webrtc/modules/congestion_controller/include/congestion_controller.h:
patch does not apply

Patch:      
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
02f3e3429c9cf4eae6b3bf209e2772a76a9437c5..500966b7c1ab0fc7a0fc475a9c98f8a959d3df86
100644
--- a/webrtc/modules/congestion_controller/include/congestion_controller.h
+++ b/webrtc/modules/congestion_controller/include/congestion_controller.h
@@ -16,14 +16,12 @@
 
 #include "webrtc/base/constructormagic.h"
 #include "webrtc/base/criticalsection.h"
-#include "webrtc/base/thread_checker.h"
 #include "webrtc/common_types.h"
-#include "webrtc/modules/congestion_controller/delay_based_bwe.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/pacing/packet_router.h"
 #include "webrtc/modules/remote_bitrate_estimator/remote_estimator_proxy.h"
 
 namespace rtc {
@@ -39,10 +37,9 @@
 class RemoteBitrateEstimator;
 class RemoteBitrateObserver;
 class RtcEventLog;
+class TransportFeedbackObserver;
 
-class CongestionController : public CallStatsObserver,
-                             public Module,
-                             public TransportFeedbackObserver {
+class CongestionController : public CallStatsObserver, public Module {
  public:
   // Observer class for bitrate changes announced due to change in bandwidth
   // estimate or due to that the send pacer is full. Fraction loss and rtt is
@@ -94,6 +91,7 @@
   // TODO(nisse): Delete this accessor function. The pacer should be
   // internal to the congestion controller.
   virtual PacedSender* pacer() { return pacer_.get(); }
+  virtual TransportFeedbackObserver* GetTransportFeedbackObserver();
   RateLimiter* GetRetransmissionRateLimiter();
   void EnablePeriodicAlrProbing(bool enable);
 
@@ -118,13 +116,6 @@
   // Implements Module.
   int64_t TimeUntilNextProcess() override;
   void Process() override;
-
-  // Implements TransportFeedbackObserver.
-  void AddPacket(uint16_t sequence_number,
-                 size_t length,
-                 const PacedPacketInfo& pacing_info) override;
-  void OnTransportFeedback(const rtcp::TransportFeedback& feedback) override;
-  std::vector<PacketFeedback> GetTransportFeedbackVector() const override;
 
  private:
   class WrappingBitrateEstimator : public RemoteBitrateEstimator {
@@ -174,7 +165,6 @@
                                            int64_t rtt);
   Clock* const clock_;
   Observer* const observer_;
-  RtcEventLog* const event_log_;
   PacketRouter* const packet_router_;
   const std::unique_ptr<PacedSender> pacer_;
   const std::unique_ptr<BitrateController> bitrate_controller_;
@@ -185,15 +175,11 @@
   TransportFeedbackAdapter transport_feedback_adapter_;
   int min_bitrate_bps_;
   int max_bitrate_bps_;
-  rtc::CriticalSection network_state_lock_;
-  uint32_t last_reported_bitrate_bps_ GUARDED_BY(network_state_lock_);
-  uint8_t last_reported_fraction_loss_ GUARDED_BY(network_state_lock_);
-  int64_t last_reported_rtt_ GUARDED_BY(network_state_lock_);
-  NetworkState network_state_ GUARDED_BY(network_state_lock_);
-  rtc::CriticalSection bwe_lock_;
-  std::unique_ptr<DelayBasedBwe> delay_based_bwe_ GUARDED_BY(bwe_lock_);
-
-  rtc::ThreadChecker worker_thread_checker_;
+  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);
 };

[elad.alon_webrtc.org, 2017-03-09 16:40:05]

Leaving this for Stefan.

[nisse-webrtc, 2017-03-09 16:41:36]

The CQ bit was checked by nisse@webrtc.org

[commit-bot: I haz the power, 2017-03-09 16:41:48]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.webrtc.org/...

[commit-bot: I haz the power, 2017-03-09 16:41:54]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2017-03-09 16:41:55]

Failed to apply patch for
webrtc/modules/congestion_controller/include/congestion_controller.h:
While running git apply --index -p1;
  error: patch failed:
webrtc/modules/congestion_controller/include/congestion_controller.h:174
  error: webrtc/modules/congestion_controller/include/congestion_controller.h:
patch does not apply

Patch:      
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
02f3e3429c9cf4eae6b3bf209e2772a76a9437c5..500966b7c1ab0fc7a0fc475a9c98f8a959d3df86
100644
--- a/webrtc/modules/congestion_controller/include/congestion_controller.h
+++ b/webrtc/modules/congestion_controller/include/congestion_controller.h
@@ -16,14 +16,12 @@
 
 #include "webrtc/base/constructormagic.h"
 #include "webrtc/base/criticalsection.h"
-#include "webrtc/base/thread_checker.h"
 #include "webrtc/common_types.h"
-#include "webrtc/modules/congestion_controller/delay_based_bwe.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/pacing/packet_router.h"
 #include "webrtc/modules/remote_bitrate_estimator/remote_estimator_proxy.h"
 
 namespace rtc {
@@ -39,10 +37,9 @@
 class RemoteBitrateEstimator;
 class RemoteBitrateObserver;
 class RtcEventLog;
+class TransportFeedbackObserver;
 
-class CongestionController : public CallStatsObserver,
-                             public Module,
-                             public TransportFeedbackObserver {
+class CongestionController : public CallStatsObserver, public Module {
  public:
   // Observer class for bitrate changes announced due to change in bandwidth
   // estimate or due to that the send pacer is full. Fraction loss and rtt is
@@ -94,6 +91,7 @@
   // TODO(nisse): Delete this accessor function. The pacer should be
   // internal to the congestion controller.
   virtual PacedSender* pacer() { return pacer_.get(); }
+  virtual TransportFeedbackObserver* GetTransportFeedbackObserver();
   RateLimiter* GetRetransmissionRateLimiter();
   void EnablePeriodicAlrProbing(bool enable);
 
@@ -118,13 +116,6 @@
   // Implements Module.
   int64_t TimeUntilNextProcess() override;
   void Process() override;
-
-  // Implements TransportFeedbackObserver.
-  void AddPacket(uint16_t sequence_number,
-                 size_t length,
-                 const PacedPacketInfo& pacing_info) override;
-  void OnTransportFeedback(const rtcp::TransportFeedback& feedback) override;
-  std::vector<PacketFeedback> GetTransportFeedbackVector() const override;
 
  private:
   class WrappingBitrateEstimator : public RemoteBitrateEstimator {
@@ -174,7 +165,6 @@
                                            int64_t rtt);
   Clock* const clock_;
   Observer* const observer_;
-  RtcEventLog* const event_log_;
   PacketRouter* const packet_router_;
   const std::unique_ptr<PacedSender> pacer_;
   const std::unique_ptr<BitrateController> bitrate_controller_;
@@ -185,15 +175,11 @@
   TransportFeedbackAdapter transport_feedback_adapter_;
   int min_bitrate_bps_;
   int max_bitrate_bps_;
-  rtc::CriticalSection network_state_lock_;
-  uint32_t last_reported_bitrate_bps_ GUARDED_BY(network_state_lock_);
-  uint8_t last_reported_fraction_loss_ GUARDED_BY(network_state_lock_);
-  int64_t last_reported_rtt_ GUARDED_BY(network_state_lock_);
-  NetworkState network_state_ GUARDED_BY(network_state_lock_);
-  rtc::CriticalSection bwe_lock_;
-  std::unique_ptr<DelayBasedBwe> delay_based_bwe_ GUARDED_BY(bwe_lock_);
-
-  rtc::ThreadChecker worker_thread_checker_;
+  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);
 };

[elad.alon_webrtc.org, 2017-03-09 16:43:28]

You probably need to manually change some things due to
https://codereview.webrtc.org/2735423002, which was landed immediately after.

[Zhi Huang, 2017-03-09 18:34:37]

On 2017/03/09 16:43:28, elad.alon wrote:
> You probably need to manually change some things due to
> https://codereview.webrtc.org/2735423002, which was landed immediately after.

I'll create a CL to fix this temporarily.

[elad.alon_webrtc.org, 2017-03-09 18:36:51]

On 2017/03/09 18:34:37, Zhi Huang wrote:
> On 2017/03/09 16:43:28, elad.alon wrote:
> > You probably need to manually change some things due to
> > https://codereview.webrtc.org/2735423002, which was landed immediately
after.
> 
> I'll create a CL to fix this temporarily.

I think https://codereview.webrtc.org/2745613002/ might be the temporary
solution?

[elad.alon_webrtc.org, 2017-03-09 18:37:11]

On 2017/03/09 18:34:37, Zhi Huang wrote:
> On 2017/03/09 16:43:28, elad.alon wrote:
> > You probably need to manually change some things due to
> > https://codereview.webrtc.org/2735423002, which was landed immediately
after.
> 
> I'll create a CL to fix this temporarily.

I think https://codereview.webrtc.org/2745613002/ might be the temporary
solution?

[nisse-webrtc, 2017-03-10 08:02:04]

On 2017/03/09 18:37:11, elad.alon wrote:
> On 2017/03/09 18:34:37, Zhi Huang wrote:
> > On 2017/03/09 16:43:28, elad.alon wrote:
> > > You probably need to manually change some things due to
> > > https://codereview.webrtc.org/2735423002, which was landed immediately
> after.
> > 
> > I'll create a CL to fix this temporarily.
> 
> I think https://codereview.webrtc.org/2745613002/ might be the temporary
> solution?

Problem was solved. I'm closing this cl with no further action.

[nisse-webrtc, 2017-03-10 08:02:21]

Description was changed from

==========
Revert of Move delay_based_bwe_ into CongestionController (patchset #7 id:120001
of https://codereview.webrtc.org/2725823002/ )

Reason for revert:
Deleting the GetTransportFeedbackObserver methods breaks an internal project. 

Keeping the method and letting it return |this| will likely work.

Original issue's description:
> Move delay_based_bwe_ into CongestionController
> 
> BUG=webrtc:7058
> 
> Review-Url: https://codereview.webrtc.org/2725823002
> Cr-Commit-Position: refs/heads/master@{#17146}
> Committed:
https://chromium.googlesource.com/external/webrtc/+/5bbf43f9d480f89fa57bbdbff...

TBR=stefan@webrtc.org,sprang@webrtc.org,minyue@webrtc.org,ossu@webrtc.org,mic...
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=webrtc:7058
==========

to

==========
Revert of Move delay_based_bwe_ into CongestionController (patchset #7 id:120001
of https://codereview.webrtc.org/2725823002/ )

Reason for revert:
Deleting the GetTransportFeedbackObserver methods breaks an internal project. 

Keeping the method and letting it return |this| will likely work.

Original issue's description:
> Move delay_based_bwe_ into CongestionController
> 
> BUG=webrtc:7058
> 
> Review-Url: https://codereview.webrtc.org/2725823002
> Cr-Commit-Position: refs/heads/master@{#17146}
> Committed:
https://chromium.googlesource.com/external/webrtc/+/5bbf43f9d480f89fa57bbdbff...

TBR=stefan@webrtc.org,sprang@webrtc.org,minyue@webrtc.org,ossu@webrtc.org,mic...
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=webrtc:7058
==========