| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "media/blink/cdm_session_adapter.h" | 5 #include "media/blink/cdm_session_adapter.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/logging.h" | 10 #include "base/logging.h" |
| 11 #include "base/metrics/histogram.h" | 11 #include "base/metrics/histogram.h" |
| 12 #include "base/metrics/histogram_functions.h" |
| 12 #include "base/stl_util.h" | 13 #include "base/stl_util.h" |
| 13 #include "base/threading/thread_task_runner_handle.h" | 14 #include "base/threading/thread_task_runner_handle.h" |
| 14 #include "base/trace_event/trace_event.h" | 15 #include "base/trace_event/trace_event.h" |
| 15 #include "media/base/cdm_factory.h" | 16 #include "media/base/cdm_factory.h" |
| 16 #include "media/base/cdm_key_information.h" | 17 #include "media/base/cdm_key_information.h" |
| 17 #include "media/base/cdm_promise.h" | 18 #include "media/base/cdm_promise.h" |
| 18 #include "media/base/key_systems.h" | 19 #include "media/base/key_systems.h" |
| 19 #include "media/blink/webcontentdecryptionmodule_impl.h" | 20 #include "media/blink/webcontentdecryptionmodule_impl.h" |
| 20 #include "media/blink/webcontentdecryptionmodulesession_impl.h" | 21 #include "media/blink/webcontentdecryptionmodulesession_impl.h" |
| 21 #include "url/gurl.h" | 22 #include "url/gurl.h" |
| (...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 159 blink::WebString::fromUTF8(error_message)); | 160 blink::WebString::fromUTF8(error_message)); |
| 160 cdm_created_result_.reset(); | 161 cdm_created_result_.reset(); |
| 161 return; | 162 return; |
| 162 } | 163 } |
| 163 | 164 |
| 164 key_system_ = key_system; | 165 key_system_ = key_system; |
| 165 key_system_uma_prefix_ = | 166 key_system_uma_prefix_ = |
| 166 kMediaEME + GetKeySystemNameForUMA(key_system) + kDot; | 167 kMediaEME + GetKeySystemNameForUMA(key_system) + kDot; |
| 167 | 168 |
| 168 // Only report time for successful CDM creation. | 169 // Only report time for successful CDM creation. |
| 169 ReportTimeToCreateCdmUMA(base::TimeTicks::Now() - start_time); | 170 base::UmaHistogramTimes(key_system_uma_prefix_ + kTimeToCreateCdmUMAName, |
| 171 base::TimeTicks::Now() - start_time); |
| 170 | 172 |
| 171 cdm_ = cdm; | 173 cdm_ = cdm; |
| 172 | 174 |
| 173 cdm_created_result_->completeWithContentDecryptionModule( | 175 cdm_created_result_->completeWithContentDecryptionModule( |
| 174 new WebContentDecryptionModuleImpl(this)); | 176 new WebContentDecryptionModuleImpl(this)); |
| 175 cdm_created_result_.reset(); | 177 cdm_created_result_.reset(); |
| 176 } | 178 } |
| 177 | 179 |
| 178 void CdmSessionAdapter::OnSessionMessage( | 180 void CdmSessionAdapter::OnSessionMessage( |
| 179 const std::string& session_id, | 181 const std::string& session_id, |
| (...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 233 | 235 |
| 234 WebContentDecryptionModuleSessionImpl* CdmSessionAdapter::GetSession( | 236 WebContentDecryptionModuleSessionImpl* CdmSessionAdapter::GetSession( |
| 235 const std::string& session_id) { | 237 const std::string& session_id) { |
| 236 // Since session objects may get garbage collected, it is possible that there | 238 // Since session objects may get garbage collected, it is possible that there |
| 237 // are events coming back from the CDM and the session has been unregistered. | 239 // are events coming back from the CDM and the session has been unregistered. |
| 238 // We can not tell if the CDM is firing events at sessions that never existed. | 240 // We can not tell if the CDM is firing events at sessions that never existed. |
| 239 SessionMap::iterator session = sessions_.find(session_id); | 241 SessionMap::iterator session = sessions_.find(session_id); |
| 240 return (session != sessions_.end()) ? session->second.get() : NULL; | 242 return (session != sessions_.end()) ? session->second.get() : NULL; |
| 241 } | 243 } |
| 242 | 244 |
| 243 void CdmSessionAdapter::ReportTimeToCreateCdmUMA(base::TimeDelta time) const { | |
| 244 // Note: This leaks memory, which is expected behavior. | |
| 245 base::HistogramBase* histogram = base::Histogram::FactoryTimeGet( | |
| 246 GetKeySystemUMAPrefix() + kTimeToCreateCdmUMAName, | |
| 247 base::TimeDelta::FromMilliseconds(1), base::TimeDelta::FromSeconds(10), | |
| 248 50, base::HistogramBase::kUmaTargetedHistogramFlag); | |
| 249 | |
| 250 histogram->AddTime(time); | |
| 251 } | |
| 252 | |
| 253 } // namespace media | 245 } // namespace media |
| OLD | NEW |