| 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 #ifndef MEDIA_CDM_CDM_WRAPPER_H_ | 5 #ifndef MEDIA_CDM_CDM_WRAPPER_H_ |
| 6 #define MEDIA_CDM_CDM_WRAPPER_H_ | 6 #define MEDIA_CDM_CDM_WRAPPER_H_ |
| 7 | 7 |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <string> | 10 #include <string> |
| 11 | 11 |
| 12 #include "base/macros.h" | 12 #include "base/macros.h" |
| 13 #include "media/cdm/api/content_decryption_module.h" | 13 #include "media/cdm/api/content_decryption_module.h" |
| 14 #include "media/cdm/supported_cdm_versions.h" | 14 #include "media/cdm/supported_cdm_versions.h" |
| 15 | 15 |
| 16 #if defined(USE_PPAPI_CDM_ADAPTER) | 16 #if defined(USE_PPAPI_CDM_ADAPTER) |
| 17 // When building the ppapi adapter do not include any non-trivial base/ headers. | 17 // When building the ppapi adapter do not include any non-trivial base/ headers. |
| 18 #include "ppapi/cpp/logging.h" | 18 #include "ppapi/cpp/logging.h" // nogncheck |
| 19 #define PLATFORM_DCHECK PP_DCHECK | 19 #define PLATFORM_DCHECK PP_DCHECK |
| 20 #else | 20 #else |
| 21 #include "base/logging.h" | 21 #include "base/logging.h" |
| 22 #define PLATFORM_DCHECK DCHECK | 22 #define PLATFORM_DCHECK DCHECK |
| 23 #endif | 23 #endif |
| 24 | 24 |
| 25 namespace media { | 25 namespace media { |
| 26 | 26 |
| 27 // Returns a pointer to the requested CDM upon success. | 27 // Returns a pointer to the requested CDM upon success. |
| 28 // Returns NULL if an error occurs or the requested |cdm_interface_version| or | 28 // Returns NULL if an error occurs or the requested |cdm_interface_version| or |
| (...skipping 290 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 319 // Also update supported_cdm_versions.h. | 319 // Also update supported_cdm_versions.h. |
| 320 static_assert(cdm::ContentDecryptionModule::kVersion == | 320 static_assert(cdm::ContentDecryptionModule::kVersion == |
| 321 cdm::ContentDecryptionModule_8::kVersion, | 321 cdm::ContentDecryptionModule_8::kVersion, |
| 322 "ensure cdm wrapper templates have old version support"); | 322 "ensure cdm wrapper templates have old version support"); |
| 323 | 323 |
| 324 } // namespace media | 324 } // namespace media |
| 325 | 325 |
| 326 #undef PLATFORM_DCHECK | 326 #undef PLATFORM_DCHECK |
| 327 | 327 |
| 328 #endif // MEDIA_CDM_CDM_WRAPPER_H_ | 328 #endif // MEDIA_CDM_CDM_WRAPPER_H_ |
| OLD | NEW |