| 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 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/location.h" | 10 #include "base/location.h" |
| (...skipping 195 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 206 private: | 206 private: |
| 207 void InitializeWebkitAudioTrack( | 207 void InitializeWebkitAudioTrack( |
| 208 scoped_ptr<RemoteMediaStreamAudioTrack> media_stream_track); | 208 scoped_ptr<RemoteMediaStreamAudioTrack> media_stream_track); |
| 209 | 209 |
| 210 // webrtc::ObserverInterface implementation. | 210 // webrtc::ObserverInterface implementation. |
| 211 void OnChanged() override; | 211 void OnChanged() override; |
| 212 | 212 |
| 213 void OnChangedOnMainThread( | 213 void OnChangedOnMainThread( |
| 214 webrtc::MediaStreamTrackInterface::TrackState state); | 214 webrtc::MediaStreamTrackInterface::TrackState state); |
| 215 | 215 |
| 216 #if DCHECK_IS_ON | 216 #if !DCHECK_IS_OFF |
| 217 bool unregistered_; | 217 bool unregistered_; |
| 218 #endif | 218 #endif |
| 219 | 219 |
| 220 webrtc::MediaStreamTrackInterface::TrackState state_; | 220 webrtc::MediaStreamTrackInterface::TrackState state_; |
| 221 | 221 |
| 222 DISALLOW_COPY_AND_ASSIGN(RemoteAudioTrackAdapter); | 222 DISALLOW_COPY_AND_ASSIGN(RemoteAudioTrackAdapter); |
| 223 }; | 223 }; |
| 224 | 224 |
| 225 // Called on the signaling thread. | 225 // Called on the signaling thread. |
| 226 RemoteAudioTrackAdapter::RemoteAudioTrackAdapter( | 226 RemoteAudioTrackAdapter::RemoteAudioTrackAdapter( |
| 227 const scoped_refptr<base::SingleThreadTaskRunner>& main_thread, | 227 const scoped_refptr<base::SingleThreadTaskRunner>& main_thread, |
| 228 webrtc::AudioTrackInterface* webrtc_track) | 228 webrtc::AudioTrackInterface* webrtc_track) |
| 229 : RemoteMediaStreamTrackAdapter(main_thread, webrtc_track), | 229 : RemoteMediaStreamTrackAdapter(main_thread, webrtc_track), |
| 230 #if DCHECK_IS_ON | 230 #if !DCHECK_IS_OFF |
| 231 unregistered_(false), | 231 unregistered_(false), |
| 232 #endif | 232 #endif |
| 233 state_(observed_track()->state()) { | 233 state_(observed_track()->state()) { |
| 234 // TODO(tommi): Use TrackObserver instead. | 234 // TODO(tommi): Use TrackObserver instead. |
| 235 observed_track()->RegisterObserver(this); | 235 observed_track()->RegisterObserver(this); |
| 236 scoped_ptr<RemoteMediaStreamAudioTrack> media_stream_track( | 236 scoped_ptr<RemoteMediaStreamAudioTrack> media_stream_track( |
| 237 new RemoteMediaStreamAudioTrack(observed_track().get(), | 237 new RemoteMediaStreamAudioTrack(observed_track().get(), |
| 238 base::ThreadTaskRunnerHandle::Get())); | 238 base::ThreadTaskRunnerHandle::Get())); |
| 239 // Here, we use base::Unretained() to avoid a circular reference. | 239 // Here, we use base::Unretained() to avoid a circular reference. |
| 240 webkit_initialize_ = base::Bind( | 240 webkit_initialize_ = base::Bind( |
| 241 &RemoteAudioTrackAdapter::InitializeWebkitAudioTrack, | 241 &RemoteAudioTrackAdapter::InitializeWebkitAudioTrack, |
| 242 base::Unretained(this), base::Passed(&media_stream_track)); | 242 base::Unretained(this), base::Passed(&media_stream_track)); |
| 243 } | 243 } |
| 244 | 244 |
| 245 RemoteAudioTrackAdapter::~RemoteAudioTrackAdapter() { | 245 RemoteAudioTrackAdapter::~RemoteAudioTrackAdapter() { |
| 246 #if DCHECK_IS_ON | 246 #if !DCHECK_IS_OFF |
| 247 DCHECK(unregistered_); | 247 DCHECK(unregistered_); |
| 248 #endif | 248 #endif |
| 249 } | 249 } |
| 250 | 250 |
| 251 void RemoteAudioTrackAdapter::Unregister() { | 251 void RemoteAudioTrackAdapter::Unregister() { |
| 252 #if DCHECK_IS_ON | 252 #if !DCHECK_IS_OFF |
| 253 DCHECK(!unregistered_); | 253 DCHECK(!unregistered_); |
| 254 unregistered_ = true; | 254 unregistered_ = true; |
| 255 #endif | 255 #endif |
| 256 observed_track()->UnregisterObserver(this); | 256 observed_track()->UnregisterObserver(this); |
| 257 } | 257 } |
| 258 | 258 |
| 259 void RemoteAudioTrackAdapter::InitializeWebkitAudioTrack( | 259 void RemoteAudioTrackAdapter::InitializeWebkitAudioTrack( |
| 260 scoped_ptr<RemoteMediaStreamAudioTrack> media_stream_track) { | 260 scoped_ptr<RemoteMediaStreamAudioTrack> media_stream_track) { |
| 261 InitializeWebkitTrack(blink::WebMediaStreamSource::TypeAudio); | 261 InitializeWebkitTrack(blink::WebMediaStreamSource::TypeAudio); |
| 262 webkit_track()->setExtraData(media_stream_track.release()); | 262 webkit_track()->setExtraData(media_stream_track.release()); |
| (...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 442 // Unregister all the audio track observers that were not used. | 442 // Unregister all the audio track observers that were not used. |
| 443 // We need to do this before destruction since the observers can't unregister | 443 // We need to do this before destruction since the observers can't unregister |
| 444 // from within the dtor due to a race. | 444 // from within the dtor due to a race. |
| 445 for (auto& track : *audio_tracks.get()) { | 445 for (auto& track : *audio_tracks.get()) { |
| 446 if (track.get()) | 446 if (track.get()) |
| 447 track->Unregister(); | 447 track->Unregister(); |
| 448 } | 448 } |
| 449 } | 449 } |
| 450 | 450 |
| 451 } // namespace content | 451 } // namespace content |
| OLD | NEW |