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

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

Issue 2834643002: audioproc_f with simulated mic analog gain (Closed)
Patch Set: FakeRecordingDevice interface simplified, UTs fixes, logs verbosity-- Created 3 years, 7 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
Index: webrtc/modules/audio_processing/test/wav_based_simulator.cc
diff --git a/webrtc/modules/audio_processing/test/wav_based_simulator.cc b/webrtc/modules/audio_processing/test/wav_based_simulator.cc
index 6cf0b744e6f5c040c81f7b8798e0992008c96b63..c7baeb53868034fda42c5a4d2c4e66d92a6b9dde 100644
--- a/webrtc/modules/audio_processing/test/wav_based_simulator.cc
+++ b/webrtc/modules/audio_processing/test/wav_based_simulator.cc
@@ -12,8 +12,11 @@
#include <stdio.h>
#include <iostream>
+#include <memory>
+#include <utility>
#include "webrtc/base/checks.h"
+#include "webrtc/modules/audio_processing/test/fake_recording_device.h"
#include "webrtc/modules/audio_processing/test/test_utils.h"
#include "webrtc/test/testsupport/trace_to_stderr.h"
@@ -55,7 +58,11 @@ WavBasedSimulator::GetCustomEventChain(const std::string& filename) {
}
WavBasedSimulator::WavBasedSimulator(const SimulationSettings& settings)
- : AudioProcessingSimulator(settings) {}
+ : AudioProcessingSimulator(settings) {
+ // When a wav file is used, there is no information available about the mic
+ // gain level.
+ real_recording_device_level_ = FakeRecordingDevice::kRealDeviceLevelUnknown;
peah-webrtc 2017/05/05 20:25:21 This seems like exactly what to use Optional for.
AleBzk 2017/05/16 08:53:04 Done.
+}
WavBasedSimulator::~WavBasedSimulator() = default;
@@ -79,10 +86,6 @@ void WavBasedSimulator::PrepareProcessStreamCall() {
ap_->echo_cancellation()->set_stream_drift_samples(
settings_.stream_drift_samples ? *settings_.stream_drift_samples : 0);
-
- RTC_CHECK_EQ(AudioProcessing::kNoError,
- ap_->gain_control()->set_stream_analog_level(
- last_specified_microphone_level_));
}
void WavBasedSimulator::PrepareReverseProcessStreamCall() {
@@ -143,10 +146,6 @@ bool WavBasedSimulator::HandleProcessStreamCall() {
if (samples_left_to_process) {
PrepareProcessStreamCall();
ProcessStream(settings_.fixed_interface);
- // Call stream analog level to ensure that any side-effects are triggered.
- (void)ap_->gain_control()->stream_analog_level();
- last_specified_microphone_level_ =
- ap_->gain_control()->stream_analog_level();
}
return samples_left_to_process;
}

Powered by Google App Engine
This is Rietveld 408576698