Index: webrtc/modules/audio_processing/audio_processing_unittest.cc |
diff --git a/webrtc/modules/audio_processing/audio_processing_unittest.cc b/webrtc/modules/audio_processing/audio_processing_unittest.cc |
index fb2f214bedaf671468a8bb4376122137140966b7..ea86e7dcfd04ca3034b035b2887017f53fbbf119 100644 |
--- a/webrtc/modules/audio_processing/audio_processing_unittest.cc |
+++ b/webrtc/modules/audio_processing/audio_processing_unittest.cc |
@@ -391,7 +391,6 @@ class ApmTest : public ::testing::Test { |
void VerifyDebugDumpTest(Format format); |
const std::string output_path_; |
- const std::string ref_path_; |
const std::string ref_filename_; |
std::unique_ptr<AudioProcessing> apm_; |
AudioFrame* frame_; |
@@ -407,21 +406,18 @@ class ApmTest : public ::testing::Test { |
ApmTest::ApmTest() |
: output_path_(test::OutputPath()), |
-#ifndef WEBRTC_IOS |
- ref_path_(test::ProjectRootPath() + "data/audio_processing/"), |
-#else |
- // On iOS test data is flat in the project root dir |
- ref_path_(test::ProjectRootPath()), |
-#endif |
#if defined(WEBRTC_AUDIOPROC_FIXED_PROFILE) |
- ref_filename_(ref_path_ + "output_data_fixed.pb"), |
+ ref_filename_(test::ResourcePath("audio_processing/output_data_fixed", |
+ "pb")), |
#elif defined(WEBRTC_AUDIOPROC_FLOAT_PROFILE) |
#if defined(WEBRTC_MAC) |
// A different file for Mac is needed because on this platform the AEC |
// constant |kFixedDelayMs| value is 20 and not 50 as it is on the rest. |
- ref_filename_(ref_path_ + "output_data_mac.pb"), |
+ ref_filename_(test::ResourcePath("audio_processing/output_data_mac", |
+ "pb")), |
#else |
- ref_filename_(ref_path_ + "output_data_float.pb"), |
+ ref_filename_(test::ResourcePath("audio_processing/output_data_float", |
+ "pb")), |
#endif |
#endif |
frame_(NULL), |
@@ -431,6 +427,7 @@ ApmTest::ApmTest() |
far_file_(NULL), |
near_file_(NULL), |
out_file_(NULL) { |
+ fprintf(stderr, "ref_filename: %s\n", ref_filename_.c_str()); |
kjellander_webrtc
2016/11/17 16:40:31
Please remove this. I think it's very useful if it
ehmaldonado_webrtc
2016/11/17 16:46:25
Done.
|
Config config; |
config.Set<ExperimentalAgc>(new ExperimentalAgc(false)); |
apm_.reset(AudioProcessing::Create(config)); |