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

Side by Side Diff: webrtc/video/vie_encoder_unittest.cc

Issue 2722863002: Disable ViEEncoderTest.InitialFrameDropOffWhenEncoderDisabledScaling on tsan (Closed)
Patch Set: . Created 3 years, 9 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 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) 2016 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2016 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 1170 matching lines...) Expand 10 before | Expand all | Expand 10 after
1181 VideoSendStream::DegradationPreference::kMaintainResolution); 1181 VideoSendStream::DegradationPreference::kMaintainResolution);
1182 1182
1183 video_source_.IncomingCapturedFrame( 1183 video_source_.IncomingCapturedFrame(
1184 CreateFrame(1, frame_width, frame_height)); 1184 CreateFrame(1, frame_width, frame_height));
1185 // Frame should not be dropped, even if it's too large. 1185 // Frame should not be dropped, even if it's too large.
1186 sink_.WaitForEncodedFrame(1); 1186 sink_.WaitForEncodedFrame(1);
1187 1187
1188 vie_encoder_->Stop(); 1188 vie_encoder_->Stop();
1189 } 1189 }
1190 1190
1191 TEST_F(ViEEncoderTest, InitialFrameDropOffWhenEncoderDisabledScaling) { 1191 // Disable for TSan v2, see https://crbug.com/webrtc/7260 for details.
1192 #if defined(THREAD_SANITIZER)
1193 #define MAYBE_InitialFrameDropOffWhenEncoderDisabledScaling \
1194 DISABLED_InitialFrameDropOffWhenEncoderDisabledScaling
1195 #else
1196 #define MAYBE_InitialFrameDropOffWhenEncoderDisabledScaling \
1197 InitialFrameDropOffWhenEncoderDisabledScaling
1198 #endif
1199 TEST_F(ViEEncoderTest, MAYBE_InitialFrameDropOffWhenEncoderDisabledScaling) {
1192 int frame_width = 640; 1200 int frame_width = 640;
1193 int frame_height = 360; 1201 int frame_height = 360;
1194 fake_encoder_.SetQualityScaling(false); 1202 fake_encoder_.SetQualityScaling(false);
1195 vie_encoder_->OnBitrateUpdated(kLowTargetBitrateBps, 0, 0); 1203 vie_encoder_->OnBitrateUpdated(kLowTargetBitrateBps, 0, 0);
1196 // Force quality scaler reconfiguration by resetting the source. 1204 // Force quality scaler reconfiguration by resetting the source.
1197 vie_encoder_->SetSource(&video_source_, 1205 vie_encoder_->SetSource(&video_source_,
1198 VideoSendStream::DegradationPreference::kBalanced); 1206 VideoSendStream::DegradationPreference::kBalanced);
1199 1207
1200 video_source_.IncomingCapturedFrame( 1208 video_source_.IncomingCapturedFrame(
1201 CreateFrame(1, frame_width, frame_height)); 1209 CreateFrame(1, frame_width, frame_height));
(...skipping 26 matching lines...) Expand all
1228 1236
1229 // Trigger CPU normal use, return to original resoluton; 1237 // Trigger CPU normal use, return to original resoluton;
1230 vie_encoder_->TriggerCpuNormalUsage(); 1238 vie_encoder_->TriggerCpuNormalUsage();
1231 video_source_.IncomingCapturedFrame( 1239 video_source_.IncomingCapturedFrame(
1232 CreateFrame(3, kFrameWidth, kFrameHeight)); 1240 CreateFrame(3, kFrameWidth, kFrameHeight));
1233 sink_.WaitForEncodedFrame(kFrameWidth, kFrameHeight); 1241 sink_.WaitForEncodedFrame(kFrameWidth, kFrameHeight);
1234 1242
1235 vie_encoder_->Stop(); 1243 vie_encoder_->Stop();
1236 } 1244 }
1237 } // namespace webrtc 1245 } // 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