Chromium Code Reviews| 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/logging.h" | 9 #include "base/logging.h" |
| 10 #include "base/strings/utf_string_conversions.h" | 10 #include "base/strings/utf_string_conversions.h" |
| 11 #include "content/common/media/media_track_lifetime_metrics_messages.h" | |
| 11 #include "content/renderer/media/media_stream.h" | 12 #include "content/renderer/media/media_stream.h" |
| 12 #include "content/renderer/media/media_stream_dependency_factory.h" | 13 #include "content/renderer/media/media_stream_dependency_factory.h" |
| 14 #include "content/renderer/render_thread_impl.h" | |
| 13 #include "third_party/WebKit/public/platform/WebString.h" | 15 #include "third_party/WebKit/public/platform/WebString.h" |
| 14 | 16 |
| 15 namespace content { | 17 namespace content { |
| 16 | 18 |
| 17 // RemoteMediaStreamTrackObserver is responsible for listening on change | 19 // RemoteMediaStreamTrackObserver is responsible for listening on change |
| 18 // notification on a remote webrtc MediaStreamTrack and notify WebKit. | 20 // notification on a remote webrtc MediaStreamTrack and notify WebKit. |
| 19 class RemoteMediaStreamTrackObserver | 21 class RemoteMediaStreamTrackObserver |
| 20 : NON_EXPORTED_BASE(public webrtc::ObserverInterface), | 22 : NON_EXPORTED_BASE(public webrtc::ObserverInterface), |
| 21 NON_EXPORTED_BASE(public base::NonThreadSafe) { | 23 NON_EXPORTED_BASE(public base::NonThreadSafe) { |
| 22 public: | 24 public: |
| (...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 73 | 75 |
| 74 namespace content { | 76 namespace content { |
| 75 | 77 |
| 76 RemoteMediaStreamTrackObserver::RemoteMediaStreamTrackObserver( | 78 RemoteMediaStreamTrackObserver::RemoteMediaStreamTrackObserver( |
| 77 webrtc::MediaStreamTrackInterface* webrtc_track, | 79 webrtc::MediaStreamTrackInterface* webrtc_track, |
| 78 const blink::WebMediaStreamTrack& webkit_track) | 80 const blink::WebMediaStreamTrack& webkit_track) |
| 79 : state_(webrtc_track->state()), | 81 : state_(webrtc_track->state()), |
| 80 webrtc_track_(webrtc_track), | 82 webrtc_track_(webrtc_track), |
| 81 webkit_track_(webkit_track) { | 83 webkit_track_(webkit_track) { |
| 82 webrtc_track->RegisterObserver(this); | 84 webrtc_track->RegisterObserver(this); |
| 85 | |
| 86 // We need to mirror the lifetime state for tracks to the browser | |
| 87 // process so that the duration of tracks can be accurately | |
| 88 // reported, because of RenderProcessHost::FastShutdownIfPossible, | |
| 89 // which in many cases will simply kill the renderer process. | |
| 90 RenderThreadImpl::current()->Send(new MediaTrackLifetimeMetrics_AddTrack( | |
|
perkj_chrome
2014/03/11 08:05:21
Can we do this in a virtual method instead so I ca
Jói
2014/03/11 17:36:33
Sure, sounds good.
| |
| 91 webkit_track_.id().utf8(), | |
|
perkj_chrome
2014/03/11 08:05:21
To make this a bit harder - the same track can the
Jói
2014/03/11 17:36:33
I'm now using the MediaStream ID plus the track ID
| |
| 92 webkit_track_.source().type() == blink::WebMediaStreamSource::TypeAudio)); | |
| 83 } | 93 } |
| 84 | 94 |
| 85 RemoteMediaStreamTrackObserver::~RemoteMediaStreamTrackObserver() { | 95 RemoteMediaStreamTrackObserver::~RemoteMediaStreamTrackObserver() { |
| 96 RenderThreadImpl::current()->Send(new MediaTrackLifetimeMetrics_RemoveTrack( | |
|
perkj_chrome
2014/03/11 08:05:21
dito
Jói
2014/03/11 17:36:33
Done.
| |
| 97 webkit_track_.id().utf8())); | |
| 98 | |
| 86 webrtc_track_->UnregisterObserver(this); | 99 webrtc_track_->UnregisterObserver(this); |
| 87 } | 100 } |
| 88 | 101 |
| 89 void RemoteMediaStreamTrackObserver::OnChanged() { | 102 void RemoteMediaStreamTrackObserver::OnChanged() { |
| 90 DCHECK(CalledOnValidThread()); | 103 DCHECK(CalledOnValidThread()); |
| 91 | 104 |
| 92 webrtc::MediaStreamTrackInterface::TrackState state = webrtc_track_->state(); | 105 webrtc::MediaStreamTrackInterface::TrackState state = webrtc_track_->state(); |
| 93 if (state == state_) | 106 if (state == state_) |
| 94 return; | 107 return; |
| 95 | 108 |
| (...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 211 InitializeWebkitTrack(*it, &new_track, | 224 InitializeWebkitTrack(*it, &new_track, |
| 212 blink::WebMediaStreamSource::TypeVideo); | 225 blink::WebMediaStreamSource::TypeVideo); |
| 213 video_track_observers_.push_back( | 226 video_track_observers_.push_back( |
| 214 new RemoteMediaStreamTrackObserver(*it, new_track)); | 227 new RemoteMediaStreamTrackObserver(*it, new_track)); |
| 215 webkit_stream_.addTrack(new_track); | 228 webkit_stream_.addTrack(new_track); |
| 216 } | 229 } |
| 217 } | 230 } |
| 218 } | 231 } |
| 219 | 232 |
| 220 } // namespace content | 233 } // namespace content |
| OLD | NEW |