From ff108fe5084e8326e7c38be728557758bd58b1e7 Mon Sep 17 00:00:00 2001 From: "kjellander@webrtc.org" Date: Thu, 22 Jan 2015 19:02:03 +0000 Subject: [PATCH] Revert 8125 "Modify some tests to never use DTX disable mode" Broke compile on the Chromium FYI bots: http://build.chromium.org/p/chromium.webrtc.fyi/builders/Win%20Builder/builds/3483 http://build.chromium.org/p/chromium.webrtc.fyi/builders/Mac/builds/16028 http://build.chromium.org/p/chromium.webrtc.fyi/builders/Linux/builds/14293 Error: In file included from ../../third_party/webrtc/voice_engine/channel.cc:13: In file included from ../../third_party/webrtc/base/checks.h:22: In file included from ../../third_party/webrtc/overrides/webrtc/base/logging.h:35: ../../base/logging.h:367:9:error: 'LOG' macro redefined [-Werror,-Wmacro-redefined] #define LOG(severity) LAZY_STREAM(LOG_STREAM(severity), LOG_IS_ON(severity)) ^ ../../third_party/webrtc/system_wrappers/interface/logging.h:123:9: note: previous definition is here #define LOG(sev) \ ^ In file included from ../../third_party/webrtc/voice_engine/channel.cc:13: In file included from ../../third_party/webrtc/base/checks.h:22: ../../third_party/webrtc/overrides/webrtc/base/logging.h:189:9:error: 'LOG_V' macro redefined [-Werror,-Wmacro-redefined] #define LOG_V(sev) DIAGNOSTIC_LOG(sev, NONE, 0) ^ ../../third_party/webrtc/system_wrappers/interface/logging.h:129:9: note: previous definition is here #define LOG_V(sev) \ ^ 2 errors generated. > Modify some tests to never use DTX disable mode > > DTX disable mode will be removed as a part of the ACM redesign work. > > COAUTHOR:kwiberg@webrtc.org > > R=henrika@webrtc.org > > Review URL: https://webrtc-codereview.appspot.com/34769004 TBR=henrik.lundin@webrtc.org Review URL: https://webrtc-codereview.appspot.com/35859004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@8129 4adac7df-926f-26a2-2b94-8c16560cd09d --- webrtc/modules/audio_coding/main/test/TestVADDTX.cc | 4 ++-- webrtc/voice_engine/channel.cc | 2 -- .../test/auto_test/standard/codec_test.cc | 13 ++++++------- 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/webrtc/modules/audio_coding/main/test/TestVADDTX.cc b/webrtc/modules/audio_coding/main/test/TestVADDTX.cc index 97a7301ac0..06e795142d 100644 --- a/webrtc/modules/audio_coding/main/test/TestVADDTX.cc +++ b/webrtc/modules/audio_coding/main/test/TestVADDTX.cc @@ -141,8 +141,8 @@ void TestVADDTX::runTestCases() { Run(); VerifyTest(); - // #5 DTX = ON, VAD = ON, VADNormal - SetVAD(true, true, VADNormal); + // #5 DTX = ON, VAD = OFF, VADNormal + SetVAD(true, false, VADNormal); Run(); VerifyTest(); } diff --git a/webrtc/voice_engine/channel.cc b/webrtc/voice_engine/channel.cc index 1d6f83cdc7..dec40cbdf0 100644 --- a/webrtc/voice_engine/channel.cc +++ b/webrtc/voice_engine/channel.cc @@ -10,7 +10,6 @@ #include "webrtc/voice_engine/channel.h" -#include "webrtc/base/checks.h" #include "webrtc/base/format_macros.h" #include "webrtc/base/timeutils.h" #include "webrtc/common.h" @@ -1353,7 +1352,6 @@ Channel::SetVADStatus(bool enableVAD, ACMVADMode mode, bool disableDTX) { WEBRTC_TRACE(kTraceInfo, kTraceVoice, VoEId(_instanceId,_channelId), "Channel::SetVADStatus(mode=%d)", mode); - DCHECK(!(disableDTX && enableVAD)) << "disableDTX mode is deprecated"; // To disable VAD, DTX must be disabled too disableDTX = ((enableVAD == false) ? true : disableDTX); if (audio_coding_->SetVAD(!disableDTX, enableVAD, mode) != 0) diff --git a/webrtc/voice_engine/test/auto_test/standard/codec_test.cc b/webrtc/voice_engine/test/auto_test/standard/codec_test.cc index 3460f0a5c2..3b56bae54c 100644 --- a/webrtc/voice_engine/test/auto_test/standard/codec_test.cc +++ b/webrtc/voice_engine/test/auto_test/standard/codec_test.cc @@ -97,17 +97,16 @@ TEST_F(CodecTest, VoiceActivityDetectionTypeSettingsCanBeChanged) { EXPECT_EQ(vad_mode, webrtc::kVadAggressiveMid); EXPECT_FALSE(dtx_disabled); - // The fourth argument is the DTX disable flag, which is always supposed to - // be false. - EXPECT_EQ(0, voe_codec_->SetVADStatus(channel_, true, - webrtc::kVadAggressiveHigh, false)); + // The fourth argument is the DTX disable flag. + EXPECT_EQ(0, voe_codec_->SetVADStatus( + channel_, true, webrtc::kVadAggressiveHigh, true)); EXPECT_EQ(0, voe_codec_->GetVADStatus( channel_, vad_enabled, vad_mode, dtx_disabled)); EXPECT_EQ(vad_mode, webrtc::kVadAggressiveHigh); - EXPECT_FALSE(dtx_disabled); + EXPECT_TRUE(dtx_disabled); - EXPECT_EQ(0, voe_codec_->SetVADStatus(channel_, true, - webrtc::kVadConventional, false)); + EXPECT_EQ(0, voe_codec_->SetVADStatus( + channel_, true, webrtc::kVadConventional, true)); EXPECT_EQ(0, voe_codec_->GetVADStatus( channel_, vad_enabled, vad_mode, dtx_disabled)); EXPECT_EQ(vad_mode, webrtc::kVadConventional);