FrameBuffer::NextFrame now return pair<frame, reason>.

webrtc/modules/video_coding/frame_buffer2_unittest.cc

 /*
  *  Copyright (c) 2016 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.
  */
 
@@ skipping 117 matching lines @@
     frame->inter_layer_predicted = inter_layer_predicted;
     for (size_t r = 0; r < references.size(); ++r)
       frame->references[r] = references[r];
 
     buffer_.InsertFrame(std::move(frame));
   }
 
   void ExtractFrame(int64_t max_wait_time = 0) {
     crit_.Enter();
     if (max_wait_time == 0) {
-      frames_.emplace_back(buffer_.NextFrame(0));
+      auto frame = buffer_.NextFrame(0);
+      if (frame.first != FrameBuffer::ReturnReason::kStopped)
+        frames_.emplace_back(std::move(frame.second));
       crit_.Leave();
     } else {
       max_wait_time_ = max_wait_time;
       trigger_extract_event_.Set();
       crit_.Leave();
       // Make sure |crit_| is aquired by |extract_thread_| before returning.
       crit_acquired_event_.Wait(rtc::Event::kForever);
     }
   }
 
@@ skipping 14 matching lines @@
   static bool ExtractLoop(void* obj) {
     TestFrameBuffer2* tfb = static_cast<TestFrameBuffer2*>(obj);
     while (true) {
       tfb->trigger_extract_event_.Wait(rtc::Event::kForever);
       {
         rtc::CritScope lock(&tfb->crit_);
         tfb->crit_acquired_event_.Set();
         if (tfb->tear_down_)
           return false;
 
-        tfb->frames_.emplace_back(tfb->buffer_.NextFrame(tfb->max_wait_time_));
+        auto frame = tfb->buffer_.NextFrame(tfb->max_wait_time_);
+        if (frame.first != FrameBuffer::ReturnReason::kStopped)
+          tfb->frames_.emplace_back(std::move(frame.second));
       }
     }
   }
 
   uint32_t Rand() { return rand_.Rand<uint32_t>(); }
 
   SimulatedClock clock_;
   VCMTimingFake timing_;
   ::testing::NiceMock<VCMJitterEstimatorMock> jitter_estimator_;
   FrameBuffer buffer_;
@@ skipping 162 matching lines @@
   ExtractFrame();
 
   buffer_.SetProtectionMode(kProtectionNackFEC);
   EXPECT_CALL(jitter_estimator_, GetJitterEstimate(0.0));
   InsertFrame(pid + 1, 0, ts, false);
   ExtractFrame();
 }
 
 }  // namespace video_coding
 }  // namespace webrtc