| 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_stream_track_metrics_host_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 11 matching lines...) Expand all Loading... |
| 34 // webrtc::ObserverInterface implementation. | 36 // webrtc::ObserverInterface implementation. |
| 35 virtual void OnChanged() OVERRIDE; | 37 virtual void OnChanged() OVERRIDE; |
| 36 | 38 |
| 37 webrtc::MediaStreamTrackInterface::TrackState state_; | 39 webrtc::MediaStreamTrackInterface::TrackState state_; |
| 38 scoped_refptr<webrtc::MediaStreamTrackInterface> webrtc_track_; | 40 scoped_refptr<webrtc::MediaStreamTrackInterface> webrtc_track_; |
| 39 blink::WebMediaStreamTrack webkit_track_; | 41 blink::WebMediaStreamTrack webkit_track_; |
| 40 | 42 |
| 41 DISALLOW_COPY_AND_ASSIGN(RemoteMediaStreamTrackObserver); | 43 DISALLOW_COPY_AND_ASSIGN(RemoteMediaStreamTrackObserver); |
| 42 }; | 44 }; |
| 43 | 45 |
| 46 // We need an ID that is unique for this observer, within the current |
| 47 // renderer process, for the lifetime of the observer object. The |
| 48 // simplest approach is to just use the object's pointer value. We |
| 49 // store it in a uint64 which will be large enough regardless of |
| 50 // platform. |
| 51 uint64 MakeUniqueId(RemoteMediaStreamTrackObserver* observer) { |
| 52 return reinterpret_cast<uint64>(reinterpret_cast<void*>(observer)); |
| 53 } |
| 54 |
| 44 } // namespace content | 55 } // namespace content |
| 45 | 56 |
| 46 namespace { | 57 namespace { |
| 47 | 58 |
| 48 void InitializeWebkitTrack(webrtc::MediaStreamTrackInterface* track, | 59 void InitializeWebkitTrack(webrtc::MediaStreamTrackInterface* track, |
| 49 blink::WebMediaStreamTrack* webkit_track, | 60 blink::WebMediaStreamTrack* webkit_track, |
| 50 blink::WebMediaStreamSource::Type type) { | 61 blink::WebMediaStreamSource::Type type) { |
| 51 blink::WebMediaStreamSource webkit_source; | 62 blink::WebMediaStreamSource webkit_source; |
| 52 blink::WebString webkit_track_id(base::UTF8ToUTF16(track->id())); | 63 blink::WebString webkit_track_id(base::UTF8ToUTF16(track->id())); |
| 53 | 64 |
| (...skipping 19 matching lines...) Expand all Loading... |
| 73 | 84 |
| 74 namespace content { | 85 namespace content { |
| 75 | 86 |
| 76 RemoteMediaStreamTrackObserver::RemoteMediaStreamTrackObserver( | 87 RemoteMediaStreamTrackObserver::RemoteMediaStreamTrackObserver( |
| 77 webrtc::MediaStreamTrackInterface* webrtc_track, | 88 webrtc::MediaStreamTrackInterface* webrtc_track, |
| 78 const blink::WebMediaStreamTrack& webkit_track) | 89 const blink::WebMediaStreamTrack& webkit_track) |
| 79 : state_(webrtc_track->state()), | 90 : state_(webrtc_track->state()), |
| 80 webrtc_track_(webrtc_track), | 91 webrtc_track_(webrtc_track), |
| 81 webkit_track_(webkit_track) { | 92 webkit_track_(webkit_track) { |
| 82 webrtc_track->RegisterObserver(this); | 93 webrtc_track->RegisterObserver(this); |
| 94 |
| 95 // We need to mirror the lifetime state for tracks to the browser |
| 96 // process so that the duration of tracks can be accurately |
| 97 // reported, because of RenderProcessHost::FastShutdownIfPossible, |
| 98 // which in many cases will simply kill the renderer process. |
| 99 RenderThreadImpl::current()->Send(new MediaStreamTrackMetricsHost_AddTrack( |
| 100 MakeUniqueId(this), |
| 101 webkit_track_.source().type() == blink::WebMediaStreamSource::TypeAudio, |
| 102 true)); |
| 83 } | 103 } |
| 84 | 104 |
| 85 RemoteMediaStreamTrackObserver::~RemoteMediaStreamTrackObserver() { | 105 RemoteMediaStreamTrackObserver::~RemoteMediaStreamTrackObserver() { |
| 106 RenderThreadImpl::current()->Send(new MediaStreamTrackMetricsHost_RemoveTrack( |
| 107 MakeUniqueId(this))); |
| 108 |
| 86 webrtc_track_->UnregisterObserver(this); | 109 webrtc_track_->UnregisterObserver(this); |
| 87 } | 110 } |
| 88 | 111 |
| 89 void RemoteMediaStreamTrackObserver::OnChanged() { | 112 void RemoteMediaStreamTrackObserver::OnChanged() { |
| 90 DCHECK(CalledOnValidThread()); | 113 DCHECK(CalledOnValidThread()); |
| 91 | 114 |
| 92 webrtc::MediaStreamTrackInterface::TrackState state = webrtc_track_->state(); | 115 webrtc::MediaStreamTrackInterface::TrackState state = webrtc_track_->state(); |
| 93 if (state == state_) | 116 if (state == state_) |
| 94 return; | 117 return; |
| 95 | 118 |
| (...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 211 InitializeWebkitTrack(*it, &new_track, | 234 InitializeWebkitTrack(*it, &new_track, |
| 212 blink::WebMediaStreamSource::TypeVideo); | 235 blink::WebMediaStreamSource::TypeVideo); |
| 213 video_track_observers_.push_back( | 236 video_track_observers_.push_back( |
| 214 new RemoteMediaStreamTrackObserver(*it, new_track)); | 237 new RemoteMediaStreamTrackObserver(*it, new_track)); |
| 215 webkit_stream_.addTrack(new_track); | 238 webkit_stream_.addTrack(new_track); |
| 216 } | 239 } |
| 217 } | 240 } |
| 218 } | 241 } |
| 219 | 242 |
| 220 } // namespace content | 243 } // namespace content |
| OLD | NEW |