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/metrics/histogram.h" | |
| 10 #include "base/strings/utf_string_conversions.h" | 11 #include "base/strings/utf_string_conversions.h" |
| 12 #include "base/time/time.h" | |
| 11 #include "content/renderer/media/media_stream.h" | 13 #include "content/renderer/media/media_stream.h" |
| 12 #include "content/renderer/media/media_stream_dependency_factory.h" | 14 #include "content/renderer/media/media_stream_dependency_factory.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), |
| (...skipping 10 matching lines...) Expand all Loading... | |
| 31 const blink::WebMediaStreamTrack& webkit_track() { return webkit_track_; } | 33 const blink::WebMediaStreamTrack& webkit_track() { return webkit_track_; } |
| 32 | 34 |
| 33 private: | 35 private: |
| 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 |
| 43 // Used to calculate duration of the track for a metric logged at | |
| 44 // destruction time. | |
| 45 base::TimeTicks creation_time_; | |
| 46 | |
| 41 DISALLOW_COPY_AND_ASSIGN(RemoteMediaStreamTrackObserver); | 47 DISALLOW_COPY_AND_ASSIGN(RemoteMediaStreamTrackObserver); |
| 42 }; | 48 }; |
| 43 | 49 |
| 44 } // namespace content | 50 } // namespace content |
| 45 | 51 |
| 46 namespace { | 52 namespace { |
| 47 | 53 |
| 48 void InitializeWebkitTrack(webrtc::MediaStreamTrackInterface* track, | 54 void InitializeWebkitTrack(webrtc::MediaStreamTrackInterface* track, |
| 49 blink::WebMediaStreamTrack* webkit_track, | 55 blink::WebMediaStreamTrack* webkit_track, |
| 50 blink::WebMediaStreamSource::Type type) { | 56 blink::WebMediaStreamSource::Type type) { |
| (...skipping 20 matching lines...) Expand all Loading... | |
| 71 | 77 |
| 72 } // namespace anonymous | 78 } // namespace anonymous |
| 73 | 79 |
| 74 namespace content { | 80 namespace content { |
| 75 | 81 |
| 76 RemoteMediaStreamTrackObserver::RemoteMediaStreamTrackObserver( | 82 RemoteMediaStreamTrackObserver::RemoteMediaStreamTrackObserver( |
| 77 webrtc::MediaStreamTrackInterface* webrtc_track, | 83 webrtc::MediaStreamTrackInterface* webrtc_track, |
| 78 const blink::WebMediaStreamTrack& webkit_track) | 84 const blink::WebMediaStreamTrack& webkit_track) |
| 79 : state_(webrtc_track->state()), | 85 : state_(webrtc_track->state()), |
| 80 webrtc_track_(webrtc_track), | 86 webrtc_track_(webrtc_track), |
| 81 webkit_track_(webkit_track) { | 87 webkit_track_(webkit_track), |
| 88 creation_time_(base::TimeTicks::Now()) { | |
| 82 webrtc_track->RegisterObserver(this); | 89 webrtc_track->RegisterObserver(this); |
| 83 } | 90 } |
| 84 | 91 |
| 85 RemoteMediaStreamTrackObserver::~RemoteMediaStreamTrackObserver() { | 92 RemoteMediaStreamTrackObserver::~RemoteMediaStreamTrackObserver() { |
|
perkj_chrome
2014/03/05 09:39:17
If you close a tab - which I guess is very common
| |
| 93 // Emit the duration of the track to a histogram (one for audio, one | |
| 94 // for video). | |
| 95 base::TimeDelta duration = base::TimeTicks::Now() - creation_time_; | |
| 96 std::string histogram_name = "WebRTC.ReceivedVideoTrackDuration"; | |
| 97 if (webkit_track_.source().type() == blink::WebMediaStreamSource::TypeAudio) { | |
| 98 histogram_name = "WebRTC.ReceivedAudioTrackDuration"; | |
| 99 } else { | |
| 100 DCHECK(webkit_track_.source().type() == | |
| 101 blink::WebMediaStreamSource::TypeVideo); | |
| 102 } | |
| 103 UMA_HISTOGRAM_CUSTOM_TIMES(histogram_name, | |
|
Ami GONE FROM CHROMIUM
2014/03/05 08:44:27
This is a bug - the name parameter to UMA macros m
Alexei Svitkine (slow)
2014/03/05 14:23:37
The histogram macros cache the Histogram object af
| |
| 104 duration, | |
| 105 base::TimeDelta::FromMilliseconds(100), | |
| 106 base::TimeDelta::FromHours(16), | |
| 107 50); | |
| 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 |
| 96 state_ = state; | 119 state_ = state; |
| 97 switch (state) { | 120 switch (state) { |
| 98 case webrtc::MediaStreamTrackInterface::kInitializing: | 121 case webrtc::MediaStreamTrackInterface::kInitializing: |
| 99 // Ignore the kInitializing state since there is no match in | 122 // Ignore the kInitializing state since there is no match in |
| 100 // WebMediaStreamSource::ReadyState. | 123 // WebMediaStreamSource::ReadyState. |
| 101 break; | 124 break; |
| 102 case webrtc::MediaStreamTrackInterface::kLive: | 125 case webrtc::MediaStreamTrackInterface::kLive: |
| 103 webkit_track_.source().setReadyState( | 126 webkit_track_.source().setReadyState( |
| 104 blink::WebMediaStreamSource::ReadyStateLive); | 127 blink::WebMediaStreamSource::ReadyStateLive); |
| 105 break; | 128 break; |
| 106 case webrtc::MediaStreamTrackInterface::kEnded: | 129 case webrtc::MediaStreamTrackInterface::kEnded: |
| 107 webkit_track_.source().setReadyState( | 130 webkit_track_.source().setReadyState( |
|
no longer working on chromium
2014/03/05 20:54:09
Joi, I am not sure, but if you move the code from
| |
| 108 blink::WebMediaStreamSource::ReadyStateEnded); | 131 blink::WebMediaStreamSource::ReadyStateEnded); |
| 109 break; | 132 break; |
| 110 default: | 133 default: |
| 111 NOTREACHED(); | 134 NOTREACHED(); |
| 112 break; | 135 break; |
| 113 } | 136 } |
| 114 } | 137 } |
| 115 | 138 |
| 116 RemoteMediaStreamImpl::RemoteMediaStreamImpl( | 139 RemoteMediaStreamImpl::RemoteMediaStreamImpl( |
| 117 webrtc::MediaStreamInterface* webrtc_stream) | 140 webrtc::MediaStreamInterface* webrtc_stream) |
| (...skipping 93 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 |