diff --git a/webrtc/modules/audio_coding/main/acm2/acm_receiver_unittest.cc b/webrtc/modules/audio_coding/main/acm2/acm_receiver_unittest.cc index 5e7940896..a00db9278 100644 --- a/webrtc/modules/audio_coding/main/acm2/acm_receiver_unittest.cc +++ b/webrtc/modules/audio_coding/main/acm2/acm_receiver_unittest.cc @@ -20,6 +20,7 @@ #include "webrtc/system_wrappers/interface/scoped_ptr.h" #include "webrtc/test/test_suite.h" #include "webrtc/test/testsupport/fileutils.h" +#include "webrtc/test/testsupport/gtest_disable.h" namespace webrtc { namespace { @@ -153,7 +154,7 @@ class AcmReceiverTest : public AudioPacketizationCallback, FrameType last_frame_type_; }; -TEST_F(AcmReceiverTest, AddCodecGetCodec) { +TEST_F(AcmReceiverTest, DISABLED_ON_ANDROID(AddCodecGetCodec)) { // Add codec. for (int n = 0; n < ACMCodecDB::kNumCodecs; ++n) { if (n & 0x1) // Just add codecs with odd index. @@ -176,7 +177,7 @@ TEST_F(AcmReceiverTest, AddCodecGetCodec) { } } -TEST_F(AcmReceiverTest, AddCodecChangePayloadType) { +TEST_F(AcmReceiverTest, DISABLED_ON_ANDROID(AddCodecChangePayloadType)) { CodecInst ref_codec; const int codec_id = ACMCodecDB::kPCMA; EXPECT_EQ(0, ACMCodecDB::Codec(codec_id, &ref_codec)); @@ -200,7 +201,7 @@ TEST_F(AcmReceiverTest, AddCodecChangePayloadType) { EXPECT_TRUE(CodecsEqual(test_codec, ref_codec)); } -TEST_F(AcmReceiverTest, AddCodecRemoveCodec) { +TEST_F(AcmReceiverTest, DISABLED_ON_ANDROID(AddCodecRemoveCodec)) { CodecInst codec; const int codec_id = ACMCodecDB::kPCMA; EXPECT_EQ(0, ACMCodecDB::Codec(codec_id, &codec)); @@ -218,7 +219,7 @@ TEST_F(AcmReceiverTest, AddCodecRemoveCodec) { EXPECT_EQ(-1, receiver_->DecoderByPayloadType(payload_type, &codec)); } -TEST_F(AcmReceiverTest, SampleRate) { +TEST_F(AcmReceiverTest, DISABLED_ON_ANDROID(SampleRate)) { const int kCodecId[] = { ACMCodecDB::kISAC, ACMCodecDB::kISACSWB, ACMCodecDB::kISACFB, -1 // Terminator. @@ -242,7 +243,8 @@ TEST_F(AcmReceiverTest, SampleRate) { } // Changing playout mode to FAX should not change the background noise mode. -TEST_F(AcmReceiverTest, PlayoutModeAndBackgroundNoiseMode) { +TEST_F(AcmReceiverTest, + DISABLED_ON_ANDROID(PlayoutModeAndBackgroundNoiseMode)) { EXPECT_EQ(kBgnOn, receiver_->BackgroundNoiseModeForTest()); // Default receiver_->SetPlayoutMode(voice); @@ -270,7 +272,7 @@ TEST_F(AcmReceiverTest, PlayoutModeAndBackgroundNoiseMode) { EXPECT_EQ(kBgnOn, receiver_->BackgroundNoiseModeForTest()); } -TEST_F(AcmReceiverTest, PostdecodingVad) { +TEST_F(AcmReceiverTest, DISABLED_ON_ANDROID(PostdecodingVad)) { receiver_->EnableVad(); EXPECT_TRUE(receiver_->vad_enabled()); @@ -298,7 +300,7 @@ TEST_F(AcmReceiverTest, PostdecodingVad) { EXPECT_EQ(AudioFrame::kVadUnknown, frame.vad_activity_); } -TEST_F(AcmReceiverTest, FlushBuffer) { +TEST_F(AcmReceiverTest, DISABLED_ON_ANDROID(FlushBuffer)) { const int id = ACMCodecDB::kISAC; EXPECT_EQ(0, receiver_->AddCodec(id, codecs_[id].pltype, codecs_[id].channels, NULL)); @@ -315,7 +317,7 @@ TEST_F(AcmReceiverTest, FlushBuffer) { ASSERT_EQ(0, statistics.currentBufferSize); } -TEST_F(AcmReceiverTest, PlayoutTimestamp) { +TEST_F(AcmReceiverTest, DISABLED_ON_ANDROID(PlayoutTimestamp)) { const int id = ACMCodecDB::kPCM16Bwb; EXPECT_EQ(0, receiver_->AddCodec(id, codecs_[id].pltype, codecs_[id].channels, NULL)); @@ -347,7 +349,7 @@ TEST_F(AcmReceiverTest, PlayoutTimestamp) { } } -TEST_F(AcmReceiverTest, LastAudioCodec) { +TEST_F(AcmReceiverTest, DISABLED_ON_ANDROID(LastAudioCodec)) { const int kCodecId[] = { ACMCodecDB::kISAC, ACMCodecDB::kPCMA, ACMCodecDB::kISACSWB, ACMCodecDB::kPCM16Bswb32kHz, ACMCodecDB::kG722_1C_48,