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

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

Issue 1514143003: Add support for unmixed audio from remote WebRTC remote tracks. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix other include Created 5 years 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
« no previous file with comments | « content/renderer/media/webrtc_local_audio_track.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_local_audio_track.h" 5 #include "content/renderer/media/webrtc_local_audio_track.h"
6 6
7 #include <limits> 7 #include <limits>
8 8
9 #include "content/public/renderer/media_stream_audio_sink.h" 9 #include "content/public/renderer/media_stream_audio_sink.h"
10 #include "content/renderer/media/media_stream_audio_level_calculator.h" 10 #include "content/renderer/media/media_stream_audio_level_calculator.h"
11 #include "content/renderer/media/media_stream_audio_processor.h" 11 #include "content/renderer/media/media_stream_audio_processor.h"
12 #include "content/renderer/media/media_stream_audio_sink_owner.h" 12 #include "content/renderer/media/media_stream_audio_sink_owner.h"
13 #include "content/renderer/media/media_stream_audio_track_sink.h" 13 #include "content/renderer/media/media_stream_audio_track_sink.h"
14 #include "content/renderer/media/webaudio_capturer_source.h" 14 #include "content/renderer/media/webaudio_capturer_source.h"
15 #include "content/renderer/media/webrtc/webrtc_local_audio_track_adapter.h" 15 #include "content/renderer/media/webrtc/webrtc_local_audio_track_adapter.h"
16 #include "content/renderer/media/webrtc_audio_capturer.h" 16 #include "content/renderer/media/webrtc_audio_capturer.h"
17 17
18 namespace content { 18 namespace content {
19 19
20 WebRtcLocalAudioTrack::WebRtcLocalAudioTrack( 20 WebRtcLocalAudioTrack::WebRtcLocalAudioTrack(
21 WebRtcLocalAudioTrackAdapter* adapter, 21 WebRtcLocalAudioTrackAdapter* adapter,
22 const scoped_refptr<WebRtcAudioCapturer>& capturer, 22 const scoped_refptr<WebRtcAudioCapturer>& capturer,
23 WebAudioCapturerSource* webaudio_source) 23 WebAudioCapturerSource* webaudio_source)
24 : MediaStreamTrack(true), 24 : MediaStreamAudioTrack(true),
25 adapter_(adapter), 25 adapter_(adapter),
26 capturer_(capturer), 26 capturer_(capturer),
27 webaudio_source_(webaudio_source) { 27 webaudio_source_(webaudio_source) {
28 DCHECK(capturer.get() || webaudio_source); 28 DCHECK(capturer.get() || webaudio_source);
29 signal_thread_checker_.DetachFromThread(); 29 signal_thread_checker_.DetachFromThread();
30 30
31 adapter_->Initialize(this); 31 adapter_->Initialize(this);
32 32
33 DVLOG(1) << "WebRtcLocalAudioTrack::WebRtcLocalAudioTrack()"; 33 DVLOG(1) << "WebRtcLocalAudioTrack::WebRtcLocalAudioTrack()";
34 } 34 }
(...skipping 194 matching lines...) Expand 10 before | Expand all | Expand 10 after
229 (*it)->Reset(); 229 (*it)->Reset();
230 } 230 }
231 } 231 }
232 232
233 webrtc::AudioTrackInterface* WebRtcLocalAudioTrack::GetAudioAdapter() { 233 webrtc::AudioTrackInterface* WebRtcLocalAudioTrack::GetAudioAdapter() {
234 DCHECK(main_render_thread_checker_.CalledOnValidThread()); 234 DCHECK(main_render_thread_checker_.CalledOnValidThread());
235 return adapter_.get(); 235 return adapter_.get();
236 } 236 }
237 237
238 } // namespace content 238 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/media/webrtc_local_audio_track.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698