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 // A track might participate in different WebMediaStreams and will | |
perkj_chrome
2014/03/12 07:12:40
Can you please update the comment in metric_host.h
Jói
2014/03/12 08:50:04
Will do.
| |
47 // have the same ID in each. So a unique ID for a track is the | |
48 // MediaStream ID plus the track ID. We add a separator that will not | |
49 // occur in either ID. | |
50 std::string MakeUniqueTrackId(blink::WebMediaStreamTrack* track) { | |
51 return track->stream().id().utf8() + " " + track->id().utf8(); | |
perkj_chrome
2014/03/12 07:12:40
oh- I did not now that there was such a back point
Jói
2014/03/12 08:50:04
Since all I really need is a unique identity per o
| |
52 } | |
53 | |
44 } // namespace content | 54 } // namespace content |
45 | 55 |
46 namespace { | 56 namespace { |
47 | 57 |
48 void InitializeWebkitTrack(webrtc::MediaStreamTrackInterface* track, | 58 void InitializeWebkitTrack(webrtc::MediaStreamTrackInterface* track, |
49 blink::WebMediaStreamTrack* webkit_track, | 59 blink::WebMediaStreamTrack* webkit_track, |
50 blink::WebMediaStreamSource::Type type) { | 60 blink::WebMediaStreamSource::Type type) { |
51 blink::WebMediaStreamSource webkit_source; | 61 blink::WebMediaStreamSource webkit_source; |
52 blink::WebString webkit_track_id(base::UTF8ToUTF16(track->id())); | 62 blink::WebString webkit_track_id(base::UTF8ToUTF16(track->id())); |
53 | 63 |
(...skipping 19 matching lines...) Expand all Loading... | |
73 | 83 |
74 namespace content { | 84 namespace content { |
75 | 85 |
76 RemoteMediaStreamTrackObserver::RemoteMediaStreamTrackObserver( | 86 RemoteMediaStreamTrackObserver::RemoteMediaStreamTrackObserver( |
77 webrtc::MediaStreamTrackInterface* webrtc_track, | 87 webrtc::MediaStreamTrackInterface* webrtc_track, |
78 const blink::WebMediaStreamTrack& webkit_track) | 88 const blink::WebMediaStreamTrack& webkit_track) |
79 : state_(webrtc_track->state()), | 89 : state_(webrtc_track->state()), |
80 webrtc_track_(webrtc_track), | 90 webrtc_track_(webrtc_track), |
81 webkit_track_(webkit_track) { | 91 webkit_track_(webkit_track) { |
82 webrtc_track->RegisterObserver(this); | 92 webrtc_track->RegisterObserver(this); |
93 | |
94 // We need to mirror the lifetime state for tracks to the browser | |
95 // process so that the duration of tracks can be accurately | |
96 // reported, because of RenderProcessHost::FastShutdownIfPossible, | |
97 // which in many cases will simply kill the renderer process. | |
98 RenderThreadImpl::current()->Send(new MediaStreamTrackMetricsHost_AddTrack( | |
99 MakeUniqueTrackId(&webkit_track_), | |
100 webkit_track_.source().type() == blink::WebMediaStreamSource::TypeAudio, | |
101 true)); | |
83 } | 102 } |
84 | 103 |
85 RemoteMediaStreamTrackObserver::~RemoteMediaStreamTrackObserver() { | 104 RemoteMediaStreamTrackObserver::~RemoteMediaStreamTrackObserver() { |
105 RenderThreadImpl::current()->Send(new MediaStreamTrackMetricsHost_RemoveTrack( | |
106 MakeUniqueTrackId(&webkit_track_))); | |
107 | |
86 webrtc_track_->UnregisterObserver(this); | 108 webrtc_track_->UnregisterObserver(this); |
87 } | 109 } |
88 | 110 |
89 void RemoteMediaStreamTrackObserver::OnChanged() { | 111 void RemoteMediaStreamTrackObserver::OnChanged() { |
90 DCHECK(CalledOnValidThread()); | 112 DCHECK(CalledOnValidThread()); |
91 | 113 |
92 webrtc::MediaStreamTrackInterface::TrackState state = webrtc_track_->state(); | 114 webrtc::MediaStreamTrackInterface::TrackState state = webrtc_track_->state(); |
93 if (state == state_) | 115 if (state == state_) |
94 return; | 116 return; |
95 | 117 |
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
211 InitializeWebkitTrack(*it, &new_track, | 233 InitializeWebkitTrack(*it, &new_track, |
212 blink::WebMediaStreamSource::TypeVideo); | 234 blink::WebMediaStreamSource::TypeVideo); |
213 video_track_observers_.push_back( | 235 video_track_observers_.push_back( |
214 new RemoteMediaStreamTrackObserver(*it, new_track)); | 236 new RemoteMediaStreamTrackObserver(*it, new_track)); |
215 webkit_stream_.addTrack(new_track); | 237 webkit_stream_.addTrack(new_track); |
216 } | 238 } |
217 } | 239 } |
218 } | 240 } |
219 | 241 |
220 } // namespace content | 242 } // namespace content |
OLD | NEW |