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

Side by Side Diff: content/renderer/media/webrtc_audio_processor.cc

Issue 54383003: Added an "enable-audio-processor" flag and WebRtcAudioProcessor class (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: switched to Atomic32 and removed the lock, also fixed some nits. Created 7 years, 1 month 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
(Empty)
1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file.
4
5 #include "content/renderer/media/webrtc_audio_processor.h"
6
7 #include "base/command_line.h"
8 #include "base/debug/trace_event.h"
9 #include "content/public/common/content_switches.h"
10 #include "content/renderer/media/webrtc_audio_processor_options.h"
11 #include "media/audio/audio_parameters.h"
12 #include "media/base/audio_converter.h"
13 #include "media/base/audio_fifo.h"
14 #include "media/base/channel_layout.h"
15
16 namespace content {
17
18 namespace {
19
20 using webrtc::AudioProcessing;
21 using webrtc::MediaConstraintsInterface;
22
23 #if defined(ANDROID)
24 const int kAudioProcessingSampleRate = 16000;
25 #else
26 const int kAudioProcessingSampleRate = 32000;
27 #endif
28 const int kAudioProcessingNumberOfChannel = 1;
29
30 const int kMaxNumberOfBuffersInFifo = 2;
31
32 } // namespace
33
34 class WebRtcAudioProcessor::WebRtcAudioConverter
35 : public media::AudioConverter::InputCallback {
36 public:
37 WebRtcAudioConverter(const media::AudioParameters& source_params,
38 const media::AudioParameters& sink_params)
39 : source_params_(source_params),
40 sink_params_(sink_params),
41 audio_converter_(source_params, sink_params_, false) {
42 worker_thread_checker_.DetachFromThread();
43
44 audio_converter_.AddInput(this);
45 // Create and initialize audio fifo and audio bus wrapper.
46 // The size of the FIFO should be at least twice of the source buffer size
47 // or twice of the sink buffer size.
48 int buffer_size = std::max(
49 kMaxNumberOfBuffersInFifo * source_params_.frames_per_buffer(),
50 kMaxNumberOfBuffersInFifo * sink_params_.frames_per_buffer());
51 fifo_.reset(new media::AudioFifo(source_params_.channels(), buffer_size));
52 // TODO(xians): Use CreateWrapper to save one memcpy.
53 audio_wrapper_ = media::AudioBus::Create(sink_params_.channels(),
54 sink_params_.frames_per_buffer());
55 }
56
57 virtual ~WebRtcAudioConverter() {
58 DCHECK(create_thread_checker_.CalledOnValidThread());
59 audio_converter_.RemoveInput(this);
60 }
61
62 void Push(media::AudioBus* audio_source) {
63 // Called on the audio thread, which is the capture audio thread for
64 // |WebRtcAudioProcessor::capture_converter_|, and render audio thread for
65 // |WebRtcAudioProcessor::render_converter_|.
66 // And it must be the same thread as calling Convert().
67 worker_thread_checker_.CalledOnValidThread();
68 fifo_->Push(audio_source);
69 }
70
71 bool Convert(webrtc::AudioFrame* out) {
72 // Called on the audio thread, which is the capture audio thread for
73 // |WebRtcAudioProcessor::capture_converter_|, and render audio thread for
74 // |WebRtcAudioProcessor::render_converter_|.
75 // Return false if there is no 10ms data in the FIFO.
76 worker_thread_checker_.CalledOnValidThread();
77 if (fifo_->frames() < (source_params_.sample_rate() / 100))
78 return false;
79
80 // Convert 10ms data to the output format, this will trigger ProvideInput().
81 audio_converter_.Convert(audio_wrapper_.get());
82
83 // TODO(xians): Figure out a better way to handle the interleaved and
84 // deinterleaved format switching.
85 audio_wrapper_->ToInterleaved(audio_wrapper_->frames(),
86 sink_params_.bits_per_sample() / 8,
87 out->data_);
88
89 out->samples_per_channel_ = sink_params_.frames_per_buffer();
90 out->sample_rate_hz_ = sink_params_.sample_rate();
91 out->speech_type_ = webrtc::AudioFrame::kNormalSpeech;
92 out->vad_activity_ = webrtc::AudioFrame::kVadUnknown;
93 out->num_channels_ = sink_params_.channels();
94
95 return true;
96 }
97
98 const media::AudioParameters& source_parameters() const {
99 return source_params_;
100 }
101 const media::AudioParameters& sink_parameters() const {
102 return sink_params_;
103 }
104
105 private:
106 // AudioConverter::InputCallback implementation.
107 virtual double ProvideInput(media::AudioBus* audio_bus,
108 base::TimeDelta buffer_delay) {
109 // Called on realtime audio thread.
110 // TODO(xians): Figure out why the first Convert() triggers ProvideInput
111 // two times.
112 if (fifo_->frames() < audio_bus->frames())
113 return 0;
114
115 fifo_->Consume(audio_bus, 0, audio_bus->frames());
116 return 1.0;
117 }
118
119 base::ThreadChecker create_thread_checker_;
120 base::ThreadChecker worker_thread_checker_;
121 media::AudioParameters source_params_;
122 media::AudioParameters sink_params_;
123
124 // TODO(xians): consider using SincResampler to save some memcpy.
125 // Handles mixing and resampling between input and output parameters.
126 media::AudioConverter audio_converter_;
127 scoped_ptr<media::AudioBus> audio_wrapper_;
128 scoped_ptr<media::AudioFifo> fifo_;
129 };
130
131 WebRtcAudioProcessor::WebRtcAudioProcessor(
132 const webrtc::MediaConstraintsInterface* constraints) {
133 capture_thread_checker_.DetachFromThread();
134 render_thread_checker_.DetachFromThread();
135 InitializeAudioProcessingModule(constraints);
136 }
137
138 WebRtcAudioProcessor::~WebRtcAudioProcessor() {
139 DCHECK(main_thread_checker_.CalledOnValidThread());
140 StopAudioProcessing();
141 }
142
143 void WebRtcAudioProcessor::SetCaptureFormat(
144 const media::AudioParameters& source_params) {
145 DCHECK(main_thread_checker_.CalledOnValidThread());
146 DCHECK(source_params.IsValid());
147
148 // Create and initialize audio converter for the source data.
149 // When the webrtc AudioProcessing is enabled, the sink format of the
150 // converter will be the same as the post-processed data format, which is
151 // 32k mono for desktops and 16k mono for Android. When the AudioProcessing
152 // is disabled, the sink format will be the same as the source format.
153 const int sink_sample_rate = audio_processing_ ?
154 kAudioProcessingSampleRate : source_params.sample_rate();
155 const media::ChannelLayout sink_channel_layout = audio_processing_ ?
156 media::CHANNEL_LAYOUT_MONO : source_params.channel_layout();
157
158 // WebRtc is using 10ms data as its native packet size.
159 media::AudioParameters sink_params(
160 media::AudioParameters::AUDIO_PCM_LOW_LATENCY, sink_channel_layout,
161 sink_sample_rate, 16, sink_sample_rate / 100);
162 capture_converter_.reset(
163 new WebRtcAudioConverter(source_params, sink_params));
164 }
165
166 void WebRtcAudioProcessor::PushCaptureData(media::AudioBus* audio_source) {
167 capture_thread_checker_.CalledOnValidThread();
168 capture_converter_->Push(audio_source);
169 }
170
171 bool WebRtcAudioProcessor::ProcessAndConsumeData(
172 base::TimeDelta capture_delay, int volume, bool key_pressed,
173 int16** out) {
174 capture_thread_checker_.CalledOnValidThread();
175 TRACE_EVENT0("audio",
176 "WebRtcAudioProcessor::ProcessAndConsumeData");
177
178 if (!capture_converter_->Convert(&capture_frame_))
179 return false;
180
181 ProcessData(&capture_frame_, capture_delay, volume, key_pressed);
182 *out = capture_frame_.data_;
183
184 return true;
185 }
186
187 const media::AudioParameters& WebRtcAudioProcessor::OutputFormat() const {
188 return capture_converter_->sink_parameters();
189 }
190
191 void WebRtcAudioProcessor::ProcessData(webrtc::AudioFrame* audio_frame,
192 base::TimeDelta capture_delay,
193 int volume,
194 bool key_pressed) {
195 capture_thread_checker_.CalledOnValidThread();
196 if (!audio_processing_)
197 return;
198
199 TRACE_EVENT0("audio", "WebRtcAudioProcessor::Process10MsData");
200 DCHECK_EQ(audio_processing_->sample_rate_hz(),
201 capture_converter_->sink_parameters().sample_rate());
202 DCHECK_EQ(audio_processing_->num_input_channels(),
203 capture_converter_->sink_parameters().channels());
204 DCHECK_EQ(audio_processing_->num_output_channels(),
205 capture_converter_->sink_parameters().channels());
206
207 base::subtle::Atomic32 render_delay_ms =
208 base::subtle::NoBarrier_Load(&render_delay_ms_);
209 int total_delay_ms = capture_delay.InMilliseconds() + render_delay_ms;
Jói 2013/11/11 14:45:22 Should this be an int64 since TimeDelta::InMillise
no longer working on chromium 2013/11/11 15:04:59 Exactly, the normal delay should be around 50 ms,
210
211 audio_processing_->set_stream_delay_ms(total_delay_ms);
212 webrtc::GainControl* agc = audio_processing_->gain_control();
213 if (agc->set_stream_analog_level(volume))
214 NOTREACHED();
215 int err = audio_processing_->ProcessStream(audio_frame);
216 DCHECK(!err) << "ProcessStream() error: " << err;
217
218 // TODO(xians): Add support for AGC, typing detectin, audio level calculation,
219 // stereo swapping.
220 }
221
222 void WebRtcAudioProcessor::PushRenderData(
223 const int16* render_audio, int sample_rate, int number_of_channels,
224 int number_of_frames, base::TimeDelta render_delay) {
225 render_thread_checker_.CalledOnValidThread();
226
227 // Return immediately if the echo cancellation is off.
228 if (!audio_processing_ ||
229 !audio_processing_->echo_cancellation()->is_enabled())
230 return;
231
232 TRACE_EVENT0("audio",
233 "WebRtcAudioProcessor::FeedRenderDataToAudioProcessing");
234 base::subtle::Atomic32 new_render_delay_ms = render_delay.InMilliseconds();
235 base::subtle::NoBarrier_Store(&render_delay_ms_, new_render_delay_ms);
236
237 InitializeRenderConverterIfNeeded(sample_rate, number_of_channels,
238 number_of_frames);
239
240 // TODO(xians): Avoid this extra interleave/deinterleave.
241 render_data_bus_->FromInterleaved(render_audio,
242 render_data_bus_->frames(),
243 sizeof(render_audio[0]));
244 render_converter_->Push(render_data_bus_.get());
245 while (render_converter_->Convert(&render_frame_)) {
246 audio_processing_->AnalyzeReverseStream(&render_frame_);
247 }
248 }
249
250 void WebRtcAudioProcessor::InitializeAudioProcessingModule(
251 const webrtc::MediaConstraintsInterface* constraints) {
252 if (!CommandLine::ForCurrentProcess()->HasSwitch(
253 switches::kEnableAudioTrackProcessing)) {
254 return;
255 }
256
257 if (!constraints)
258 return;
259
260 const bool enable_aec = GetPropertyFromConstraints(
261 constraints, MediaConstraintsInterface::kEchoCancellation);
262 const bool enable_ns = GetPropertyFromConstraints(
263 constraints, MediaConstraintsInterface::kNoiseSuppression);
264 const bool enable_high_pass_filter = GetPropertyFromConstraints(
265 constraints, MediaConstraintsInterface::kHighpassFilter);
266 const bool start_aec_dump = GetPropertyFromConstraints(
267 constraints, MediaConstraintsInterface::kInternalAecDump);
268 #if defined(IOS) || defined(ANDROID)
269 const bool enable_experimental_aec = false;
270 const bool enable_typing_detection = false;
271 #else
272 const bool enable_experimental_aec = GetPropertyFromConstraints(
273 constraints, MediaConstraintsInterface::kExperimentalEchoCancellation);
274 const bool enable_typing_detection = GetPropertyFromConstraints(
275 constraints, MediaConstraintsInterface::kTypingNoiseDetection);
276 #endif
277
278 // Reset the audio processing to NULL if no audio processing component is
279 // enabled.
280 if (!enable_aec && !enable_experimental_aec && !enable_ns &&
281 !enable_high_pass_filter && !enable_typing_detection) {
282 return;
283 }
284
285 // Create and configure the audio processing if it does not exist.
286 if (!audio_processing_)
287 audio_processing_.reset(webrtc::AudioProcessing::Create(0));
288
289 // Enable the audio processing components.
290 if (enable_aec) {
291 EnableEchoCancellation(audio_processing_.get());
292
293 if (enable_experimental_aec)
294 EnableExperimentalEchoCancellation(audio_processing_.get());
295 }
296
297 if (enable_ns)
298 EnableNoiseSuppression(audio_processing_.get());
299
300 if (enable_high_pass_filter)
301 EnableHighPassFilter(audio_processing_.get());
302
303 if (enable_typing_detection)
304 EnableTypingDetection(audio_processing_.get());
305
306 if (enable_aec && start_aec_dump)
307 StartAecDump(audio_processing_.get());
308
309 // Configure the audio format the audio processing is running on. This
310 // has to be done after all the needed components are enabled.
311 if (audio_processing_->set_sample_rate_hz(kAudioProcessingSampleRate))
312 NOTREACHED();
313 if (audio_processing_->set_num_channels(kAudioProcessingNumberOfChannel,
314 kAudioProcessingNumberOfChannel))
315 NOTREACHED();
316 }
317
318 void WebRtcAudioProcessor::InitializeRenderConverterIfNeeded(
319 int sample_rate, int number_of_channels, int frames_per_buffer) {
320 // TODO(xians): Figure out if we need to handle the buffer size change.
321 if (render_converter_.get() &&
322 render_converter_->source_parameters().sample_rate() == sample_rate &&
323 render_converter_->source_parameters().channels() == number_of_channels) {
324 // Do nothing if the |render_converter_| has been setup properly.
325 return;
326 }
327
328 media::AudioParameters source_params(
329 media::AudioParameters::AUDIO_PCM_LOW_LATENCY,
330 media::GuessChannelLayout(number_of_channels), sample_rate, 16,
331 frames_per_buffer);
332 media::AudioParameters sink_params(
333 media::AudioParameters::AUDIO_PCM_LOW_LATENCY,
334 media::CHANNEL_LAYOUT_MONO, kAudioProcessingSampleRate, 16,
335 kAudioProcessingSampleRate / 100);
336 render_converter_.reset(new WebRtcAudioConverter(source_params, sink_params));
337 render_data_bus_ = media::AudioBus::Create(number_of_channels,
338 frames_per_buffer);
339 }
340
341 void WebRtcAudioProcessor::StopAudioProcessing() {
342 if (!audio_processing_.get())
343 return;
344
345 // It is safe to stop the AEC dump even it is not started.
346 StopAecDump(audio_processing_.get());
347
348 audio_processing_.reset();
349 }
350
351 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698