Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(440)

Unified Diff: webrtc/modules/video_coding/frame_buffer2_unittest.cc

Issue 2302473002: FrameBuffer::NextFrame now return pair<frame, reason>. (Closed)
Patch Set: Return pair<reason, frame> instead of optional. Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: webrtc/modules/video_coding/frame_buffer2_unittest.cc
diff --git a/webrtc/modules/video_coding/frame_buffer2_unittest.cc b/webrtc/modules/video_coding/frame_buffer2_unittest.cc
index 674ae29bfc9c8945da69224bdadef33e0cc5e7c3..d7099f3381d3043dca9f8e728964f1e9d25a3038 100644
--- a/webrtc/modules/video_coding/frame_buffer2_unittest.cc
+++ b/webrtc/modules/video_coding/frame_buffer2_unittest.cc
@@ -135,7 +135,9 @@ class TestFrameBuffer2 : public ::testing::Test {
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;
@@ -170,7 +172,9 @@ class TestFrameBuffer2 : public ::testing::Test {
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));
}
}
}
« webrtc/modules/video_coding/frame_buffer2.h ('K') | « webrtc/modules/video_coding/frame_buffer2.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698