OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "components/copresence/mediums/audio/audio_recorder.h" | 5 #include "components/copresence/mediums/audio/audio_recorder.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
97 DCHECK(media::AudioManager::Get()->GetTaskRunner()->BelongsToCurrentThread()); | 97 DCHECK(media::AudioManager::Get()->GetTaskRunner()->BelongsToCurrentThread()); |
98 | 98 |
99 media::AudioParameters params = | 99 media::AudioParameters params = |
100 params_for_testing_ | 100 params_for_testing_ |
101 ? *params_for_testing_ | 101 ? *params_for_testing_ |
102 : media::AudioManager::Get()->GetInputStreamParameters( | 102 : media::AudioManager::Get()->GetInputStreamParameters( |
103 media::AudioManagerBase::kDefaultDeviceId); | 103 media::AudioManagerBase::kDefaultDeviceId); |
104 | 104 |
105 const media::AudioParameters dest_params(params.format(), | 105 const media::AudioParameters dest_params(params.format(), |
106 kDefaultChannelLayout, | 106 kDefaultChannelLayout, |
| 107 kDefaultChannels, |
| 108 params.input_channels(), |
107 kDefaultSampleRate, | 109 kDefaultSampleRate, |
108 kDefaultBitsPerSample, | 110 kDefaultBitsPerSample, |
109 params.frames_per_buffer(), | 111 params.frames_per_buffer(), |
110 media::AudioParameters::NO_EFFECTS); | 112 media::AudioParameters::NO_EFFECTS); |
111 | 113 |
112 converter_.reset(new media::AudioConverter( | 114 converter_.reset(new media::AudioConverter( |
113 params, dest_params, params.sample_rate() == dest_params.sample_rate())); | 115 params, dest_params, params.sample_rate() == dest_params.sample_rate())); |
114 converter_->AddInput(this); | 116 converter_->AddInput(this); |
115 | 117 |
116 total_buffer_frames_ = kProcessIntervalMs * dest_params.sample_rate() / 1000; | 118 total_buffer_frames_ = kProcessIntervalMs * dest_params.sample_rate() / 1000; |
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
242 base::RunLoop rl; | 244 base::RunLoop rl; |
243 media::AudioManager::Get()->GetTaskRunner()->PostTaskAndReply( | 245 media::AudioManager::Get()->GetTaskRunner()->PostTaskAndReply( |
244 FROM_HERE, | 246 FROM_HERE, |
245 base::Bind(base::IgnoreResult(&AudioRecorder::FlushAudioLoopForTesting), | 247 base::Bind(base::IgnoreResult(&AudioRecorder::FlushAudioLoopForTesting), |
246 base::Unretained(this)), | 248 base::Unretained(this)), |
247 rl.QuitClosure()); | 249 rl.QuitClosure()); |
248 rl.Run(); | 250 rl.Run(); |
249 } | 251 } |
250 | 252 |
251 } // namespace copresence | 253 } // namespace copresence |
OLD | NEW |