| va.h | va.h | |||
|---|---|---|---|---|
| skipping to change at line 1446 | skipping to change at line 1446 | |||
| * Find out any pending ops on the render target | * Find out any pending ops on the render target | |||
| */ | */ | |||
| VAStatus vaQuerySurfaceStatus ( | VAStatus vaQuerySurfaceStatus ( | |||
| VADisplay dpy, | VADisplay dpy, | |||
| VASurfaceID render_target, | VASurfaceID render_target, | |||
| VASurfaceStatus *status /* out */ | VASurfaceStatus *status /* out */ | |||
| ); | ); | |||
| typedef enum | typedef enum | |||
| { | { | |||
| VA_DECODE_SLICE_MISSING = 0, | VADecodeSliceMissing = 0, | |||
| VA_DECODE_MB_ERROR = 1, | VADecodeMBError = 1, | |||
| } VA_DECODE_ERROR_TYPE; | } VADecodeErrorType; | |||
| /* | /* | |||
| * Client calls vaQuerySurfaceError with VA_STATUS_ERROR_DECODING_ERROR, se rver side returns | * Client calls vaQuerySurfaceError with VA_STATUS_ERROR_DECODING_ERROR, se rver side returns | |||
| * an array of structure VASurfaceDecodeMBErrors, and the array is terminat ed by setting status=-1 | * an array of structure VASurfaceDecodeMBErrors, and the array is terminat ed by setting status=-1 | |||
| */ | */ | |||
| typedef struct _VASurfaceDecodeMBErrors | typedef struct _VASurfaceDecodeMBErrors | |||
| { | { | |||
| int status; /* 1 if hardware has returned detailed info below, -1 means this record is invalid */ | int status; /* 1 if hardware has returned detailed info below, -1 means this record is invalid */ | |||
| unsigned int start_mb; /* start mb address with errors */ | unsigned int start_mb; /* start mb address with errors */ | |||
| unsigned int end_mb; /* end mb address with errors */ | unsigned int end_mb; /* end mb address with errors */ | |||
| VA_DECODE_ERROR_TYPE decode_error_type; | VADecodeErrorType decode_error_type; | |||
| } VASurfaceDecodeMBErrors; | } VASurfaceDecodeMBErrors; | |||
| /* | /* | |||
| * After the application gets VA_STATUS_ERROR_DECODING_ERROR after calling vaSyncSurface(), | * After the application gets VA_STATUS_ERROR_DECODING_ERROR after calling vaSyncSurface(), | |||
| * it can call vaQuerySurfaceError to find out further details on the parti cular error. | * it can call vaQuerySurfaceError to find out further details on the parti cular error. | |||
| * VA_STATUS_ERROR_DECODING_ERROR should be passed in as "error_status", | * VA_STATUS_ERROR_DECODING_ERROR should be passed in as "error_status", | |||
| * upon the return, error_info will point to an array of _VASurfaceDecodeMB Errors structure, | * upon the return, error_info will point to an array of _VASurfaceDecodeMB Errors structure, | |||
| * which is allocated and filled by libVA with detailed information on the missing or error macroblocks. | * which is allocated and filled by libVA with detailed information on the missing or error macroblocks. | |||
| * The array is terminated if "status==-1" is detected. | * The array is terminated if "status==-1" is detected. | |||
| */ | */ | |||
| skipping to change at line 1492 | skipping to change at line 1492 | |||
| * is at the upper left corner with positive X to the right and positive Y down | * is at the upper left corner with positive X to the right and positive Y down | |||
| */ | */ | |||
| #define VA_FOURCC(ch0, ch1, ch2, ch3) \ | #define VA_FOURCC(ch0, ch1, ch2, ch3) \ | |||
| ((unsigned long)(unsigned char) (ch0) | ((unsigned long)(unsigned char) (ch1) << 8) | \ | ((unsigned long)(unsigned char) (ch0) | ((unsigned long)(unsigned char) (ch1) << 8) | \ | |||
| ((unsigned long)(unsigned char) (ch2) << 16) | ((unsigned long)(unsigne d char) (ch3) << 24 )) | ((unsigned long)(unsigned char) (ch2) << 16) | ((unsigned long)(unsigne d char) (ch3) << 24 )) | |||
| /* a few common FourCCs */ | /* a few common FourCCs */ | |||
| #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_BGRA 0x41524742 | ||||
| #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 | |||
| /* byte order */ | /* byte order */ | |||
| #define VA_LSB_FIRST 1 | #define VA_LSB_FIRST 1 | |||
| End of changes. 3 change blocks. | ||||
| 4 lines changed or deleted | 5 lines changed or added | |||