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

Side by Side Diff: webrtc/modules/video_coding/utility/quality_scaler_unittest.cc

Issue 2541743006: Increase test timeout to combat flakiness. (Closed)
Patch Set: Set timeout in constant Created 4 years 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 unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2014 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
11 #include "webrtc/modules/video_coding/utility/quality_scaler.h" 11 #include "webrtc/modules/video_coding/utility/quality_scaler.h"
12 12
13 #include <memory> 13 #include <memory>
14 14
15 #include "webrtc/base/event.h" 15 #include "webrtc/base/event.h"
16 #include "webrtc/base/task_queue.h" 16 #include "webrtc/base/task_queue.h"
17 #include "webrtc/test/gmock.h" 17 #include "webrtc/test/gmock.h"
18 #include "webrtc/test/gtest.h" 18 #include "webrtc/test/gtest.h"
19 19
20 namespace webrtc { 20 namespace webrtc {
21 namespace { 21 namespace {
22 static const int kFramerate = 30; 22 static const int kFramerate = 30;
23 static const int kLowQp = 15; 23 static const int kLowQp = 15;
24 static const int kLowQpThreshold = 18; 24 static const int kLowQpThreshold = 18;
25 static const int kHighQp = 40; 25 static const int kHighQp = 40;
26 static const size_t kDefaultTimeoutMs = 1000; 26 static const size_t kDefaultTimeoutMs = 150;
27 } // namespace 27 } // namespace
28 28
29 class MockScaleObserver : public ScalingObserverInterface { 29 class MockScaleObserver : public ScalingObserverInterface {
30 public: 30 public:
31 MockScaleObserver() : event(false, false) {} 31 MockScaleObserver() : event(false, false) {}
32 virtual ~MockScaleObserver() {} 32 virtual ~MockScaleObserver() {}
33 33
34 void ScaleUp(ScaleReason r) override { 34 void ScaleUp(ScaleReason r) override {
35 scaled_up++; 35 scaled_up++;
36 event.Set(); 36 event.Set();
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
103 } 103 }
104 } 104 }
105 105
106 std::unique_ptr<rtc::TaskQueue> q_; 106 std::unique_ptr<rtc::TaskQueue> q_;
107 std::unique_ptr<QualityScaler> qs_; 107 std::unique_ptr<QualityScaler> qs_;
108 std::unique_ptr<MockScaleObserver> observer_; 108 std::unique_ptr<MockScaleObserver> observer_;
109 }; 109 };
110 110
111 TEST_F(QualityScalerTest, DownscalesAfterContinuousFramedrop) { 111 TEST_F(QualityScalerTest, DownscalesAfterContinuousFramedrop) {
112 q_->PostTask([this] { TriggerScale(kScaleDown); }); 112 q_->PostTask([this] { TriggerScale(kScaleDown); });
113 EXPECT_TRUE(observer_->event.Wait(50)); 113 EXPECT_TRUE(observer_->event.Wait(kDefaultTimeoutMs));
114 EXPECT_EQ(1, observer_->scaled_down); 114 EXPECT_EQ(1, observer_->scaled_down);
115 } 115 }
116 116
117 TEST_F(QualityScalerTest, KeepsScaleAtHighQp) { 117 TEST_F(QualityScalerTest, KeepsScaleAtHighQp) {
118 q_->PostTask([this] { TriggerScale(kKeepScaleAtHighQp); }); 118 q_->PostTask([this] { TriggerScale(kKeepScaleAtHighQp); });
119 EXPECT_FALSE(observer_->event.Wait(50)); 119 EXPECT_FALSE(observer_->event.Wait(kDefaultTimeoutMs));
120 EXPECT_EQ(0, observer_->scaled_down); 120 EXPECT_EQ(0, observer_->scaled_down);
121 EXPECT_EQ(0, observer_->scaled_up); 121 EXPECT_EQ(0, observer_->scaled_up);
122 } 122 }
123 123
124 TEST_F(QualityScalerTest, DownscalesAboveHighQp) { 124 TEST_F(QualityScalerTest, DownscalesAboveHighQp) {
125 q_->PostTask([this] { TriggerScale(kScaleDownAboveHighQp); }); 125 q_->PostTask([this] { TriggerScale(kScaleDownAboveHighQp); });
126 EXPECT_TRUE(observer_->event.Wait(50)); 126 EXPECT_TRUE(observer_->event.Wait(kDefaultTimeoutMs));
127 EXPECT_EQ(1, observer_->scaled_down); 127 EXPECT_EQ(1, observer_->scaled_down);
128 EXPECT_EQ(0, observer_->scaled_up); 128 EXPECT_EQ(0, observer_->scaled_up);
129 } 129 }
130 130
131 TEST_F(QualityScalerTest, DownscalesAfterTwoThirdsFramedrop) { 131 TEST_F(QualityScalerTest, DownscalesAfterTwoThirdsFramedrop) {
132 q_->PostTask([this] { 132 q_->PostTask([this] {
133 qs_->ReportDroppedFrame(); 133 qs_->ReportDroppedFrame();
134 qs_->ReportDroppedFrame(); 134 qs_->ReportDroppedFrame();
135 qs_->ReportQP(kHighQp); 135 qs_->ReportQP(kHighQp);
136 }); 136 });
137 EXPECT_TRUE(observer_->event.Wait(50)); 137 EXPECT_TRUE(observer_->event.Wait(kDefaultTimeoutMs));
138 EXPECT_EQ(1, observer_->scaled_down); 138 EXPECT_EQ(1, observer_->scaled_down);
139 EXPECT_EQ(0, observer_->scaled_up); 139 EXPECT_EQ(0, observer_->scaled_up);
140 } 140 }
141 141
142 TEST_F(QualityScalerTest, DoesNotDownscaleOnNormalQp) { 142 TEST_F(QualityScalerTest, DoesNotDownscaleOnNormalQp) {
143 q_->PostTask([this] { TriggerScale(kScaleDownAboveHighQp); }); 143 q_->PostTask([this] { TriggerScale(kScaleDownAboveHighQp); });
144 EXPECT_TRUE(observer_->event.Wait(50)); 144 EXPECT_TRUE(observer_->event.Wait(kDefaultTimeoutMs));
145 EXPECT_EQ(1, observer_->scaled_down); 145 EXPECT_EQ(1, observer_->scaled_down);
146 EXPECT_EQ(0, observer_->scaled_up); 146 EXPECT_EQ(0, observer_->scaled_up);
147 } 147 }
148 148
149 TEST_F(QualityScalerTest, DoesNotDownscaleAfterHalfFramedrop) { 149 TEST_F(QualityScalerTest, DoesNotDownscaleAfterHalfFramedrop) {
150 q_->PostTask([this] { 150 q_->PostTask([this] {
151 qs_->ReportDroppedFrame(); 151 qs_->ReportDroppedFrame();
152 qs_->ReportQP(kHighQp); 152 qs_->ReportQP(kHighQp);
153 }); 153 });
154 EXPECT_FALSE(observer_->event.Wait(50)); 154 EXPECT_FALSE(observer_->event.Wait(kDefaultTimeoutMs));
155 EXPECT_EQ(0, observer_->scaled_down); 155 EXPECT_EQ(0, observer_->scaled_down);
156 EXPECT_EQ(0, observer_->scaled_up); 156 EXPECT_EQ(0, observer_->scaled_up);
157 } 157 }
158 158
159 TEST_F(QualityScalerTest, UpscalesAfterLowQp) { 159 TEST_F(QualityScalerTest, UpscalesAfterLowQp) {
160 q_->PostTask([this] { TriggerScale(kScaleUp); }); 160 q_->PostTask([this] { TriggerScale(kScaleUp); });
161 EXPECT_TRUE(observer_->event.Wait(50)); 161 EXPECT_TRUE(observer_->event.Wait(kDefaultTimeoutMs));
162 EXPECT_EQ(0, observer_->scaled_down); 162 EXPECT_EQ(0, observer_->scaled_down);
163 EXPECT_EQ(1, observer_->scaled_up); 163 EXPECT_EQ(1, observer_->scaled_up);
164 } 164 }
165 165
166 TEST_F(QualityScalerTest, ScalesDownAndBackUp) { 166 TEST_F(QualityScalerTest, ScalesDownAndBackUp) {
167 q_->PostTask([this] { TriggerScale(kScaleDown); }); 167 q_->PostTask([this] { TriggerScale(kScaleDown); });
168 EXPECT_TRUE(observer_->event.Wait(50)); 168 EXPECT_TRUE(observer_->event.Wait(kDefaultTimeoutMs));
169 EXPECT_EQ(1, observer_->scaled_down); 169 EXPECT_EQ(1, observer_->scaled_down);
170 EXPECT_EQ(0, observer_->scaled_up); 170 EXPECT_EQ(0, observer_->scaled_up);
171 q_->PostTask([this] { TriggerScale(kScaleUp); }); 171 q_->PostTask([this] { TriggerScale(kScaleUp); });
172 EXPECT_TRUE(observer_->event.Wait(50)); 172 EXPECT_TRUE(observer_->event.Wait(kDefaultTimeoutMs));
173 EXPECT_EQ(1, observer_->scaled_down); 173 EXPECT_EQ(1, observer_->scaled_down);
174 EXPECT_EQ(1, observer_->scaled_up); 174 EXPECT_EQ(1, observer_->scaled_up);
175 } 175 }
176 176
177 } // namespace webrtc 177 } // namespace webrtc
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698