zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Disable ViEEncoderTest.InitialFrameDropOffWhenEncoderDisabledScaling on tsan

Browse Source 
BUG=webrtc:7260
TBR=magjed@webrtc.org
NOTRY=true

Review-Url: https://codereview.webrtc.org/2722863002
Cr-Commit-Position: refs/heads/master@{#16919}
This commit is contained in:
danilchap
2017-02-28 10:12:29 -08:00
committed by Commit bot
parent 9751c45910
commit b050cf9903
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
webrtc/video/vie_encoder_unittest.cc
View File

@ -1188,7 +1188,15 @@ TEST_F(ViEEncoderTest, InitialFrameDropOffWithMaintainResolutionPreference) {
vie_encoder_->Stop(); 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_width = 640;
int frame_height = 360; int frame_height = 360;
fake_encoder_.SetQualityScaling(false); fake_encoder_.SetQualityScaling(false);