From e81c5d6d7ef7fe31af974bfe54db1dde9f55d8a6 Mon Sep 17 00:00:00 2001 From: "aluebs@webrtc.org" Date: Wed, 21 Jan 2015 18:01:28 +0000 Subject: [PATCH] Fix TransientDetectorTest in modules_unittests on Android ARM64 BUG=webrtc:4200 R=kjellander@webrtc.org Review URL: https://webrtc-codereview.appspot.com/39569004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@8115 4adac7df-926f-26a2-2b94-8c16560cd09d --- .../transient/transient_detector_unittest.cc | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/webrtc/modules/audio_processing/transient/transient_detector_unittest.cc b/webrtc/modules/audio_processing/transient/transient_detector_unittest.cc index b6fd08da76..7e53f42c13 100644 --- a/webrtc/modules/audio_processing/transient/transient_detector_unittest.cc +++ b/webrtc/modules/audio_processing/transient/transient_detector_unittest.cc @@ -30,19 +30,13 @@ static const int kSampleRatesHz[] = {ts::kSampleRate8kHz, static const size_t kNumberOfSampleRates = sizeof(kSampleRatesHz) / sizeof(*kSampleRatesHz); -// Fails Android ARM64. https://code.google.com/p/webrtc/issues/detail?id=4200 -#if defined(WEBRTC_ANDROID) && defined(__aarch64__) -#define MAYBE_CorrectnessBasedOnFiles DISABLED_CorrectnessBasedOnFiles -#else -#define MAYBE_CorrectnessBasedOnFiles CorrectnessBasedOnFiles -#endif // This test is for the correctness of the transient detector. // Checks the results comparing them with the ones stored in the detect files in // the directory: resources/audio_processing/transient/ // The files contain all the results in double precision (Little endian). // The audio files used with different sample rates are stored in the same // directory. -TEST(TransientDetectorTest, MAYBE_CorrectnessBasedOnFiles) { +TEST(TransientDetectorTest, CorrectnessBasedOnFiles) { for (size_t i = 0; i < kNumberOfSampleRates; ++i) { int sample_rate_hz = kSampleRatesHz[i]; @@ -82,7 +76,7 @@ TEST(TransientDetectorTest, MAYBE_CorrectnessBasedOnFiles) { const size_t buffer_length = sample_rate_hz * ts::kChunkSizeMs / 1000; scoped_ptr buffer(new float[buffer_length]); - const float kTolerance = 0.01f; + const float kTolerance = 0.02f; size_t frames_read = 0;