diff options
| author | xians <xians@chromium.org> | 2014-08-27 03:21:31 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-08-27 10:22:14 +0000 |
| commit | 2da7a5b3ead29495a3d2640343ab18c93e2805b5 (patch) | |
| tree | 92f4456858de08a0e20e2e43679cdc28dc04691a /media/audio/android | |
| parent | ee0fd44359e1b292ab8a903c0329d315caea0204 (diff) | |
| download | chromium_src-2da7a5b3ead29495a3d2640343ab18c93e2805b5.zip chromium_src-2da7a5b3ead29495a3d2640343ab18c93e2805b5.tar.gz chromium_src-2da7a5b3ead29495a3d2640343ab18c93e2805b5.tar.bz2 | |
Remove the last piece of deprecated synchronous IO code.
BUG=337096
TEST=bots
Review URL: https://codereview.chromium.org/460373002
Cr-Commit-Position: refs/heads/master@{#292132}
Diffstat (limited to 'media/audio/android')
| -rw-r--r-- | media/audio/android/audio_android_unittest.cc | 2 | ||||
| -rw-r--r-- | media/audio/android/audio_manager_android.cc | 6 |
2 files changed, 2 insertions, 6 deletions
diff --git a/media/audio/android/audio_android_unittest.cc b/media/audio/android/audio_android_unittest.cc index 177953d..68e74a4 100644 --- a/media/audio/android/audio_android_unittest.cc +++ b/media/audio/android/audio_android_unittest.cc @@ -598,7 +598,6 @@ class AudioAndroidInputTest : public AudioAndroidOutputTest, AudioParameters::NO_EFFECTS; AudioParameters params(audio_input_parameters().format(), audio_input_parameters().channel_layout(), - audio_input_parameters().input_channels(), audio_input_parameters().sample_rate(), audio_input_parameters().bits_per_sample(), audio_input_parameters().frames_per_buffer(), @@ -805,7 +804,6 @@ TEST_P(AudioAndroidInputTest, AudioParameters native_params = GetInputStreamParameters(); AudioParameters params(native_params.format(), native_params.channel_layout(), - native_params.input_channels(), native_params.sample_rate(), native_params.bits_per_sample(), native_params.sample_rate() / 100, diff --git a/media/audio/android/audio_manager_android.cc b/media/audio/android/audio_manager_android.cc index 48f203a..090f853 100644 --- a/media/audio/android/audio_manager_android.cc +++ b/media/audio/android/audio_manager_android.cc @@ -138,7 +138,7 @@ AudioParameters AudioManagerAndroid::GetInputStreamParameters( buffer_size = user_buffer_size; AudioParameters params( - AudioParameters::AUDIO_PCM_LOW_LATENCY, channel_layout, 0, + AudioParameters::AUDIO_PCM_LOW_LATENCY, channel_layout, GetNativeOutputSampleRate(), 16, buffer_size, effects); return params; } @@ -274,13 +274,11 @@ AudioParameters AudioManagerAndroid::GetPreferredOutputStreamParameters( int sample_rate = GetNativeOutputSampleRate(); int buffer_size = GetOptimalOutputFrameSize(sample_rate, 2); int bits_per_sample = 16; - int input_channels = 0; if (input_params.IsValid()) { // Use the client's input parameters if they are valid. sample_rate = input_params.sample_rate(); bits_per_sample = input_params.bits_per_sample(); channel_layout = input_params.channel_layout(); - input_channels = input_params.input_channels(); buffer_size = GetOptimalOutputFrameSize( sample_rate, ChannelLayoutToChannelCount(channel_layout)); } @@ -290,7 +288,7 @@ AudioParameters AudioManagerAndroid::GetPreferredOutputStreamParameters( buffer_size = user_buffer_size; return AudioParameters( - AudioParameters::AUDIO_PCM_LOW_LATENCY, channel_layout, input_channels, + AudioParameters::AUDIO_PCM_LOW_LATENCY, channel_layout, sample_rate, bits_per_sample, buffer_size, AudioParameters::NO_EFFECTS); } |