From 11af0395900c302b73b3a4c0ef0257027be188b7 Mon Sep 17 00:00:00 2001 From: "minyue@webrtc.org" Date: Wed, 21 Jan 2015 14:22:39 +0000 Subject: [PATCH] Disable AcmSenderBitExactnessOldApi.Opus_stereo_20ms_voip on ARM64. BUG=4199 R=henrik.lundin@webrtc.org, kjellander@webrtc.org Review URL: https://webrtc-codereview.appspot.com/37729004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@8114 4adac7df-926f-26a2-2b94-8c16560cd09d --- .../main/acm2/audio_coding_module_unittest_oldapi.cc | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/webrtc/modules/audio_coding/main/acm2/audio_coding_module_unittest_oldapi.cc b/webrtc/modules/audio_coding/main/acm2/audio_coding_module_unittest_oldapi.cc index 84d55585ca..2bcefacc73 100644 --- a/webrtc/modules/audio_coding/main/acm2/audio_coding_module_unittest_oldapi.cc +++ b/webrtc/modules/audio_coding/main/acm2/audio_coding_module_unittest_oldapi.cc @@ -977,7 +977,13 @@ TEST_F(AcmSenderBitExactnessOldApi, MAYBE_Opus_stereo_20ms) { test::AcmReceiveTestOldApi::kStereoOutput); } -TEST_F(AcmSenderBitExactnessOldApi, Opus_stereo_20ms_voip) { +// Fails Android ARM64. https://code.google.com/p/webrtc/issues/detail?id=4199 +#if defined(WEBRTC_ANDROID) && defined(__aarch64__) +#define MAYBE_Opus_stereo_20ms_voip DISABLED_Opus_stereo_20ms_voip +#else +#define MAYBE_Opus_stereo_20ms_voip Opus_stereo_20ms_voip +#endif +TEST_F(AcmSenderBitExactnessOldApi, MAYBE_Opus_stereo_20ms_voip) { ASSERT_NO_FATAL_FAILURE(SetUpTest("opus", 48000, 2, 120, 960, 960)); // If not set, default will be kAudio in case of stereo. send_test_->acm()->SetOpusApplication(kVoip);