| va.h | | va.h | |
| | | | |
| skipping to change at line 81 | | skipping to change at line 81 | |
| /** | | /** | |
| * \file va.h | | * \file va.h | |
| * \brief The Core API | | * \brief The Core API | |
| * | | * | |
| * This file contains the \ref api_core "Core API". | | * This file contains the \ref api_core "Core API". | |
| */ | | */ | |
| | | | |
| #ifndef _VA_H_ | | #ifndef _VA_H_ | |
| #define _VA_H_ | | #define _VA_H_ | |
| | | | |
|
| | | #include <stdint.h> | |
| #include <va/va_version.h> | | #include <va/va_version.h> | |
| | | | |
| #ifdef __cplusplus | | #ifdef __cplusplus | |
| extern "C" { | | extern "C" { | |
| #endif | | #endif | |
| | | | |
| /** | | /** | |
| * \mainpage Video Acceleration (VA) API | | * \mainpage Video Acceleration (VA) API | |
| * | | * | |
| * \section intro Introduction | | * \section intro Introduction | |
| | | | |
| skipping to change at line 289 | | skipping to change at line 290 | |
| VAProfileMPEG4AdvancedSimple = 3, | | VAProfileMPEG4AdvancedSimple = 3, | |
| VAProfileMPEG4Main = 4, | | VAProfileMPEG4Main = 4, | |
| VAProfileH264Baseline = 5, | | VAProfileH264Baseline = 5, | |
| VAProfileH264Main = 6, | | VAProfileH264Main = 6, | |
| VAProfileH264High = 7, | | VAProfileH264High = 7, | |
| VAProfileVC1Simple = 8, | | VAProfileVC1Simple = 8, | |
| VAProfileVC1Main = 9, | | VAProfileVC1Main = 9, | |
| VAProfileVC1Advanced = 10, | | VAProfileVC1Advanced = 10, | |
| VAProfileH263Baseline = 11, | | VAProfileH263Baseline = 11, | |
| VAProfileJPEGBaseline = 12, | | VAProfileJPEGBaseline = 12, | |
|
| VAProfileH264ConstrainedBaseline = 13 | | VAProfileH264ConstrainedBaseline = 13, | |
| | | VAProfileVP8Version0_3 = 14 | |
| } VAProfile; | | } VAProfile; | |
| | | | |
| /* | | /* | |
| * Currently defined entrypoints | | * Currently defined entrypoints | |
| */ | | */ | |
| typedef enum | | typedef enum | |
| { | | { | |
| VAEntrypointVLD = 1, | | VAEntrypointVLD = 1, | |
| VAEntrypointIZZ = 2, | | VAEntrypointIZZ = 2, | |
| VAEntrypointIDCT = 3, | | VAEntrypointIDCT = 3, | |
| VAEntrypointMoComp = 4, | | VAEntrypointMoComp = 4, | |
| VAEntrypointDeblocking = 5, | | VAEntrypointDeblocking = 5, | |
| VAEntrypointEncSlice = 6, /* slice level encode */ | | VAEntrypointEncSlice = 6, /* slice level encode */ | |
| VAEntrypointEncPicture = 7, /* pictuer encode, JPEG, etc */ | | VAEntrypointEncPicture = 7, /* pictuer encode, JPEG, etc */ | |
| VAEntrypointVideoProc = 10, /**< Video pre/post-processing. */ | | VAEntrypointVideoProc = 10, /**< Video pre/post-processing. */ | |
|
| VAEntrypointMax | | | |
| } VAEntrypoint; | | } VAEntrypoint; | |
| | | | |
| /* Currently defined configuration attribute types */ | | /* Currently defined configuration attribute types */ | |
| typedef enum | | typedef enum | |
| { | | { | |
| VAConfigAttribRTFormat = 0, | | VAConfigAttribRTFormat = 0, | |
| VAConfigAttribSpatialResidual = 1, | | VAConfigAttribSpatialResidual = 1, | |
| VAConfigAttribSpatialClipping = 2, | | VAConfigAttribSpatialClipping = 2, | |
| VAConfigAttribIntraResidual = 3, | | VAConfigAttribIntraResidual = 3, | |
| VAConfigAttribEncryption = 4, | | VAConfigAttribEncryption = 4, | |
| | | | |
| skipping to change at line 875 | | skipping to change at line 876 | |
| VASliceGroupMapBufferType = 3, | | VASliceGroupMapBufferType = 3, | |
| VASliceParameterBufferType = 4, | | VASliceParameterBufferType = 4, | |
| VASliceDataBufferType = 5, | | VASliceDataBufferType = 5, | |
| VAMacroblockParameterBufferType = 6, | | VAMacroblockParameterBufferType = 6, | |
| VAResidualDataBufferType = 7, | | VAResidualDataBufferType = 7, | |
| VADeblockingParameterBufferType = 8, | | VADeblockingParameterBufferType = 8, | |
| VAImageBufferType = 9, | | VAImageBufferType = 9, | |
| VAProtectedSliceDataBufferType = 10, | | VAProtectedSliceDataBufferType = 10, | |
| VAQMatrixBufferType = 11, | | VAQMatrixBufferType = 11, | |
| VAHuffmanTableBufferType = 12, | | VAHuffmanTableBufferType = 12, | |
|
| | | VAProbabilityBufferType = 13, | |
| | | | |
| /* Following are encode buffer types */ | | /* Following are encode buffer types */ | |
| VAEncCodedBufferType = 21, | | VAEncCodedBufferType = 21, | |
| VAEncSequenceParameterBufferType = 22, | | VAEncSequenceParameterBufferType = 22, | |
| VAEncPictureParameterBufferType = 23, | | VAEncPictureParameterBufferType = 23, | |
| VAEncSliceParameterBufferType = 24, | | VAEncSliceParameterBufferType = 24, | |
| VAEncPackedHeaderParameterBufferType = 25, | | VAEncPackedHeaderParameterBufferType = 25, | |
| VAEncPackedHeaderDataBufferType = 26, | | VAEncPackedHeaderDataBufferType = 26, | |
| VAEncMiscParameterBufferType = 27, | | VAEncMiscParameterBufferType = 27, | |
| VAEncMacroblockParameterBufferType = 28, | | VAEncMacroblockParameterBufferType = 28, | |
| | | | |
| skipping to change at line 1975 | | skipping to change at line 1977 | |
| * Pre-defined fourcc codes | | * Pre-defined fourcc codes | |
| */ | | */ | |
| #define VA_FOURCC_NV12 0x3231564E | | #define VA_FOURCC_NV12 0x3231564E | |
| #define VA_FOURCC_AI44 0x34344149 | | #define VA_FOURCC_AI44 0x34344149 | |
| #define VA_FOURCC_RGBA 0x41424752 | | #define VA_FOURCC_RGBA 0x41424752 | |
| #define VA_FOURCC_RGBX 0x58424752 | | #define VA_FOURCC_RGBX 0x58424752 | |
| #define VA_FOURCC_BGRA 0x41524742 | | #define VA_FOURCC_BGRA 0x41524742 | |
| #define VA_FOURCC_BGRX 0x58524742 | | #define VA_FOURCC_BGRX 0x58524742 | |
| #define VA_FOURCC_ARGB 0x42475241 | | #define VA_FOURCC_ARGB 0x42475241 | |
| #define VA_FOURCC_XRGB 0x42475258 | | #define VA_FOURCC_XRGB 0x42475258 | |
|
| | | #define VA_FOURCC_ABGR 0x52474241 | |
| | | #define VA_FOURCC_XBGR 0x52474258 | |
| #define VA_FOURCC_UYVY 0x59565955 | | #define VA_FOURCC_UYVY 0x59565955 | |
| #define VA_FOURCC_YUY2 0x32595559 | | #define VA_FOURCC_YUY2 0x32595559 | |
| #define VA_FOURCC_AYUV 0x56555941 | | #define VA_FOURCC_AYUV 0x56555941 | |
| #define VA_FOURCC_NV11 0x3131564e | | #define VA_FOURCC_NV11 0x3131564e | |
| #define VA_FOURCC_YV12 0x32315659 | | #define VA_FOURCC_YV12 0x32315659 | |
| #define VA_FOURCC_P208 0x38303250 | | #define VA_FOURCC_P208 0x38303250 | |
| #define VA_FOURCC_IYUV 0x56555949 | | #define VA_FOURCC_IYUV 0x56555949 | |
| #define VA_FOURCC_YV24 0x34325659 | | #define VA_FOURCC_YV24 0x34325659 | |
| #define VA_FOURCC_YV32 0x32335659 | | #define VA_FOURCC_YV32 0x32335659 | |
| #define VA_FOURCC_Y800 0x30303859 | | #define VA_FOURCC_Y800 0x30303859 | |
| | | | |
End of changes. 5 change blocks. |
| 2 lines changed or deleted | | 6 lines changed or added | |
|
| va_version.h | | va_version.h | |
| | | | |
| skipping to change at line 40 | | skipping to change at line 40 | |
| * | | * | |
| * The major version of VA-API (1, if %VA_VERSION is 1.2.3) | | * The major version of VA-API (1, if %VA_VERSION is 1.2.3) | |
| */ | | */ | |
| #define VA_MAJOR_VERSION 0 | | #define VA_MAJOR_VERSION 0 | |
| | | | |
| /** | | /** | |
| * VA_MINOR_VERSION: | | * VA_MINOR_VERSION: | |
| * | | * | |
| * The minor version of VA-API (2, if %VA_VERSION is 1.2.3) | | * The minor version of VA-API (2, if %VA_VERSION is 1.2.3) | |
| */ | | */ | |
|
| #define VA_MINOR_VERSION 34 | | #define VA_MINOR_VERSION 35 | |
| | | | |
| /** | | /** | |
| * VA_MICRO_VERSION: | | * VA_MICRO_VERSION: | |
| * | | * | |
| * The micro version of VA-API (3, if %VA_VERSION is 1.2.3) | | * The micro version of VA-API (3, if %VA_VERSION is 1.2.3) | |
| */ | | */ | |
| #define VA_MICRO_VERSION 0 | | #define VA_MICRO_VERSION 0 | |
| | | | |
| /** | | /** | |
| * VA_VERSION: | | * VA_VERSION: | |
| * | | * | |
| * The full version of VA-API, like 1.2.3 | | * The full version of VA-API, like 1.2.3 | |
| */ | | */ | |
|
| #define VA_VERSION 0.34.0 | | #define VA_VERSION 0.35.0 | |
| | | | |
| /** | | /** | |
| * VA_VERSION_S: | | * VA_VERSION_S: | |
| * | | * | |
| * The full version of VA-API, in string form (suited for string | | * The full version of VA-API, in string form (suited for string | |
| * concatenation) | | * concatenation) | |
| */ | | */ | |
|
| #define VA_VERSION_S "0.34.0" | | #define VA_VERSION_S "0.35.0" | |
| | | | |
| /** | | /** | |
| * VA_VERSION_HEX: | | * VA_VERSION_HEX: | |
| * | | * | |
| * Numerically encoded version of VA-API, like 0x010203 | | * Numerically encoded version of VA-API, like 0x010203 | |
| */ | | */ | |
| #define VA_VERSION_HEX ((VA_MAJOR_VERSION << 24) | \ | | #define VA_VERSION_HEX ((VA_MAJOR_VERSION << 24) | \ | |
| (VA_MINOR_VERSION << 16) | \ | | (VA_MINOR_VERSION << 16) | \ | |
| (VA_MICRO_VERSION << 8)) | | (VA_MICRO_VERSION << 8)) | |
| | | | |
| | | | |
End of changes. 3 change blocks. |
| 3 lines changed or deleted | | 3 lines changed or added | |
|