| 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/encrypted_media_player_support.h" | 5 #include "media/blink/encrypted_media_player_support.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/callback_helpers.h" | 10 #include "base/callback_helpers.h" |
| (...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 164 | 164 |
| 165 if (!proxy_decryptor_) { | 165 if (!proxy_decryptor_) { |
| 166 DCHECK(current_key_system_.empty()); | 166 DCHECK(current_key_system_.empty()); |
| 167 DCHECK(!cdm_context_ready_cb_.is_null()); | 167 DCHECK(!cdm_context_ready_cb_.is_null()); |
| 168 proxy_decryptor_.reset(new ProxyDecryptor( | 168 proxy_decryptor_.reset(new ProxyDecryptor( |
| 169 media_permission_, use_hw_secure_codecs, | 169 media_permission_, use_hw_secure_codecs, |
| 170 BIND_TO_RENDER_LOOP(&EncryptedMediaPlayerSupport::OnKeyAdded), | 170 BIND_TO_RENDER_LOOP(&EncryptedMediaPlayerSupport::OnKeyAdded), |
| 171 BIND_TO_RENDER_LOOP(&EncryptedMediaPlayerSupport::OnKeyError), | 171 BIND_TO_RENDER_LOOP(&EncryptedMediaPlayerSupport::OnKeyError), |
| 172 BIND_TO_RENDER_LOOP(&EncryptedMediaPlayerSupport::OnKeyMessage))); | 172 BIND_TO_RENDER_LOOP(&EncryptedMediaPlayerSupport::OnKeyMessage))); |
| 173 | 173 |
| 174 GURL security_origin(frame->document().securityOrigin().toString()); | 174 GURL security_origin( |
| 175 base::string16(frame->document().securityOrigin().toString())); |
| 175 proxy_decryptor_->CreateCdm(cdm_factory_, key_system, security_origin, | 176 proxy_decryptor_->CreateCdm(cdm_factory_, key_system, security_origin, |
| 176 cdm_context_ready_cb_); | 177 cdm_context_ready_cb_); |
| 177 current_key_system_ = key_system; | 178 current_key_system_ = key_system; |
| 178 } | 179 } |
| 179 | 180 |
| 180 // We do not support run-time switching between key systems for now. | 181 // We do not support run-time switching between key systems for now. |
| 181 DCHECK(!current_key_system_.empty()); | 182 DCHECK(!current_key_system_.empty()); |
| 182 if (key_system != current_key_system_) | 183 if (key_system != current_key_system_) |
| 183 return WebMediaPlayer::MediaKeyExceptionInvalidPlayerState; | 184 return WebMediaPlayer::MediaKeyExceptionInvalidPlayerState; |
| 184 | 185 |
| (...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 320 | 321 |
| 321 client_->keyMessage( | 322 client_->keyMessage( |
| 322 WebString::fromUTF8(GetPrefixedKeySystemName(current_key_system_)), | 323 WebString::fromUTF8(GetPrefixedKeySystemName(current_key_system_)), |
| 323 WebString::fromUTF8(session_id), | 324 WebString::fromUTF8(session_id), |
| 324 message.empty() ? NULL : &message[0], | 325 message.empty() ? NULL : &message[0], |
| 325 base::saturated_cast<unsigned int>(message.size()), | 326 base::saturated_cast<unsigned int>(message.size()), |
| 326 destination_url); | 327 destination_url); |
| 327 } | 328 } |
| 328 | 329 |
| 329 } // namespace media | 330 } // namespace media |
| OLD | NEW |