summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorajm@chromium.org <ajm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-16 17:18:31 +0000
committerajm@chromium.org <ajm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-16 17:18:31 +0000
commit2ea1f86fef47fe041b837178ba2acb4613ccb385 (patch)
tree7f9056a1cdc81b8ce96fe9544a09d1c2c503be95 /media
parente490c3fa197a4b05d4cabcfd1f34cfeb23483bb2 (diff)
downloadchromium_src-2ea1f86fef47fe041b837178ba2acb4613ccb385.zip
chromium_src-2ea1f86fef47fe041b837178ba2acb4613ccb385.tar.gz
chromium_src-2ea1f86fef47fe041b837178ba2acb4613ccb385.tar.bz2
Ensure Android RunSymmetric test can select the AudioRecord path.
Review URL: https://codereview.chromium.org/139083002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@245223 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
-rw-r--r--media/audio/android/audio_android_unittest.cc5
-rw-r--r--media/audio/android/audio_manager_android.cc2
2 files changed, 5 insertions, 2 deletions
diff --git a/media/audio/android/audio_android_unittest.cc b/media/audio/android/audio_android_unittest.cc
index 1e181f4..408a13d 100644
--- a/media/audio/android/audio_android_unittest.cc
+++ b/media/audio/android/audio_android_unittest.cc
@@ -825,9 +825,12 @@ TEST_P(AudioAndroidInputTest,
// 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.sample_rate() / 100,
+ default_input_params.effects());
VLOG(1) << io_params;
// Create input and output streams using the common audio parameters.
diff --git a/media/audio/android/audio_manager_android.cc b/media/audio/android/audio_manager_android.cc
index 7601dcb..240dfdc 100644
--- a/media/audio/android/audio_manager_android.cc
+++ b/media/audio/android/audio_manager_android.cc
@@ -210,7 +210,7 @@ AudioInputStream* AudioManagerAndroid::MakeLowLatencyInputStream(
// Note that the input device is always associated with a certain output
// device, i.e., this selection does also switch the output device.
// All input and output streams will be affected by the device selection.
- if (!SetAudioDevice(device_id)) {
+ if (!SetAudioDevice(device_id)) {
LOG(ERROR) << "Unable to select audio device!";
return NULL;
}