| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 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/android/proxy_media_keys.h" | 5 #include "content/renderer/media/android/proxy_media_keys.h" |
| 6 | 6 |
| 7 #include <vector> | 7 #include <vector> |
| 8 | 8 |
| 9 #include "base/basictypes.h" | 9 #include "base/basictypes.h" |
| 10 #include "base/logging.h" | 10 #include "base/logging.h" |
| 11 #include "content/renderer/media/android/renderer_media_player_manager.h" | 11 #include "content/renderer/media/android/renderer_media_player_manager.h" |
| 12 #include "content/renderer/media/crypto/key_systems.h" | 12 #include "content/renderer/media/crypto/key_systems.h" |
| 13 | 13 |
| 14 namespace content { | 14 namespace content { |
| 15 | 15 |
| 16 int ProxyMediaKeys::next_cdm_id_ = |
| 17 RendererMediaPlayerManager::kInvalidCdmId + 1; |
| 18 |
| 16 ProxyMediaKeys::ProxyMediaKeys( | 19 ProxyMediaKeys::ProxyMediaKeys( |
| 17 RendererMediaPlayerManager* manager, | 20 RendererMediaPlayerManager* manager, |
| 18 int cdm_id, | |
| 19 const media::SessionCreatedCB& session_created_cb, | 21 const media::SessionCreatedCB& session_created_cb, |
| 20 const media::SessionMessageCB& session_message_cb, | 22 const media::SessionMessageCB& session_message_cb, |
| 21 const media::SessionReadyCB& session_ready_cb, | 23 const media::SessionReadyCB& session_ready_cb, |
| 22 const media::SessionClosedCB& session_closed_cb, | 24 const media::SessionClosedCB& session_closed_cb, |
| 23 const media::SessionErrorCB& session_error_cb) | 25 const media::SessionErrorCB& session_error_cb) |
| 24 : manager_(manager), | 26 : manager_(manager), |
| 25 cdm_id_(cdm_id), | 27 cdm_id_(next_cdm_id_++), |
| 26 session_created_cb_(session_created_cb), | 28 session_created_cb_(session_created_cb), |
| 27 session_message_cb_(session_message_cb), | 29 session_message_cb_(session_message_cb), |
| 28 session_ready_cb_(session_ready_cb), | 30 session_ready_cb_(session_ready_cb), |
| 29 session_closed_cb_(session_closed_cb), | 31 session_closed_cb_(session_closed_cb), |
| 30 session_error_cb_(session_error_cb) { | 32 session_error_cb_(session_error_cb) { |
| 31 DCHECK(manager_); | 33 DCHECK(manager_); |
| 32 } | 34 } |
| 33 | 35 |
| 34 ProxyMediaKeys::~ProxyMediaKeys() { | 36 ProxyMediaKeys::~ProxyMediaKeys() { |
| 35 manager_->DestroyCdm(cdm_id_); | 37 manager_->DestroyCdm(cdm_id_); |
| (...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 104 void ProxyMediaKeys::OnSessionClosed(uint32 session_id) { | 106 void ProxyMediaKeys::OnSessionClosed(uint32 session_id) { |
| 105 session_closed_cb_.Run(session_id); | 107 session_closed_cb_.Run(session_id); |
| 106 } | 108 } |
| 107 | 109 |
| 108 void ProxyMediaKeys::OnSessionError(uint32 session_id, | 110 void ProxyMediaKeys::OnSessionError(uint32 session_id, |
| 109 media::MediaKeys::KeyError error_code, | 111 media::MediaKeys::KeyError error_code, |
| 110 uint32 system_code) { | 112 uint32 system_code) { |
| 111 session_error_cb_.Run(session_id, error_code, system_code); | 113 session_error_cb_.Run(session_id, error_code, system_code); |
| 112 } | 114 } |
| 113 | 115 |
| 116 int ProxyMediaKeys::GetCdmId() const { |
| 117 return cdm_id_; |
| 118 } |
| 119 |
| 114 } // namespace content | 120 } // namespace content |
| OLD | NEW |