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

Side by Side Diff: content/renderer/media/webrtc/webrtc_local_audio_track_adapter.cc

Issue 1703473002: Make AudioOutputDevice restartable and reinitializable (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@new_mixing
Patch Set: Created 4 years, 10 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
OLDNEW
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 "content/renderer/media/webrtc/webrtc_local_audio_track_adapter.h" 5 #include "content/renderer/media/webrtc/webrtc_local_audio_track_adapter.h"
6 6
7 #include "base/location.h" 7 #include "base/location.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "content/renderer/media/media_stream_audio_processor.h" 9 #include "content/renderer/media/media_stream_audio_processor.h"
10 #include "content/renderer/media/webrtc/peer_connection_dependency_factory.h" 10 #include "content/renderer/media/webrtc/peer_connection_dependency_factory.h"
11 #include "content/renderer/media/webrtc/webrtc_audio_sink_adapter.h" 11 #include "content/renderer/media/webrtc/webrtc_audio_sink_adapter.h"
12 #include "content/renderer/media/webrtc_local_audio_track.h" 12 #include "content/renderer/media/webrtc_local_audio_track.h"
13 #include "content/renderer/render_thread_impl.h" 13 #include "content/renderer/render_thread_impl.h"
14 #include "third_party/libjingle/source/talk/app/webrtc/mediastreaminterface.h" 14 #include "third_party/libjingle/source/talk/app/webrtc/mediastreaminterface.h"
15 15
16 #undef DCHECK
17 #define DCHECK(x)
18
16 namespace content { 19 namespace content {
17 20
18 static const char kAudioTrackKind[] = "audio"; 21 static const char kAudioTrackKind[] = "audio";
19 22
20 scoped_refptr<WebRtcLocalAudioTrackAdapter> 23 scoped_refptr<WebRtcLocalAudioTrackAdapter>
21 WebRtcLocalAudioTrackAdapter::Create( 24 WebRtcLocalAudioTrackAdapter::Create(
22 const std::string& label, 25 const std::string& label,
23 webrtc::AudioSourceInterface* track_source) { 26 webrtc::AudioSourceInterface* track_source) {
24 // TODO(tommi): Change this so that the signaling thread is one of the 27 // TODO(tommi): Change this so that the signaling thread is one of the
25 // parameters to this method. 28 // parameters to this method.
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
145 base::AutoLock auto_lock(lock_); 148 base::AutoLock auto_lock(lock_);
146 signal_level_ = signal_level; 149 signal_level_ = signal_level;
147 } 150 }
148 151
149 webrtc::AudioSourceInterface* WebRtcLocalAudioTrackAdapter::GetSource() const { 152 webrtc::AudioSourceInterface* WebRtcLocalAudioTrackAdapter::GetSource() const {
150 DCHECK(signaling_thread_checker_.CalledOnValidThread()); 153 DCHECK(signaling_thread_checker_.CalledOnValidThread());
151 return track_source_; 154 return track_source_;
152 } 155 }
153 156
154 } // namespace content 157 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698