mollyim/webrtc
1
0
Fork 0
mirror of https://github.com/mollyim/webrtc.git synced 2025-05-15 06:40:43 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Drop support for playing output through aplay in intelligibility_proc

Browse source 
It was hardly used, making the code more complex than needed and caused problems on iOS because it uses system.

BUG=webrtc:5549
R=kjellander@webrtc.org

Review URL: https://codereview.webrtc.org/1708353002 .

Cr-Commit-Position: refs/heads/master@{#11677}
This commit is contained in:
Alejandro Luebs 2016-02-18 19:16:08 -08:00
parent b3fb71c101
commit 4458d09ee4
2 changed files with 3 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
webrtc/modules/audio_processing/audio_processing_tests.gypi
View file

@ -72,18 +72,6 @@
'sources': [
'intelligibility/test/intelligibility_proc.cc',
],
'conditions': [
['OS=="ios"', {
'xcode_settings': {
'WARNING_CFLAGS': [
# Suppress compiler warnings about deprecated that triggered
# when moving from ios_deployment_target 7.0 to 9.0.
# See webrtc:5549 for more details.
'-Wno-deprecated-declarations',
],
},
}],
],
}, # intelligibility_proc
],
'conditions': [

30
webrtc/modules/audio_processing/intelligibility/test/intelligibility_proc.cc
View file

@ -14,26 +14,16 @@
// Use --help for options.
//
#include <stdint.h>
#include <stdlib.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <string>
#include "gflags/gflags.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "webrtc/base/checks.h"
#include "webrtc/base/criticalsection.h"
#include "webrtc/common_audio/include/audio_util.h"
#include "webrtc/common_audio/real_fourier.h"
#include "webrtc/common_audio/wav_file.h"
#include "webrtc/modules/audio_processing/audio_buffer.h"
#include "webrtc/modules/audio_processing/include/audio_processing.h"
#include "webrtc/modules/audio_processing/intelligibility/intelligibility_enhancer.h"
#include "webrtc/modules/audio_processing/intelligibility/intelligibility_utils.h"
#include "webrtc/modules/audio_processing/noise_suppression_impl.h"
#include "webrtc/system_wrappers/include/critical_section_wrapper.h"
#include "webrtc/test/testsupport/fileutils.h"
using std::complex;
@ -51,10 +41,7 @@ DEFINE_double(gain_limit, 1000.0, "Maximum gain change in one block.");
DEFINE_string(clear_file, "speech.wav", "Input file with clear speech.");
DEFINE_string(noise_file, "noise.wav", "Input file with noise data.");
DEFINE_string(out_file,
"proc_enhanced.wav",
"Enhanced output. Use '-' to "
"play through aplay immediately.");
DEFINE_string(out_file, "proc_enhanced.wav", "Enhanced output file.");
const size_t kNumChannels = 1;
@ -128,19 +115,8 @@ void void_main(int argc, char* argv[]) {
FloatToFloatS16(&in_fpcm[0], samples, &in_fpcm[0]);
if (FLAGS_out_file.compare("-") == 0) {
const std::string temp_out_filename =
test::TempFilename(test::WorkingDir(), "temp_wav_file");
{
WavWriter out_file(temp_out_filename, FLAGS_sample_rate, kNumChannels);
out_file.WriteSamples(&in_fpcm[0], samples);
}
system(("aplay " + temp_out_filename).c_str());
system(("rm " + temp_out_filename).c_str());
} else {
WavWriter out_file(FLAGS_out_file, FLAGS_sample_rate, kNumChannels);
out_file.WriteSamples(&in_fpcm[0], samples);
}
WavWriter out_file(FLAGS_out_file, FLAGS_sample_rate, kNumChannels);
out_file.WriteSamples(&in_fpcm[0], samples);
}
} // namespace