Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(670)

Unified Diff: webrtc/modules/audio_processing/test/audioproc_float.cc

Issue 1800413002: Add IntelligibilityEnhancer support to audioproc_float (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@reverse
Patch Set: Rebasing Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/modules/audio_processing/test/audio_file_processor.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/modules/audio_processing/test/audioproc_float.cc
diff --git a/webrtc/modules/audio_processing/test/audioproc_float.cc b/webrtc/modules/audio_processing/test/audioproc_float.cc
index b403c1fe05e1c43b84617d63f09e6419732f29e6..41e45bfdc69c5c20525d89a0df3dc771fb70004d 100644
--- a/webrtc/modules/audio_processing/test/audioproc_float.cc
+++ b/webrtc/modules/audio_processing/test/audioproc_float.cc
@@ -42,10 +42,20 @@ DEFINE_string(
o,
"out.wav",
"Name of the output file to write the processed capture stream to.");
+DEFINE_string(ri, "", "Name of the render input stream file to read from.");
+DEFINE_string(
+ ro,
+ "out_reverse.wav",
+ "Name of the output file to write the processed render stream to.");
DEFINE_int32(out_channels, 1, "Number of output channels.");
const bool out_channels_dummy =
google::RegisterFlagValidator(&FLAGS_out_channels, &ValidateOutChannels);
+DEFINE_int32(rev_out_channels, 1, "Number of reverse output channels.");
+const bool rev_out_channels_dummy =
+ google::RegisterFlagValidator(&FLAGS_rev_out_channels,
+ &ValidateOutChannels);
DEFINE_int32(out_sample_rate, 48000, "Output sample rate in Hz.");
+DEFINE_int32(rev_out_sample_rate, 48000, "Reverse output sample rate in Hz.");
DEFINE_string(mic_positions, "",
"Space delimited cartesian coordinates of microphones in meters. "
"The coordinates of each point are contiguous. "
@@ -77,8 +87,7 @@ const char kUsage[] =
"an input capture WAV file or protobuf debug dump and writes to an output\n"
"WAV file.\n"
"\n"
- "All components are disabled by default. If any bi-directional components\n"
- "are enabled, only debug dump files are permitted.";
+ "All components are disabled by default.";
} // namespace
@@ -91,15 +100,6 @@ int main(int argc, char* argv[]) {
"An input file must be specified with either -i or -dump.\n");
return 1;
}
- if (FLAGS_dump.empty() && (FLAGS_aec || FLAGS_ie)) {
- fprintf(stderr, "-aec and -ie require a -dump file.\n");
- return 1;
- }
- if (FLAGS_ie) {
- fprintf(stderr,
- "FIXME(ajm): The intelligibility enhancer output is not dumped.\n");
- return 1;
- }
test::TraceToStderr trace_to_stderr(true);
Config config;
@@ -135,8 +135,24 @@ int main(int argc, char* argv[]) {
if (FLAGS_dump.empty()) {
auto in_file = std::unique_ptr<WavReader>(new WavReader(FLAGS_i));
std::cout << FLAGS_i << ": " << in_file->FormatAsString() << std::endl;
- processor.reset(new WavFileProcessor(std::move(ap), std::move(in_file),
- std::move(out_file)));
+ std::unique_ptr<WavReader> reverse_in_file;
+ std::unique_ptr<WavWriter> reverse_out_file;
+ if (!FLAGS_ri.empty()) {
+ reverse_in_file.reset(new WavReader(FLAGS_ri));
+ reverse_out_file.reset(new WavWriter(
+ FLAGS_ro,
+ FLAGS_rev_out_sample_rate,
+ static_cast<size_t>(FLAGS_rev_out_channels)));
+ std::cout << FLAGS_ri << ": "
+ << reverse_in_file->FormatAsString() << std::endl;
+ std::cout << FLAGS_ro << ": "
+ << reverse_out_file->FormatAsString() << std::endl;
+ }
+ processor.reset(new WavFileProcessor(std::move(ap),
+ std::move(in_file),
+ std::move(out_file),
+ std::move(reverse_in_file),
+ std::move(reverse_out_file)));
} else {
processor.reset(new AecDumpFileProcessor(
« no previous file with comments | « webrtc/modules/audio_processing/test/audio_file_processor.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698