From 0238ba83272cff3820b90890eb32f5be7ec6d1e7 Mon Sep 17 00:00:00 2001 From: henrika Date: Tue, 28 Mar 2017 04:38:29 -0700 Subject: [PATCH] Ensures that audio device tests works when run through remote desktop BUG=webrtc:7397 Review-Url: https://codereview.webrtc.org/2779023002 Cr-Commit-Position: refs/heads/master@{#17417} --- webrtc/modules/audio_device/audio_device_unittest.cc | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/webrtc/modules/audio_device/audio_device_unittest.cc b/webrtc/modules/audio_device/audio_device_unittest.cc index 6e1d3dc973..de9c197945 100644 --- a/webrtc/modules/audio_device/audio_device_unittest.cc +++ b/webrtc/modules/audio_device/audio_device_unittest.cc @@ -229,9 +229,11 @@ class AudioDeviceTest : public ::testing::Test { EXPECT_EQ(0, audio_device_->InitMicrophone()); EXPECT_EQ(0, audio_device_->StereoPlayoutIsAvailable(&stereo_playout_)); EXPECT_EQ(0, audio_device_->SetStereoPlayout(stereo_playout_)); - EXPECT_EQ(0, - audio_device_->StereoRecordingIsAvailable(&stereo_recording_)); - EXPECT_EQ(0, audio_device_->SetStereoRecording(stereo_recording_)); + // Avoid asking for input stereo support and always record in mono + // since asking can cause issues in combination with remote desktop. + // See https://bugs.chromium.org/p/webrtc/issues/detail?id=7397 for + // details. + EXPECT_EQ(0, audio_device_->SetStereoRecording(false)); EXPECT_EQ(0, audio_device_->SetAGC(false)); EXPECT_FALSE(audio_device_->AGC()); } @@ -283,7 +285,6 @@ class AudioDeviceTest : public ::testing::Test { rtc::Event event_; rtc::scoped_refptr audio_device_; bool stereo_playout_ = false; - bool stereo_recording_ = false; }; // Uses the test fixture to create, initialize and destruct the ADM.