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

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

Issue 1615433002: Roll WebRTC 11523:11548, Libjingle 11522:11545 (Closed) Base URL: http://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rolling to webrtc@11548 instead to pull in a fix 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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/media_stream_remote_audio_track.h" 5 #include "content/renderer/media/webrtc/media_stream_remote_audio_track.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <list> 9 #include <list>
10 10
11 #include "base/logging.h" 11 #include "base/logging.h"
12 #include "content/public/renderer/media_stream_audio_sink.h" 12 #include "content/public/renderer/media_stream_audio_sink.h"
13 #include "third_party/libjingle/source/talk/app/webrtc/mediastreaminterface.h" 13 #include "third_party/webrtc/api/mediastreaminterface.h"
14 14
15 namespace content { 15 namespace content {
16 16
17 class MediaStreamRemoteAudioSource::AudioSink 17 class MediaStreamRemoteAudioSource::AudioSink
18 : public webrtc::AudioTrackSinkInterface { 18 : public webrtc::AudioTrackSinkInterface {
19 public: 19 public:
20 AudioSink() { 20 AudioSink() {
21 } 21 }
22 ~AudioSink() override { 22 ~AudioSink() override {
23 DCHECK(sinks_.empty()); 23 DCHECK(sinks_.empty());
(...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after
222 if (sink_) 222 if (sink_)
223 sink_->RemoveAll(track); 223 sink_->RemoveAll(track);
224 } 224 }
225 225
226 webrtc::AudioTrackInterface* MediaStreamRemoteAudioSource::GetAudioAdapter() { 226 webrtc::AudioTrackInterface* MediaStreamRemoteAudioSource::GetAudioAdapter() {
227 DCHECK(thread_checker_.CalledOnValidThread()); 227 DCHECK(thread_checker_.CalledOnValidThread());
228 return track_.get(); 228 return track_.get();
229 } 229 }
230 230
231 } // namespace content 231 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/media/user_media_client_impl.h ('k') | content/renderer/media/webrtc/media_stream_remote_video_source.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698