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

Side by Side Diff: content/renderer/media/media_stream_center.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
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/media_stream_center.h" 5 #include "content/renderer/media/media_stream_center.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 native_track->Stop(); 119 native_track->Stop();
120 return true; 120 return true;
121 } 121 }
122 122
123 blink::WebAudioSourceProvider* 123 blink::WebAudioSourceProvider*
124 MediaStreamCenter::createWebAudioSourceFromMediaStreamTrack( 124 MediaStreamCenter::createWebAudioSourceFromMediaStreamTrack(
125 const blink::WebMediaStreamTrack& track) { 125 const blink::WebMediaStreamTrack& track) {
126 DVLOG(1) << "MediaStreamCenter::createWebAudioSourceFromMediaStreamTrack"; 126 DVLOG(1) << "MediaStreamCenter::createWebAudioSourceFromMediaStreamTrack";
127 MediaStreamTrack* media_stream_track = 127 MediaStreamTrack* media_stream_track =
128 static_cast<MediaStreamTrack*>(track.extraData()); 128 static_cast<MediaStreamTrack*>(track.extraData());
129 // Only local audio track is supported now. 129 if (!media_stream_track) {
130 // TODO(xians): Support remote audio track. 130 DLOG(ERROR) << "Native track missing for webaudio source.";
131 if (!media_stream_track || !media_stream_track->is_local_track()) { 131 return nullptr;
132 NOTIMPLEMENTED();
133 return NULL;
134 } 132 }
135 133
136 blink::WebMediaStreamSource source = track.source(); 134 blink::WebMediaStreamSource source = track.source();
137 DCHECK_EQ(source.type(), blink::WebMediaStreamSource::TypeAudio); 135 DCHECK_EQ(source.type(), blink::WebMediaStreamSource::TypeAudio);
138 WebRtcLocalAudioSourceProvider* source_provider = 136
139 new WebRtcLocalAudioSourceProvider(track); 137 // TODO(tommi): Rename WebRtcLocalAudioSourceProvider to
140 return source_provider; 138 // WebRtcAudioSourceProvider since it's not specific to local.
139 return new WebRtcLocalAudioSourceProvider(track);
141 } 140 }
142 141
143 void MediaStreamCenter::didStopLocalMediaStream( 142 void MediaStreamCenter::didStopLocalMediaStream(
144 const blink::WebMediaStream& stream) { 143 const blink::WebMediaStream& stream) {
145 DVLOG(1) << "MediaStreamCenter::didStopLocalMediaStream"; 144 DVLOG(1) << "MediaStreamCenter::didStopLocalMediaStream";
146 MediaStream* native_stream = MediaStream::GetMediaStream(stream); 145 MediaStream* native_stream = MediaStream::GetMediaStream(stream);
147 if (!native_stream) { 146 if (!native_stream) {
148 NOTREACHED(); 147 NOTREACHED();
149 return; 148 return;
150 } 149 }
(...skipping 28 matching lines...) Expand all
179 178
180 bool MediaStreamCenter::didRemoveMediaStreamTrack( 179 bool MediaStreamCenter::didRemoveMediaStreamTrack(
181 const blink::WebMediaStream& stream, 180 const blink::WebMediaStream& stream,
182 const blink::WebMediaStreamTrack& track) { 181 const blink::WebMediaStreamTrack& track) {
183 DVLOG(1) << "MediaStreamCenter::didRemoveMediaStreamTrack"; 182 DVLOG(1) << "MediaStreamCenter::didRemoveMediaStreamTrack";
184 MediaStream* native_stream = MediaStream::GetMediaStream(stream); 183 MediaStream* native_stream = MediaStream::GetMediaStream(stream);
185 return native_stream->RemoveTrack(track); 184 return native_stream->RemoveTrack(track);
186 } 185 }
187 186
188 } // namespace content 187 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/media/media_stream_audio_track.cc ('k') | content/renderer/media/media_stream_renderer_factory_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698