Index: content/renderer/media/remote_media_stream_impl.cc |
diff --git a/content/renderer/media/remote_media_stream_impl.cc b/content/renderer/media/remote_media_stream_impl.cc |
index 66bdb60821d460328d74c65a2bb76744a013e93a..0d943065a50ce94dc37c533ccf9517af52d24855 100644 |
--- a/content/renderer/media/remote_media_stream_impl.cc |
+++ b/content/renderer/media/remote_media_stream_impl.cc |
@@ -8,8 +8,10 @@ |
#include "base/logging.h" |
#include "base/strings/utf_string_conversions.h" |
+#include "content/common/media/media_stream_track_metrics_host_messages.h" |
#include "content/renderer/media/media_stream.h" |
#include "content/renderer/media/media_stream_dependency_factory.h" |
+#include "content/renderer/render_thread_impl.h" |
#include "third_party/WebKit/public/platform/WebString.h" |
namespace content { |
@@ -41,6 +43,14 @@ class RemoteMediaStreamTrackObserver |
DISALLOW_COPY_AND_ASSIGN(RemoteMediaStreamTrackObserver); |
}; |
+// 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.
|
+// have the same ID in each. So a unique ID for a track is the |
+// MediaStream ID plus the track ID. We add a separator that will not |
+// occur in either ID. |
+std::string MakeUniqueTrackId(blink::WebMediaStreamTrack* track) { |
+ 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
|
+} |
+ |
} // namespace content |
namespace { |
@@ -80,9 +90,21 @@ RemoteMediaStreamTrackObserver::RemoteMediaStreamTrackObserver( |
webrtc_track_(webrtc_track), |
webkit_track_(webkit_track) { |
webrtc_track->RegisterObserver(this); |
+ |
+ // We need to mirror the lifetime state for tracks to the browser |
+ // process so that the duration of tracks can be accurately |
+ // reported, because of RenderProcessHost::FastShutdownIfPossible, |
+ // which in many cases will simply kill the renderer process. |
+ RenderThreadImpl::current()->Send(new MediaStreamTrackMetricsHost_AddTrack( |
+ MakeUniqueTrackId(&webkit_track_), |
+ webkit_track_.source().type() == blink::WebMediaStreamSource::TypeAudio, |
+ true)); |
} |
RemoteMediaStreamTrackObserver::~RemoteMediaStreamTrackObserver() { |
+ RenderThreadImpl::current()->Send(new MediaStreamTrackMetricsHost_RemoveTrack( |
+ MakeUniqueTrackId(&webkit_track_))); |
+ |
webrtc_track_->UnregisterObserver(this); |
} |