From 10abe25f6dcf2d6a3ff579ecc3101d97bad8f605 Mon Sep 17 00:00:00 2001 From: "kjellander@webrtc.org" Date: Mon, 17 Dec 2012 18:28:07 +0000 Subject: [PATCH] Make audioproc output files be written to output dir by default. This makes the following files be written into the output dir instead of the current working dir: * out.pcm * vad_out.dat * ns_prob.dat TEST=out/Debug/audioproc -aecm -ns -agc --fixed_digital --perf -pb resources/audioproc.aecdump All trybots passing. BUG=none Review URL: https://webrtc-codereview.appspot.com/1003005 git-svn-id: http://webrtc.googlecode.com/svn/trunk@3302 4adac7df-926f-26a2-2b94-8c16560cd09d --- .../modules/audio_processing/test/process_test.cc | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/webrtc/modules/audio_processing/test/process_test.cc b/webrtc/modules/audio_processing/test/process_test.cc index 70c4b1531e..34e37ff938 100644 --- a/webrtc/modules/audio_processing/test/process_test.cc +++ b/webrtc/modules/audio_processing/test/process_test.cc @@ -24,6 +24,7 @@ #include "webrtc/system_wrappers/interface/cpu_features_wrapper.h" #include "webrtc/system_wrappers/interface/scoped_ptr.h" #include "webrtc/system_wrappers/interface/tick_util.h" +#include "webrtc/test/testsupport/fileutils.h" #include "webrtc/test/testsupport/perf_test.h" #ifdef WEBRTC_ANDROID_PLATFORM_BUILD #include "external/webrtc/webrtc/modules/audio_processing/debug.pb.h" @@ -435,14 +436,15 @@ void void_main(int argc, char* argv[]) { printf("Reverse channels: %d \n", num_render_channels); } + const std::string out_path = webrtc::test::OutputPath(); const char far_file_default[] = "apm_far.pcm"; const char near_file_default[] = "apm_near.pcm"; - const char out_file_default[] = "out.pcm"; + const std::string out_file_default = out_path + "out.pcm"; const char event_filename[] = "apm_event.dat"; const char delay_filename[] = "apm_delay.dat"; const char drift_filename[] = "apm_drift.dat"; - const char vad_file_default[] = "vad_out.dat"; - const char ns_prob_file_default[] = "ns_prob.dat"; + const std::string vad_file_default = out_path + "vad_out.dat"; + const std::string ns_prob_file_default = out_path + "ns_prob.dat"; if (!simulating) { far_filename = far_file_default; @@ -450,15 +452,15 @@ void void_main(int argc, char* argv[]) { } if (!out_filename) { - out_filename = out_file_default; + out_filename = out_file_default.c_str(); } if (!vad_out_filename) { - vad_out_filename = vad_file_default; + vad_out_filename = vad_file_default.c_str(); } if (!ns_prob_filename) { - ns_prob_filename = ns_prob_file_default; + ns_prob_filename = ns_prob_file_default.c_str(); } FILE* pb_file = NULL;