| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 "base/stl_util.h" | 5 #include "base/stl_util.h" |
| 6 #include "media/base/cdm_key_information.h" | 6 #include "media/base/cdm_key_information.h" |
| 7 | 7 |
| 8 namespace media { | 8 namespace media { |
| 9 | 9 |
| 10 CdmKeyInformation::CdmKeyInformation() | 10 CdmKeyInformation::CdmKeyInformation() |
| 11 : status(INTERNAL_ERROR), system_code(0) { | 11 : status(INTERNAL_ERROR), system_code(0) { |
| 12 } | 12 } |
| 13 | 13 |
| 14 CdmKeyInformation::CdmKeyInformation(const std::vector<uint8>& key_id, | 14 CdmKeyInformation::CdmKeyInformation(const std::vector<uint8_t>& key_id, |
| 15 KeyStatus status, | 15 KeyStatus status, |
| 16 uint32 system_code) | 16 uint32_t system_code) |
| 17 : key_id(key_id), status(status), system_code(system_code) {} | 17 : key_id(key_id), status(status), system_code(system_code) {} |
| 18 | 18 |
| 19 CdmKeyInformation::CdmKeyInformation(const std::string& key_id, | 19 CdmKeyInformation::CdmKeyInformation(const std::string& key_id, |
| 20 KeyStatus status, | 20 KeyStatus status, |
| 21 uint32 system_code) | 21 uint32_t system_code) |
| 22 : CdmKeyInformation(reinterpret_cast<const uint8*>(key_id.data()), | 22 : CdmKeyInformation(reinterpret_cast<const uint8_t*>(key_id.data()), |
| 23 key_id.size(), | 23 key_id.size(), |
| 24 status, | 24 status, |
| 25 system_code) {} | 25 system_code) {} |
| 26 | 26 |
| 27 CdmKeyInformation::CdmKeyInformation(const uint8* key_id_data, | 27 CdmKeyInformation::CdmKeyInformation(const uint8_t* key_id_data, |
| 28 size_t key_id_length, | 28 size_t key_id_length, |
| 29 KeyStatus status, | 29 KeyStatus status, |
| 30 uint32 system_code) | 30 uint32_t system_code) |
| 31 : key_id(key_id_data, key_id_data + key_id_length), | 31 : key_id(key_id_data, key_id_data + key_id_length), |
| 32 status(status), | 32 status(status), |
| 33 system_code(system_code) {} | 33 system_code(system_code) {} |
| 34 | 34 |
| 35 CdmKeyInformation::~CdmKeyInformation() { | 35 CdmKeyInformation::~CdmKeyInformation() { |
| 36 } | 36 } |
| 37 | 37 |
| 38 } // namespace media | 38 } // namespace media |
| OLD | NEW |