OLD | NEW |
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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/remote_media_stream_impl.h" | 5 #include "content/renderer/media/remote_media_stream_impl.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
(...skipping 213 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
224 unregistered_ = true; | 224 unregistered_ = true; |
225 #endif | 225 #endif |
226 observed_track()->UnregisterObserver(this); | 226 observed_track()->UnregisterObserver(this); |
227 } | 227 } |
228 | 228 |
229 void RemoteAudioTrackAdapter::InitializeWebkitAudioTrack() { | 229 void RemoteAudioTrackAdapter::InitializeWebkitAudioTrack() { |
230 scoped_ptr<MediaStreamRemoteAudioTrack> media_stream_track( | 230 scoped_ptr<MediaStreamRemoteAudioTrack> media_stream_track( |
231 new MediaStreamRemoteAudioTrack(observed_track().get())); | 231 new MediaStreamRemoteAudioTrack(observed_track().get())); |
232 InitializeWebkitTrack(blink::WebMediaStreamSource::TypeAudio); | 232 InitializeWebkitTrack(blink::WebMediaStreamSource::TypeAudio); |
233 webkit_track()->setExtraData(media_stream_track.release()); | 233 webkit_track()->setExtraData(media_stream_track.release()); |
| 234 // TODO(tommi): Set the remote audio source extra data. |
| 235 // webkit_track()->source().setExtraData(...); |
234 } | 236 } |
235 | 237 |
236 void RemoteAudioTrackAdapter::OnChanged() { | 238 void RemoteAudioTrackAdapter::OnChanged() { |
237 main_thread_->PostTask(FROM_HERE, | 239 main_thread_->PostTask(FROM_HERE, |
238 base::Bind(&RemoteAudioTrackAdapter::OnChangedOnMainThread, | 240 base::Bind(&RemoteAudioTrackAdapter::OnChangedOnMainThread, |
239 this, observed_track()->state())); | 241 this, observed_track()->state())); |
240 } | 242 } |
241 | 243 |
242 void RemoteAudioTrackAdapter::OnChangedOnMainThread( | 244 void RemoteAudioTrackAdapter::OnChangedOnMainThread( |
243 webrtc::MediaStreamTrackInterface::TrackState state) { | 245 webrtc::MediaStreamTrackInterface::TrackState state) { |
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
413 // Unregister all the audio track observers that were not used. | 415 // Unregister all the audio track observers that were not used. |
414 // We need to do this before destruction since the observers can't unregister | 416 // We need to do this before destruction since the observers can't unregister |
415 // from within the dtor due to a race. | 417 // from within the dtor due to a race. |
416 for (auto& track : *audio_tracks.get()) { | 418 for (auto& track : *audio_tracks.get()) { |
417 if (track.get()) | 419 if (track.get()) |
418 track->Unregister(); | 420 track->Unregister(); |
419 } | 421 } |
420 } | 422 } |
421 | 423 |
422 } // namespace content | 424 } // namespace content |
OLD | NEW |