From c339276b3213aacfe20409d5f1616653b4ace7de Mon Sep 17 00:00:00 2001 From: "minyue@webrtc.org" Date: Thu, 12 Mar 2015 16:00:46 +0000 Subject: [PATCH] Fixing r8698. 8698 causing android bots to fail. This is a fix. BUG= R=turaj@webrtc.org TBR=henrik.lundin@webrtc.org Review URL: https://webrtc-codereview.appspot.com/41259004 Cr-Commit-Position: refs/heads/master@{#8699} git-svn-id: http://webrtc.googlecode.com/svn/trunk@8699 4adac7df-926f-26a2-2b94-8c16560cd09d --- .../audio_coding/main/acm2/acm_generic_codec_opus_test.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/webrtc/modules/audio_coding/main/acm2/acm_generic_codec_opus_test.cc b/webrtc/modules/audio_coding/main/acm2/acm_generic_codec_opus_test.cc index e06a74c0b0..de5cc855a8 100644 --- a/webrtc/modules/audio_coding/main/acm2/acm_generic_codec_opus_test.cc +++ b/webrtc/modules/audio_coding/main/acm2/acm_generic_codec_opus_test.cc @@ -119,16 +119,16 @@ TEST_F(AcmGenericCodecOpusTest, ToggleDtx) { // Audio mode is not allowed when DTX is on, and DTX forcing flag is false. EXPECT_EQ(-1, codec_wrapper_->SetOpusApplication(kAudio, false)); - EXPECT_EQ(true, GetAudioEncoderOpus()->dtx_enabled()); + EXPECT_TRUE(GetAudioEncoderOpus()->dtx_enabled()); // Audio mode will be set, if DTX forcing flag is true. Then DTX is switched // off. EXPECT_EQ(0, codec_wrapper_->SetOpusApplication(kAudio, true)); - EXPECT_EQ(false, GetAudioEncoderOpus()->dtx_enabled()); + EXPECT_FALSE(GetAudioEncoderOpus()->dtx_enabled()); // Now we set VOIP mode. The DTX forcing flag has no effect. EXPECT_EQ(0, codec_wrapper_->SetOpusApplication(kVoip, true)); - EXPECT_EQ(false, GetAudioEncoderOpus()->dtx_enabled()); + EXPECT_FALSE(GetAudioEncoderOpus()->dtx_enabled()); // In VOIP mode, we can enable DTX with mode forcing flag being false. EXPECT_EQ(0, codec_wrapper_->EnableOpusDtx(false));