Introduce new constructor to PlatformThread.

webrtc/video/end_to_end_tests.cc

 /*
  *  Copyright (c) 2013 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.
  */
 #include <algorithm>
@@ skipping 2127 matching lines @@
       rtp_rtcp_->SetSSRC((*receive_configs)[0].rtp.local_ssrc);
       rtp_rtcp_->SetREMBStatus(true);
       rtp_rtcp_->SetSendingStatus(true);
       rtp_rtcp_->SetRTCPStatus(RtcpMode::kReducedSize);
     }
 
     void OnCallsCreated(Call* sender_call, Call* receiver_call) override {
       sender_call_ = sender_call;
     }
 
-    static bool BitrateStatsPollingThread(void* obj) {
-      return static_cast<BweObserver*>(obj)->PollStats();
+    static void BitrateStatsPollingThread(void* obj) {
+      static_cast<BweObserver*>(obj)->PollStats();
     }
 
-    bool PollStats() {
-      if (sender_call_) {
-        Call::Stats stats = sender_call_->GetStats();
-        switch (state_) {
-          case kWaitForFirstRampUp:
-            if (stats.send_bandwidth_bps >= remb_bitrate_bps_) {
-              state_ = kWaitForRemb;
-              remb_bitrate_bps_ /= 2;
-              rtp_rtcp_->SetREMBData(
-                  remb_bitrate_bps_,
-                  std::vector<uint32_t>(&sender_ssrc_, &sender_ssrc_ + 1));
-              rtp_rtcp_->SendRTCP(kRtcpRr);
-            }
-            break;
+    void PollStats() {
+      do {
+        if (sender_call_) {
+          Call::Stats stats = sender_call_->GetStats();
+          switch (state_) {
+            case kWaitForFirstRampUp:
+              if (stats.send_bandwidth_bps >= remb_bitrate_bps_) {
+                state_ = kWaitForRemb;
+                remb_bitrate_bps_ /= 2;
+                rtp_rtcp_->SetREMBData(
+                    remb_bitrate_bps_,
+                    std::vector<uint32_t>(&sender_ssrc_, &sender_ssrc_ + 1));
+                rtp_rtcp_->SendRTCP(kRtcpRr);
+              }
+              break;
 
-          case kWaitForRemb:
-            if (stats.send_bandwidth_bps == remb_bitrate_bps_) {
-              state_ = kWaitForSecondRampUp;
-              remb_bitrate_bps_ *= 2;
-              rtp_rtcp_->SetREMBData(
-                  remb_bitrate_bps_,
-                  std::vector<uint32_t>(&sender_ssrc_, &sender_ssrc_ + 1));
-              rtp_rtcp_->SendRTCP(kRtcpRr);
-            }
-            break;
+            case kWaitForRemb:
+              if (stats.send_bandwidth_bps == remb_bitrate_bps_) {
+                state_ = kWaitForSecondRampUp;
+                remb_bitrate_bps_ *= 2;
+                rtp_rtcp_->SetREMBData(
+                    remb_bitrate_bps_,
+                    std::vector<uint32_t>(&sender_ssrc_, &sender_ssrc_ + 1));
+                rtp_rtcp_->SendRTCP(kRtcpRr);
+              }
+              break;
 
-          case kWaitForSecondRampUp:
-            if (stats.send_bandwidth_bps == remb_bitrate_bps_) {
-              observation_complete_.Set();
-            }
-            break;
+            case kWaitForSecondRampUp:
+              if (stats.send_bandwidth_bps == remb_bitrate_bps_) {
+                observation_complete_.Set();
+              }
+              break;
+          }
         }
-      }
-
-      return !stop_event_.Wait(1000);
+      } while (!stop_event_.Wait(1000));

[the sun, 2017/02/22 13:42:58]

note: this appears to work since stop_event_.Set() is called before
poller_thread_.Stop() in PerformTest().

[tommi, 2017/02/22 15:04:01]

Yes, that's the case I found and fixed yesterday.

     }
 
     void PerformTest() override {
       poller_thread_.Start();
       EXPECT_TRUE(Wait())
           << "Timed out while waiting for bitrate to change according to REMB.";
       stop_event_.Set();
       poller_thread_.Stop();
     }
 
@@ skipping 1993 matching lines @@
     std::unique_ptr<VideoEncoder> encoder_;
     std::unique_ptr<VideoDecoder> decoder_;
     rtc::CriticalSection crit_;
     int recorded_frames_ GUARDED_BY(crit_);
   } test(this);
 
   RunBaseTest(&test);
 }
 
 }  // namespace webrtc