va.h   va.h 
skipping to change at line 1036 skipping to change at line 1036
/**************************** /****************************
* H.264/AVC data structures * H.264/AVC data structures
****************************/ ****************************/
typedef struct _VAPictureH264 typedef struct _VAPictureH264
{ {
VASurfaceID picture_id; VASurfaceID picture_id;
unsigned int frame_idx; unsigned int frame_idx;
unsigned int flags; unsigned int flags;
unsigned int TopFieldOrderCnt; signed int TopFieldOrderCnt;
unsigned int BottomFieldOrderCnt; signed int BottomFieldOrderCnt;
} VAPictureH264; } VAPictureH264;
/* flags in VAPictureH264 could be OR of the following */ /* flags in VAPictureH264 could be OR of the following */
#define VA_PICTURE_H264_INVALID 0x00000001 #define VA_PICTURE_H264_INVALID 0x00000001
#define VA_PICTURE_H264_TOP_FIELD 0x00000002 #define VA_PICTURE_H264_TOP_FIELD 0x00000002
#define VA_PICTURE_H264_BOTTOM_FIELD 0x00000004 #define VA_PICTURE_H264_BOTTOM_FIELD 0x00000004
#define VA_PICTURE_H264_SHORT_TERM_REFERENCE 0x00000008 #define VA_PICTURE_H264_SHORT_TERM_REFERENCE 0x00000008
#define VA_PICTURE_H264_LONG_TERM_REFERENCE 0x00000010 #define VA_PICTURE_H264_LONG_TERM_REFERENCE 0x00000010
/* H.264 Picture Parameter Buffer */ /* H.264 Picture Parameter Buffer */
/* /*
 End of changes. 1 change blocks. 
2 lines changed or deleted 2 lines changed or added


 va_backend_tpi.h   va_backend_tpi.h 
skipping to change at line 69 skipping to change at line 69
int num_surfaces, int num_surfaces,
VASurfaceID *surfaces, /* out */ VASurfaceID *surfaces, /* out */
unsigned size, /* total buffer size need to be allocated */ unsigned size, /* total buffer size need to be allocated */
unsigned int fourcc, /* expected fourcc */ unsigned int fourcc, /* expected fourcc */
unsigned int luma_stride, /* luma stride, could be width al igned with a special value */ unsigned int luma_stride, /* luma stride, could be width al igned with a special value */
unsigned int chroma_u_stride, /* chroma stride */ unsigned int chroma_u_stride, /* chroma stride */
unsigned int chroma_v_stride, unsigned int chroma_v_stride,
unsigned int luma_offset, /* could be 0 */ unsigned int luma_offset, /* could be 0 */
unsigned int chroma_u_offset, /* UV offset from the beginni ng of the memory */ unsigned int chroma_u_offset, /* UV offset from the beginni ng of the memory */
unsigned int chroma_v_offset unsigned int chroma_v_offset
); );
VAStatus (*vaPutSurfaceBuf) ( VAStatus (*vaCreateSurfaceFromKBuf)(
VADriverContextP ctx, VADriverContextP ctx,
VASurfaceID surface, int width,
unsigned char* data, int height,
int* data_len, int format,
short srcx, VASurfaceID *surface, /* out */
short srcy, unsigned int kbuf_handle, /* kernel buffer handle*/
unsigned short srcw, unsigned size, /* kernel buffer size */
unsigned short srch, unsigned int kBuf_fourcc, /* expected fourcc */
short destx, unsigned int luma_stride, /* luma stride, could be width al
short desty, igned with a special value */
unsigned short destw, unsigned int chroma_u_stride, /* chroma stride */
unsigned short desth, unsigned int chroma_v_stride,
VARectangle *cliprects, /* client supplied clip list */ unsigned int luma_offset, /* could be 0 */
unsigned int number_cliprects, /* number of clip rects in th unsigned int chroma_u_offset, /* UV offset from the beginni
e clip list */ ng of the memory */
unsigned int flags /* de-interlacing flags */ unsigned int chroma_v_offset
); );
VAStatus (*vaPutSurfaceBuf) (
VADriverContextP ctx,
VASurfaceID surface,
unsigned char* data,
int* data_len,
short srcx,
short srcy,
unsigned short srcw,
unsigned short srch,
short destx,
short desty,
unsigned short destw,
unsigned short desth,
VARectangle *cliprects, /* client supplied clip list */
unsigned int number_cliprects, /* number of clip rects in t
he clip list */
unsigned int flags /* de-interlacing flags */
);
}; };
#endif /* _VA_BACKEND_TPI_H_ */ #endif /* _VA_BACKEND_TPI_H_ */
 End of changes. 2 change blocks. 
