| OLD | NEW | 
|---|
| 1 /* Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 /* Copyright (c) 2012 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 | 5 | 
| 6 /* From private/pp_content_decryptor.idl modified Tue Oct 20 12:50:15 2015. */ | 6 /* From private/pp_content_decryptor.idl modified Mon Mar  7 19:26:40 2016. */ | 
| 7 | 7 | 
| 8 #ifndef PPAPI_C_PRIVATE_PP_CONTENT_DECRYPTOR_H_ | 8 #ifndef PPAPI_C_PRIVATE_PP_CONTENT_DECRYPTOR_H_ | 
| 9 #define PPAPI_C_PRIVATE_PP_CONTENT_DECRYPTOR_H_ | 9 #define PPAPI_C_PRIVATE_PP_CONTENT_DECRYPTOR_H_ | 
| 10 | 10 | 
| 11 #include "ppapi/c/pp_macros.h" | 11 #include "ppapi/c/pp_macros.h" | 
| 12 #include "ppapi/c/pp_stdint.h" | 12 #include "ppapi/c/pp_stdint.h" | 
| 13 | 13 | 
| 14 /** | 14 /** | 
| 15  * @file | 15  * @file | 
| 16  * The <code>PP_DecryptTrackingInfo</code> struct contains necessary information | 16  * The <code>PP_DecryptTrackingInfo</code> struct contains necessary information | 
| (...skipping 366 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 383  */ | 383  */ | 
| 384 typedef enum { | 384 typedef enum { | 
| 385   PP_VIDEOCODECPROFILE_UNKNOWN = 0, | 385   PP_VIDEOCODECPROFILE_UNKNOWN = 0, | 
| 386   PP_VIDEOCODECPROFILE_NOT_NEEDED = 1, | 386   PP_VIDEOCODECPROFILE_NOT_NEEDED = 1, | 
| 387   PP_VIDEOCODECPROFILE_H264_BASELINE = 2, | 387   PP_VIDEOCODECPROFILE_H264_BASELINE = 2, | 
| 388   PP_VIDEOCODECPROFILE_H264_MAIN = 3, | 388   PP_VIDEOCODECPROFILE_H264_MAIN = 3, | 
| 389   PP_VIDEOCODECPROFILE_H264_EXTENDED = 4, | 389   PP_VIDEOCODECPROFILE_H264_EXTENDED = 4, | 
| 390   PP_VIDEOCODECPROFILE_H264_HIGH = 5, | 390   PP_VIDEOCODECPROFILE_H264_HIGH = 5, | 
| 391   PP_VIDEOCODECPROFILE_H264_HIGH_10 = 6, | 391   PP_VIDEOCODECPROFILE_H264_HIGH_10 = 6, | 
| 392   PP_VIDEOCODECPROFILE_H264_HIGH_422 = 7, | 392   PP_VIDEOCODECPROFILE_H264_HIGH_422 = 7, | 
| 393   PP_VIDEOCODECPROFILE_H264_HIGH_444_PREDICTIVE = 8 | 393   PP_VIDEOCODECPROFILE_H264_HIGH_444_PREDICTIVE = 8, | 
|  | 394   PP_VIDEOCODECPROFILE_VP9_PROFILE0 = 9, | 
|  | 395   PP_VIDEOCODECPROFILE_VP9_PROFILE1 = 10, | 
|  | 396   PP_VIDEOCODECPROFILE_VP9_PROFILE2 = 11, | 
|  | 397   PP_VIDEOCODECPROFILE_VP9_PROFILE3 = 12 | 
| 394 } PP_VideoCodecProfile; | 398 } PP_VideoCodecProfile; | 
| 395 PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_VideoCodecProfile, 4); | 399 PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_VideoCodecProfile, 4); | 
| 396 /** | 400 /** | 
| 397  * @} | 401  * @} | 
| 398  */ | 402  */ | 
| 399 | 403 | 
| 400 /** | 404 /** | 
| 401  * @addtogroup Structs | 405  * @addtogroup Structs | 
| 402  * @{ | 406  * @{ | 
| 403  */ | 407  */ | 
| (...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 539    */ | 543    */ | 
| 540   uint32_t system_code; | 544   uint32_t system_code; | 
| 541 }; | 545 }; | 
| 542 PP_COMPILE_ASSERT_STRUCT_SIZE_IN_BYTES(PP_KeyInformation, 524); | 546 PP_COMPILE_ASSERT_STRUCT_SIZE_IN_BYTES(PP_KeyInformation, 524); | 
| 543 /** | 547 /** | 
| 544  * @} | 548  * @} | 
| 545  */ | 549  */ | 
| 546 | 550 | 
| 547 #endif  /* PPAPI_C_PRIVATE_PP_CONTENT_DECRYPTOR_H_ */ | 551 #endif  /* PPAPI_C_PRIVATE_PP_CONTENT_DECRYPTOR_H_ */ | 
| 548 | 552 | 
| OLD | NEW | 
|---|