OLD | NEW |
---|---|
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 |
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
101 break; | 101 break; |
102 } | 102 } |
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 #define DISABLED_TEST(basename, test) TEST_F(basename, DISABLED_##test) |
112 DISABLED_TEST(QualityScalerTest, DownscalesAfterContinuousFramedrop) { | |
åsapersson
2016/12/13 13:15:14
Could this be TEST_F(QualityScalerTest, DISABLED_D
kthelgason
2016/12/13 13:16:52
Of course, this was just easier to do with find/re
| |
112 q_->PostTask([this] { TriggerScale(kScaleDown); }); | 113 q_->PostTask([this] { TriggerScale(kScaleDown); }); |
113 EXPECT_TRUE(observer_->event.Wait(kDefaultTimeoutMs)); | 114 EXPECT_TRUE(observer_->event.Wait(kDefaultTimeoutMs)); |
114 EXPECT_EQ(1, observer_->scaled_down); | 115 EXPECT_EQ(1, observer_->scaled_down); |
115 } | 116 } |
116 | 117 |
117 TEST_F(QualityScalerTest, KeepsScaleAtHighQp) { | 118 DISABLED_TEST(QualityScalerTest, KeepsScaleAtHighQp) { |
118 q_->PostTask([this] { TriggerScale(kKeepScaleAtHighQp); }); | 119 q_->PostTask([this] { TriggerScale(kKeepScaleAtHighQp); }); |
119 EXPECT_FALSE(observer_->event.Wait(kDefaultTimeoutMs)); | 120 EXPECT_FALSE(observer_->event.Wait(kDefaultTimeoutMs)); |
120 EXPECT_EQ(0, observer_->scaled_down); | 121 EXPECT_EQ(0, observer_->scaled_down); |
121 EXPECT_EQ(0, observer_->scaled_up); | 122 EXPECT_EQ(0, observer_->scaled_up); |
122 } | 123 } |
123 | 124 |
124 TEST_F(QualityScalerTest, DownscalesAboveHighQp) { | 125 DISABLED_TEST(QualityScalerTest, DownscalesAboveHighQp) { |
125 q_->PostTask([this] { TriggerScale(kScaleDownAboveHighQp); }); | 126 q_->PostTask([this] { TriggerScale(kScaleDownAboveHighQp); }); |
126 EXPECT_TRUE(observer_->event.Wait(kDefaultTimeoutMs)); | 127 EXPECT_TRUE(observer_->event.Wait(kDefaultTimeoutMs)); |
127 EXPECT_EQ(1, observer_->scaled_down); | 128 EXPECT_EQ(1, observer_->scaled_down); |
128 EXPECT_EQ(0, observer_->scaled_up); | 129 EXPECT_EQ(0, observer_->scaled_up); |
129 } | 130 } |
130 | 131 |
131 TEST_F(QualityScalerTest, DownscalesAfterTwoThirdsFramedrop) { | 132 DISABLED_TEST(QualityScalerTest, DownscalesAfterTwoThirdsFramedrop) { |
132 q_->PostTask([this] { | 133 q_->PostTask([this] { |
133 qs_->ReportDroppedFrame(); | 134 qs_->ReportDroppedFrame(); |
134 qs_->ReportDroppedFrame(); | 135 qs_->ReportDroppedFrame(); |
135 qs_->ReportQP(kHighQp); | 136 qs_->ReportQP(kHighQp); |
136 }); | 137 }); |
137 EXPECT_TRUE(observer_->event.Wait(kDefaultTimeoutMs)); | 138 EXPECT_TRUE(observer_->event.Wait(kDefaultTimeoutMs)); |
138 EXPECT_EQ(1, observer_->scaled_down); | 139 EXPECT_EQ(1, observer_->scaled_down); |
139 EXPECT_EQ(0, observer_->scaled_up); | 140 EXPECT_EQ(0, observer_->scaled_up); |
140 } | 141 } |
141 | 142 |
142 TEST_F(QualityScalerTest, DoesNotDownscaleOnNormalQp) { | 143 DISABLED_TEST(QualityScalerTest, DoesNotDownscaleOnNormalQp) { |
143 q_->PostTask([this] { TriggerScale(kScaleDownAboveHighQp); }); | 144 q_->PostTask([this] { TriggerScale(kScaleDownAboveHighQp); }); |
144 EXPECT_TRUE(observer_->event.Wait(kDefaultTimeoutMs)); | 145 EXPECT_TRUE(observer_->event.Wait(kDefaultTimeoutMs)); |
145 EXPECT_EQ(1, observer_->scaled_down); | 146 EXPECT_EQ(1, observer_->scaled_down); |
146 EXPECT_EQ(0, observer_->scaled_up); | 147 EXPECT_EQ(0, observer_->scaled_up); |
147 } | 148 } |
148 | 149 |
149 TEST_F(QualityScalerTest, DoesNotDownscaleAfterHalfFramedrop) { | 150 DISABLED_TEST(QualityScalerTest, DoesNotDownscaleAfterHalfFramedrop) { |
150 q_->PostTask([this] { | 151 q_->PostTask([this] { |
151 qs_->ReportDroppedFrame(); | 152 qs_->ReportDroppedFrame(); |
152 qs_->ReportQP(kHighQp); | 153 qs_->ReportQP(kHighQp); |
153 }); | 154 }); |
154 EXPECT_FALSE(observer_->event.Wait(kDefaultTimeoutMs)); | 155 EXPECT_FALSE(observer_->event.Wait(kDefaultTimeoutMs)); |
155 EXPECT_EQ(0, observer_->scaled_down); | 156 EXPECT_EQ(0, observer_->scaled_down); |
156 EXPECT_EQ(0, observer_->scaled_up); | 157 EXPECT_EQ(0, observer_->scaled_up); |
157 } | 158 } |
158 | 159 |
159 TEST_F(QualityScalerTest, UpscalesAfterLowQp) { | 160 DISABLED_TEST(QualityScalerTest, UpscalesAfterLowQp) { |
160 q_->PostTask([this] { TriggerScale(kScaleUp); }); | 161 q_->PostTask([this] { TriggerScale(kScaleUp); }); |
161 EXPECT_TRUE(observer_->event.Wait(kDefaultTimeoutMs)); | 162 EXPECT_TRUE(observer_->event.Wait(kDefaultTimeoutMs)); |
162 EXPECT_EQ(0, observer_->scaled_down); | 163 EXPECT_EQ(0, observer_->scaled_down); |
163 EXPECT_EQ(1, observer_->scaled_up); | 164 EXPECT_EQ(1, observer_->scaled_up); |
164 } | 165 } |
165 | 166 |
166 TEST_F(QualityScalerTest, ScalesDownAndBackUp) { | 167 DISABLED_TEST(QualityScalerTest, ScalesDownAndBackUp) { |
167 q_->PostTask([this] { TriggerScale(kScaleDown); }); | 168 q_->PostTask([this] { TriggerScale(kScaleDown); }); |
168 EXPECT_TRUE(observer_->event.Wait(kDefaultTimeoutMs)); | 169 EXPECT_TRUE(observer_->event.Wait(kDefaultTimeoutMs)); |
169 EXPECT_EQ(1, observer_->scaled_down); | 170 EXPECT_EQ(1, observer_->scaled_down); |
170 EXPECT_EQ(0, observer_->scaled_up); | 171 EXPECT_EQ(0, observer_->scaled_up); |
171 q_->PostTask([this] { TriggerScale(kScaleUp); }); | 172 q_->PostTask([this] { TriggerScale(kScaleUp); }); |
172 EXPECT_TRUE(observer_->event.Wait(kDefaultTimeoutMs)); | 173 EXPECT_TRUE(observer_->event.Wait(kDefaultTimeoutMs)); |
173 EXPECT_EQ(1, observer_->scaled_down); | 174 EXPECT_EQ(1, observer_->scaled_down); |
174 EXPECT_EQ(1, observer_->scaled_up); | 175 EXPECT_EQ(1, observer_->scaled_up); |
175 } | 176 } |
176 | 177 #undef DISABLED_TEST |
177 } // namespace webrtc | 178 } // namespace webrtc |
OLD | NEW |