19 lines changed or deleted 38 lines changed or added


 va_tpi.h   va_tpi.h 
skipping to change at line 95 skipping to change at line 95
unsigned size, /* total buffer size need to be allocated */ unsigned size, /* total buffer size need to be allocated */
unsigned int fourcc, /* expected fourcc */ unsigned int fourcc, /* expected fourcc */
unsigned int luma_stride, /* luma stride, could be width aligned with a special value */ unsigned int luma_stride, /* luma stride, could be width aligned with a special value */
unsigned int chroma_u_stride, /* chroma stride */ unsigned int chroma_u_stride, /* chroma stride */
unsigned int chroma_v_stride, unsigned int chroma_v_stride,
unsigned int luma_offset, /* could be 0 */ unsigned int luma_offset, /* could be 0 */
unsigned int chroma_u_offset, /* UV offset from the beginning of the me mory */ unsigned int chroma_u_offset, /* UV offset from the beginning of the me mory */
unsigned int chroma_v_offset unsigned int chroma_v_offset
); );
/*
* Create surface from the Kernel buffer
*/
VAStatus vaCreateSurfaceFromKbuf(
VADisplay dpy,
int width,
int height,
int format,
VASurfaceID *surface, /* out */
unsigned int kbuf_handle, /* kernel buffer handle*/
unsigned size, /* kernel buffer size */
unsigned int kBuf_fourcc, /* expected fourcc */
unsigned int luma_stride, /* luma stride, could be width aligned with a
special value */
unsigned int chroma_u_stride, /* chroma stride */
unsigned int chroma_v_stride,
unsigned int luma_offset, /* could be 0 */
unsigned int chroma_u_offset, /* UV offset from the beginning of the me
mory */
unsigned int chroma_v_offset
);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
 End of changes. 1 change blocks. 
0 lines changed or deleted 22 lines changed or added


 va_version.h   va_version.h 
skipping to change at line 31 skipping to change at line 31
* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/ */
#ifndef VA_VERSION_H #ifndef VA_VERSION_H
#define VA_VERSION_H #define VA_VERSION_H
/** /**
* VA_MAJOR_VERSION: * VA_MAJOR_VERSION:
* *
* The major version of the VA library (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 the VA library (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 (32) #define VA_MINOR_VERSION 32
/** /**
* VA_MICRO_VERSION: * VA_MICRO_VERSION:
* *
* The micro version of the VA library (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 the VA library, like 1.2.3 * The full version of VA-API, like 1.2.3
*/ */
#define VA_VERSION 0.32.0 #define VA_VERSION 0.32.0
/** /**
* VA_VERSION_S: * VA_VERSION_S:
* *
* The full version of the VA library, in string form (suited for * The full version of VA-API, in string form (suited for string
* string concatenation) * concatenation)
*/ */
#define VA_VERSION_S "0.32.0" #define VA_VERSION_S "0.32.0"
/** /**
* VA_VERSION_HEX: * VA_VERSION_HEX:
* *
* Numerically encoded version of the VA library, 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))
/** /**
* VA_CHECK_VERSION: * VA_CHECK_VERSION:
* @major: major version, like 1 in 1.2.3 * @major: major version, like 1 in 1.2.3
* @minor: minor version, like 2 in 1.2.3 * @minor: minor version, like 2 in 1.2.3
* @micro: micro version, like 3 in 1.2.3 * @micro: micro version, like 3 in 1.2.3
* *
* Evaluates to %TRUE if the version of the VA library is greater * Evaluates to %TRUE if the version of VA-API is greater than
* than @major, @minor and @micro * @major, @minor and @micro
*/ */
#define VA_CHECK_VERSION(major,minor,micro) \ #define VA_CHECK_VERSION(major,minor,micro) \
(VA_MAJOR_VERSION > (major) || \ (VA_MAJOR_VERSION > (major) || \
(VA_MAJOR_VERSION == (major) && VA_MINOR_VERSION > (minor)) || \ (VA_MAJOR_VERSION == (major) && VA_MINOR_VERSION > (minor)) || \
(VA_MAJOR_VERSION == (major) && VA_MINOR_VERSION == (minor) && VA_ MICRO_VERSION >= (micro))) (VA_MAJOR_VERSION == (major) && VA_MINOR_VERSION == (minor) && VA_ MICRO_VERSION >= (micro)))
#endif /* VA_VERSION_H */ #endif /* VA_VERSION_H */
 End of changes. 11 change blocks. 
13 lines changed or deleted 13 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/