| va.h | | va.h | |
| | | | |
| skipping to change at line 512 | | skipping to change at line 512 | |
| VABitPlaneBufferType = 2, | | VABitPlaneBufferType = 2, | |
| 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, | |
| | | | |
| /* 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, | |
| VAEncH264VUIBufferType = 25, | | VAEncH264VUIBufferType = 25, | |
| VAEncH264SEIBufferType = 26, | | VAEncH264SEIBufferType = 26, | |
| VAEncMiscParameterBufferType = 27, | | VAEncMiscParameterBufferType = 27, | |
| VABufferTypeMax = 0xff | | VABufferTypeMax = 0xff | |
| } VABufferType; | | } VABufferType; | |
| | | | |
| skipping to change at line 628 | | skipping to change at line 630 | |
| } VAQMatrixBufferJPEG; | | } VAQMatrixBufferJPEG; | |
| | | | |
| typedef struct _VAEncPictureParameterBufferJPEG | | typedef struct _VAEncPictureParameterBufferJPEG | |
| { | | { | |
| VASurfaceID reconstructed_picture; | | VASurfaceID reconstructed_picture; | |
| unsigned short picture_width; | | unsigned short picture_width; | |
| unsigned short picture_height; | | unsigned short picture_height; | |
| VABufferID coded_buf; | | VABufferID coded_buf; | |
| } VAEncPictureParameterBufferJPEG; | | } VAEncPictureParameterBufferJPEG; | |
| | | | |
|
| | | #include <va/va_dec_jpeg.h> | |
| | | | |
| /**************************** | | /**************************** | |
| * MPEG-2 data structures | | * MPEG-2 data structures | |
| ****************************/ | | ****************************/ | |
| | | | |
| /* MPEG-2 Picture Parameter Buffer */ | | /* MPEG-2 Picture Parameter Buffer */ | |
| /* | | /* | |
| * For each frame or field, and before any slice data, a single | | * For each frame or field, and before any slice data, a single | |
| * picture parameter buffer must be send. | | * picture parameter buffer must be send. | |
| */ | | */ | |
| typedef struct _VAPictureParameterBufferMPEG2 | | typedef struct _VAPictureParameterBufferMPEG2 | |
| | | | |
| skipping to change at line 1122 | | skipping to change at line 1126 | |
| * is sent only when there is a change in the mapping values. | | * is sent only when there is a change in the mapping values. | |
| * The slice group map buffer map "map units" to slice groups as specified
in | | * The slice group map buffer map "map units" to slice groups as specified
in | |
| * section 8.2.2 of the H.264 spec. The buffer will contain one byte for ea
ch macroblock | | * section 8.2.2 of the H.264 spec. The buffer will contain one byte for ea
ch macroblock | |
| * in raster scan order | | * in raster scan order | |
| */ | | */ | |
| | | | |
| /* H.264 Slice Parameter Buffer */ | | /* H.264 Slice Parameter Buffer */ | |
| typedef struct _VASliceParameterBufferH264 | | typedef struct _VASliceParameterBufferH264 | |
| { | | { | |
| unsigned int slice_data_size;/* number of bytes in the slice data buffe
r for this slice */ | | unsigned int slice_data_size;/* number of bytes in the slice data buffe
r for this slice */ | |
|
| unsigned int slice_data_offset;/* the offset to the NAL start code for | | /** \brief Byte offset to the NAL Header Unit for this slice. */ | |
| this slice */ | | unsigned int slice_data_offset; | |
| unsigned int slice_data_flag; /* see VA_SLICE_DATA_FLAG_XXX defintions
*/ | | unsigned int slice_data_flag; /* see VA_SLICE_DATA_FLAG_XXX defintions
*/ | |
|
| unsigned short slice_data_bit_offset; /* bit offset from NAL start code | | /** | |
| to the beginning of slice data */ | | * \brief Bit offset from NAL Header Unit to the begining of slice_data | |
| | | (). | |
| | | * | |
| | | * This bit offset is relative to and includes the NAL unit byte | |
| | | * and represents the number of bits parsed in the slice_header() | |
| | | * after the removal of any emulation prevention bytes in | |
| | | * there. However, the slice data buffer passed to the hardware is | |
| | | * the original bitstream, thus including any emulation prevention | |
| | | * bytes. | |
| | | */ | |
| | | unsigned short slice_data_bit_offset; | |
| unsigned short first_mb_in_slice; | | unsigned short first_mb_in_slice; | |
| unsigned char slice_type; | | unsigned char slice_type; | |
| unsigned char direct_spatial_mv_pred_flag; | | unsigned char direct_spatial_mv_pred_flag; | |
| unsigned char num_ref_idx_l0_active_minus1; | | unsigned char num_ref_idx_l0_active_minus1; | |
| unsigned char num_ref_idx_l1_active_minus1; | | unsigned char num_ref_idx_l1_active_minus1; | |
| unsigned char cabac_init_idc; | | unsigned char cabac_init_idc; | |
| char slice_qp_delta; | | char slice_qp_delta; | |
| unsigned char disable_deblocking_filter_idc; | | unsigned char disable_deblocking_filter_idc; | |
| char slice_alpha_c0_offset_div2; | | char slice_alpha_c0_offset_div2; | |
| char slice_beta_offset_div2; | | char slice_beta_offset_div2; | |
| | | | |
End of changes. 4 change blocks. |
| 4 lines changed or deleted | | 18 lines changed or added | |
|