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

Unified Diff: webrtc/video/vie_encoder_unittest.cc

Issue 2722863002: Disable ViEEncoderTest.InitialFrameDropOffWhenEncoderDisabledScaling on tsan (Closed)
Patch Set: . Created 3 years, 10 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/video/vie_encoder_unittest.cc
diff --git a/webrtc/video/vie_encoder_unittest.cc b/webrtc/video/vie_encoder_unittest.cc
index 2c5609756dd6f02b9c862a735ad178a4d25d86d4..823df77b0c175bbf738735773f48e77f77e585f8 100644
--- a/webrtc/video/vie_encoder_unittest.cc
+++ b/webrtc/video/vie_encoder_unittest.cc
@@ -1188,7 +1188,15 @@ TEST_F(ViEEncoderTest, InitialFrameDropOffWithMaintainResolutionPreference) {
vie_encoder_->Stop();
}
-TEST_F(ViEEncoderTest, InitialFrameDropOffWhenEncoderDisabledScaling) {
+// Disable for TSan v2, see https://crbug.com/webrtc/7260 for details.
+#if defined(THREAD_SANITIZER)
+#define MAYBE_InitialFrameDropOffWhenEncoderDisabledScaling \
+ DISABLED_InitialFrameDropOffWhenEncoderDisabledScaling
+#else
+#define MAYBE_InitialFrameDropOffWhenEncoderDisabledScaling \
+ InitialFrameDropOffWhenEncoderDisabledScaling
+#endif
+TEST_F(ViEEncoderTest, MAYBE_InitialFrameDropOffWhenEncoderDisabledScaling) {
int frame_width = 640;
int frame_height = 360;
fake_encoder_.SetQualityScaling(false);
« 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