| OLD | NEW |
| 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_video_renderer_sink.h" | 9 #include "content/renderer/media/media_stream_video_renderer_sink.h" |
| 10 #include "content/renderer/media/media_stream_video_track.h" | 10 #include "content/renderer/media/media_stream_video_track.h" |
| (...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 134 DVLOG(1) << "MediaStreamRendererFactoryImpl::GetAudioRenderer stream:" | 134 DVLOG(1) << "MediaStreamRendererFactoryImpl::GetAudioRenderer stream:" |
| 135 << base::UTF16ToUTF8(base::StringPiece16(web_stream.id())); | 135 << base::UTF16ToUTF8(base::StringPiece16(web_stream.id())); |
| 136 | 136 |
| 137 // TODO(tommi): We need to fix the data flow so that | 137 // 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 | 138 // it works the same way for all track implementations, local, remote or what |
| 139 // have you. | 139 // have you. |
| 140 // In this function, we should simply create a renderer object that receives | 140 // 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. | 141 // 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 | 142 // For now, we have separate renderers depending on if the first audio track |
| 143 // in the stream is local or remote. | 143 // in the stream is local or remote. |
| 144 MediaStreamTrack* audio_track = MediaStreamTrack::GetTrack(audio_tracks[0]); | 144 MediaStreamAudioTrack* audio_track = MediaStreamAudioTrack::GetTrack( |
| 145 audio_tracks[0]); |
| 145 if (!audio_track) { | 146 if (!audio_track) { |
| 146 // This can happen if the track was cloned. | 147 // This can happen if the track was cloned. |
| 147 // TODO(tommi, perkj): Fix cloning of tracks to handle extra data too. | 148 // TODO(tommi, perkj): Fix cloning of tracks to handle extra data too. |
| 148 LOG(ERROR) << "No native track for WebMediaStreamTrack."; | 149 LOG(ERROR) << "No native track for WebMediaStreamTrack."; |
| 149 return nullptr; | 150 return nullptr; |
| 150 } | 151 } |
| 151 | 152 |
| 152 if (audio_track->is_local_track()) { | 153 if (audio_track->is_local_track()) { |
| 153 // TODO(xians): Add support for the case where the media stream contains | 154 // TODO(xians): Add support for the case where the media stream contains |
| 154 // multiple audio tracks. | 155 // multiple audio tracks. |
| (...skipping 13 matching lines...) Expand all Loading... |
| 168 | 169 |
| 169 if (renderer.get() && !audio_device->SetAudioRenderer(renderer.get())) | 170 if (renderer.get() && !audio_device->SetAudioRenderer(renderer.get())) |
| 170 renderer = NULL; | 171 renderer = NULL; |
| 171 } | 172 } |
| 172 | 173 |
| 173 return renderer.get() ? renderer->CreateSharedAudioRendererProxy(web_stream) | 174 return renderer.get() ? renderer->CreateSharedAudioRendererProxy(web_stream) |
| 174 : NULL; | 175 : NULL; |
| 175 } | 176 } |
| 176 | 177 |
| 177 } // namespace content | 178 } // namespace content |
| OLD | NEW |