| 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);
|
|
|