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

Side by Side Diff: content/renderer/media/media_stream_renderer_factory_impl.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 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/media_stream_renderer_factory_impl.h" 5 #include "content/renderer/media/media_stream_renderer_factory_impl.h"
6 6
7 #include "base/strings/utf_string_conversions.h" 7 #include "base/strings/utf_string_conversions.h"
8 #include "content/renderer/media/media_stream.h" 8 #include "content/renderer/media/media_stream.h"
9 #include "content/renderer/media/media_stream_audio_track.h"
9 #include "content/renderer/media/media_stream_video_renderer_sink.h" 10 #include "content/renderer/media/media_stream_video_renderer_sink.h"
10 #include "content/renderer/media/media_stream_video_track.h" 11 #include "content/renderer/media/media_stream_video_track.h"
11 #include "content/renderer/media/webrtc/peer_connection_dependency_factory.h" 12 #include "content/renderer/media/webrtc/peer_connection_dependency_factory.h"
12 #include "content/renderer/media/webrtc_audio_renderer.h" 13 #include "content/renderer/media/webrtc_audio_renderer.h"
13 #include "content/renderer/media/webrtc_local_audio_renderer.h" 14 #include "content/renderer/media/webrtc_local_audio_renderer.h"
14 #include "content/renderer/render_thread_impl.h" 15 #include "content/renderer/render_thread_impl.h"
15 #include "media/base/audio_hardware_config.h" 16 #include "media/base/audio_hardware_config.h"
16 #include "third_party/WebKit/public/platform/WebMediaStream.h" 17 #include "third_party/WebKit/public/platform/WebMediaStream.h"
17 #include "third_party/WebKit/public/platform/WebURL.h" 18 #include "third_party/WebKit/public/platform/WebURL.h"
18 #include "third_party/WebKit/public/web/WebMediaStreamRegistry.h" 19 #include "third_party/WebKit/public/web/WebMediaStreamRegistry.h"
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
134 DVLOG(1) << "MediaStreamRendererFactoryImpl::GetAudioRenderer stream:" 135 DVLOG(1) << "MediaStreamRendererFactoryImpl::GetAudioRenderer stream:"
135 << base::UTF16ToUTF8(base::StringPiece16(web_stream.id())); 136 << base::UTF16ToUTF8(base::StringPiece16(web_stream.id()));
136 137
137 // TODO(tommi): We need to fix the data flow so that 138 // TODO(tommi): We need to fix the data flow so that
138 // it works the same way for all track implementations, local, remote or what 139 // it works the same way for all track implementations, local, remote or what
139 // have you. 140 // have you.
140 // In this function, we should simply create a renderer object that receives 141 // In this function, we should simply create a renderer object that receives
141 // and mixes audio from all the tracks that belong to the media stream. 142 // and mixes audio from all the tracks that belong to the media stream.
142 // For now, we have separate renderers depending on if the first audio track 143 // For now, we have separate renderers depending on if the first audio track
143 // in the stream is local or remote. 144 // in the stream is local or remote.
144 MediaStreamTrack* audio_track = MediaStreamTrack::GetTrack(audio_tracks[0]); 145 MediaStreamAudioTrack* audio_track = MediaStreamAudioTrack::GetTrack(
146 audio_tracks[0]);
145 if (!audio_track) { 147 if (!audio_track) {
146 // This can happen if the track was cloned. 148 // This can happen if the track was cloned.
147 // TODO(tommi, perkj): Fix cloning of tracks to handle extra data too. 149 // TODO(tommi, perkj): Fix cloning of tracks to handle extra data too.
148 LOG(ERROR) << "No native track for WebMediaStreamTrack."; 150 LOG(ERROR) << "No native track for WebMediaStreamTrack.";
149 return nullptr; 151 return nullptr;
150 } 152 }
151 153
152 if (audio_track->is_local_track()) { 154 if (audio_track->is_local_track()) {
153 // TODO(xians): Add support for the case where the media stream contains 155 // TODO(xians): Add support for the case where the media stream contains
154 // multiple audio tracks. 156 // multiple audio tracks.
(...skipping 13 matching lines...) Expand all
168 170
169 if (renderer.get() && !audio_device->SetAudioRenderer(renderer.get())) 171 if (renderer.get() && !audio_device->SetAudioRenderer(renderer.get()))
170 renderer = NULL; 172 renderer = NULL;
171 } 173 }
172 174
173 return renderer.get() ? renderer->CreateSharedAudioRendererProxy(web_stream) 175 return renderer.get() ? renderer->CreateSharedAudioRendererProxy(web_stream)
174 : NULL; 176 : NULL;
175 } 177 }
176 178
177 } // namespace content 179 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/media/media_stream_center.cc ('k') | content/renderer/media/media_stream_track.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698