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

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

Issue 429113002: Webrtc deps roll. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Use webrtc version 6825 and rebase and switch back to original workspace. Created 6 years, 4 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "content/renderer/media/webrtc_audio_capturer.h" 5 #include "content/renderer/media/webrtc_audio_capturer.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/metrics/histogram.h" 9 #include "base/metrics/histogram.h"
10 #include "base/strings/string_util.h" 10 #include "base/strings/string_util.h"
(...skipping 210 matching lines...) Expand 10 before | Expand all | Expand 10 after
221 } 221 }
222 222
223 WebRtcAudioCapturer::WebRtcAudioCapturer( 223 WebRtcAudioCapturer::WebRtcAudioCapturer(
224 int render_view_id, 224 int render_view_id,
225 const StreamDeviceInfo& device_info, 225 const StreamDeviceInfo& device_info,
226 const blink::WebMediaConstraints& constraints, 226 const blink::WebMediaConstraints& constraints,
227 WebRtcAudioDeviceImpl* audio_device, 227 WebRtcAudioDeviceImpl* audio_device,
228 MediaStreamAudioSource* audio_source) 228 MediaStreamAudioSource* audio_source)
229 : constraints_(constraints), 229 : constraints_(constraints),
230 audio_processor_( 230 audio_processor_(
231 new talk_base::RefCountedObject<MediaStreamAudioProcessor>( 231 new rtc::RefCountedObject<MediaStreamAudioProcessor>(
232 constraints, device_info.device.input.effects, audio_device)), 232 constraints, device_info.device.input.effects, audio_device)),
233 running_(false), 233 running_(false),
234 render_view_id_(render_view_id), 234 render_view_id_(render_view_id),
235 device_info_(device_info), 235 device_info_(device_info),
236 volume_(0), 236 volume_(0),
237 peer_connection_mode_(false), 237 peer_connection_mode_(false),
238 key_pressed_(false), 238 key_pressed_(false),
239 need_audio_processing_(false), 239 need_audio_processing_(false),
240 audio_device_(audio_device), 240 audio_device_(audio_device),
241 audio_source_(audio_source), 241 audio_source_(audio_source),
(...skipping 367 matching lines...) Expand 10 before | Expand all | Expand 10 after
609 609
610 void WebRtcAudioCapturer::SetCapturerSourceForTesting( 610 void WebRtcAudioCapturer::SetCapturerSourceForTesting(
611 const scoped_refptr<media::AudioCapturerSource>& source, 611 const scoped_refptr<media::AudioCapturerSource>& source,
612 media::AudioParameters params) { 612 media::AudioParameters params) {
613 // Create a new audio stream as source which uses the new source. 613 // Create a new audio stream as source which uses the new source.
614 SetCapturerSource(source, params.channel_layout(), 614 SetCapturerSource(source, params.channel_layout(),
615 static_cast<float>(params.sample_rate())); 615 static_cast<float>(params.sample_rate()));
616 } 616 }
617 617
618 } // namespace content 618 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698