| 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 "media/cdm/ppapi/cdm_adapter.h" | 5 #include "media/cdm/ppapi/cdm_adapter.h" |
| 6 | 6 |
| 7 #include "media/base/limits.h" | 7 #include "media/base/limits.h" |
| 8 #include "media/cdm/ppapi/cdm_file_io_impl.h" | 8 #include "media/cdm/ppapi/cdm_file_io_impl.h" |
| 9 #include "media/cdm/ppapi/cdm_logging.h" | 9 #include "media/cdm/ppapi/cdm_logging.h" |
| 10 #include "media/cdm/ppapi/supported_cdm_versions.h" | 10 #include "media/cdm/ppapi/supported_cdm_versions.h" |
| (...skipping 271 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 282 return PP_CDMMESSAGETYPE_LICENSE_RENEWAL; | 282 return PP_CDMMESSAGETYPE_LICENSE_RENEWAL; |
| 283 case cdm::kLicenseRelease: | 283 case cdm::kLicenseRelease: |
| 284 return PP_CDMMESSAGETYPE_LICENSE_RELEASE; | 284 return PP_CDMMESSAGETYPE_LICENSE_RELEASE; |
| 285 } | 285 } |
| 286 | 286 |
| 287 PP_NOTREACHED(); | 287 PP_NOTREACHED(); |
| 288 return PP_CDMMESSAGETYPE_LICENSE_REQUEST; | 288 return PP_CDMMESSAGETYPE_LICENSE_REQUEST; |
| 289 } | 289 } |
| 290 | 290 |
| 291 PP_CdmKeyStatus CdmKeyStatusToPpKeyStatus(cdm::KeyStatus status) { | 291 PP_CdmKeyStatus CdmKeyStatusToPpKeyStatus(cdm::KeyStatus status) { |
| 292 // TODO(jrummell): Remove kOutputNotAllowed, add kOutputRestricted to CDM | |
| 293 // interface. http://crbug.com/507791. | |
| 294 switch (status) { | 292 switch (status) { |
| 295 case cdm::kUsable: | 293 case cdm::kUsable: |
| 296 return PP_CDMKEYSTATUS_USABLE; | 294 return PP_CDMKEYSTATUS_USABLE; |
| 297 case cdm::kInternalError: | 295 case cdm::kInternalError: |
| 298 return PP_CDMKEYSTATUS_INVALID; | 296 return PP_CDMKEYSTATUS_INVALID; |
| 299 case cdm::kExpired: | 297 case cdm::kExpired: |
| 300 return PP_CDMKEYSTATUS_EXPIRED; | 298 return PP_CDMKEYSTATUS_EXPIRED; |
| 301 case cdm::kOutputNotAllowed: | 299 case cdm::kOutputRestricted: |
| 302 return PP_CDMKEYSTATUS_OUTPUTRESTRICTED; | 300 return PP_CDMKEYSTATUS_OUTPUTRESTRICTED; |
| 303 case cdm::kOutputDownscaled: | 301 case cdm::kOutputDownscaled: |
| 304 return PP_CDMKEYSTATUS_OUTPUTDOWNSCALED; | 302 return PP_CDMKEYSTATUS_OUTPUTDOWNSCALED; |
| 305 case cdm::kStatusPending: | 303 case cdm::kStatusPending: |
| 306 return PP_CDMKEYSTATUS_STATUSPENDING; | 304 return PP_CDMKEYSTATUS_STATUSPENDING; |
| 305 case cdm::kReleased: |
| 306 return PP_CDMKEYSTATUS_RELEASED; |
| 307 } | 307 } |
| 308 | 308 |
| 309 PP_NOTREACHED(); | 309 PP_NOTREACHED(); |
| 310 return PP_CDMKEYSTATUS_INVALID; | 310 return PP_CDMKEYSTATUS_INVALID; |
| 311 } | 311 } |
| 312 | 312 |
| 313 } // namespace | 313 } // namespace |
| 314 | 314 |
| 315 namespace media { | 315 namespace media { |
| 316 | 316 |
| (...skipping 1023 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1340 } // namespace media | 1340 } // namespace media |
| 1341 | 1341 |
| 1342 namespace pp { | 1342 namespace pp { |
| 1343 | 1343 |
| 1344 // Factory function for your specialization of the Module object. | 1344 // Factory function for your specialization of the Module object. |
| 1345 Module* CreateModule() { | 1345 Module* CreateModule() { |
| 1346 return new media::CdmAdapterModule(); | 1346 return new media::CdmAdapterModule(); |
| 1347 } | 1347 } |
| 1348 | 1348 |
| 1349 } // namespace pp | 1349 } // namespace pp |
| OLD | NEW |