diff --git a/webrtc/modules/audio_processing/include/audio_processing.h b/webrtc/modules/audio_processing/include/audio_processing.h index f91d53aff2..63c70f7e2a 100644 --- a/webrtc/modules/audio_processing/include/audio_processing.h +++ b/webrtc/modules/audio_processing/include/audio_processing.h @@ -78,7 +78,11 @@ struct ReportedDelay { // [12, 255]. Here, 255 maps to 100%. // // Must be provided through AudioProcessing::Create(Confg&). +#if defined(WEBRTC_CHROMIUM_BUILD) static const int kAgcStartupMinVolume = 85; +#else +static const int kAgcStartupMinVolume = 0; +#endif // defined(WEBRTC_CHROMIUM_BUILD) struct ExperimentalAgc { ExperimentalAgc() : enabled(true), startup_min_volume(kAgcStartupMinVolume) {} ExperimentalAgc(bool enabled) diff --git a/webrtc/tools/agc/agc_manager_unittest.cc b/webrtc/tools/agc/agc_manager_unittest.cc index e126c017f2..c379d2d5b0 100644 --- a/webrtc/tools/agc/agc_manager_unittest.cc +++ b/webrtc/tools/agc/agc_manager_unittest.cc @@ -388,8 +388,13 @@ TEST_F(AgcManagerUnitTest, ChangingDevicesChecksVolume) { TEST_F(AgcManagerUnitTest, LowInitialVolumeIsRaised) { ExpectCheckVolumeAndReset(11u); - // Should set MicVolume to kMinInitMicLevel = 85. +#if defined(WEBRTC_CHROMIUM_BUILD) + // Should set MicVolume to kMinInitMicLevel = 85 if built with Chromium. EXPECT_CALL(volume_, SetMicVolume(Eq(85u))).WillOnce(Return(0)); +#else + // Otherwise it will raise to the kMinMicLevel = 12. + EXPECT_CALL(volume_, SetMicVolume(Eq(12u))).WillOnce(Return(0)); +#endif PostProcCallback(1); EXPECT_CALL(*agc_, GetRmsErrorDb(_)) .WillOnce(Return(false));