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

Unified Diff: media/audio/android/audio_android_unittest.cc

Issue 1275783003: Add a virtual beamforming audio device on ChromeOS. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix some cross-platform errors. Created 5 years, 3 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: media/audio/android/audio_android_unittest.cc
diff --git a/media/audio/android/audio_android_unittest.cc b/media/audio/android/audio_android_unittest.cc
index 64b3b4ba61361c3e58f6aa257b82aa5382a67356..674db691936e52deb5093ce3b3ca0163e7c46bff 100644
--- a/media/audio/android/audio_android_unittest.cc
+++ b/media/audio/android/audio_android_unittest.cc
@@ -591,13 +591,14 @@ class AudioAndroidInputTest : public AudioAndroidOutputTest,
// Override the platform effects setting to use the AudioRecord or OpenSLES
// path as requested.
- int effects = GetParam() ? AudioParameters::ECHO_CANCELLER :
- AudioParameters::NO_EFFECTS;
+ AudioParameters::PlatformEffectsMask effects =
+ GetParam() ? AudioParameters::ECHO_CANCELLER
+ : AudioParameters::NO_EFFECTS;
AudioParameters params(audio_input_parameters().format(),
audio_input_parameters().channel_layout(),
audio_input_parameters().sample_rate(),
audio_input_parameters().bits_per_sample(),
- audio_input_parameters().frames_per_buffer(),
+ audio_input_parameters().frames_per_buffer(), "",
effects);
return params;
}
@@ -797,12 +798,11 @@ TEST_P(AudioAndroidInputTest, DISABLED_StartInputStreamCallbacks) {
TEST_P(AudioAndroidInputTest,
DISABLED_StartInputStreamCallbacksNonDefaultParameters) {
AudioParameters native_params = GetInputStreamParameters();
- AudioParameters params(native_params.format(),
- native_params.channel_layout(),
+ AudioParameters params(native_params.format(), native_params.channel_layout(),
native_params.sample_rate(),
native_params.bits_per_sample(),
native_params.sample_rate() / 100,
- native_params.effects());
+ std::vector<Point>(), native_params.effects());
StartInputStreamCallbacks(params);
}
@@ -933,14 +933,13 @@ TEST_P(AudioAndroidInputTest,
// parameters by selecting 10ms as buffer size. This will also ensure that
// the output stream will be a mono stream since mono is default for input
// audio on Android.
- AudioParameters io_params(default_input_params.format(),
- default_input_params.channel_layout(),
- ChannelLayoutToChannelCount(
- default_input_params.channel_layout()),
- default_input_params.sample_rate(),
- default_input_params.bits_per_sample(),
- default_input_params.sample_rate() / 100,
- default_input_params.effects());
+ AudioParameters io_params(
+ default_input_params.format(),
+ ChannelLayoutToChannelCount(default_input_params.channel_layout()),
+ default_input_params.channel_layout(), default_input_params.sample_rate(),
+ default_input_params.bits_per_sample(),
+ default_input_params.sample_rate() / 100, std::vector<Point>(),
+ default_input_params.effects());
DVLOG(1) << io_params;
// Create input and output streams using the common audio parameters.

Powered by Google App Engine
This is Rietveld 408576698