update due to the change of interface

Signed-off-by: Xiang, Haihao <haihao.xiang@intel.com>

5 files changed, 30 insertions, 49 deletions

diff --git a/src/gen6_mfc.c b/src/gen6_mfc.c
index 38e69b76..37d73ee8 100644
--- a/src/gen6_mfc.c
+++ b/src/gen6_mfc.c
@@ -297,7 +297,7 @@ gen6_mfc_avc_img_state(VADriverContextP ctx,struct encode_state *encode_state,
 {
     struct intel_batchbuffer *batch = gen6_encoder_context->base.batch;
     struct gen6_mfc_context *mfc_context = &gen6_encoder_context->mfc_context;
-    VAEncSequenceParameterBufferH264Ext *pSequenceParameter = (VAEncSequenceParameterBufferH264Ext *)encode_state->seq_param_ext->buffer;
+    VAEncSequenceParameterBufferH264 *pSequenceParameter = (VAEncSequenceParameterBufferH264 *)encode_state->seq_param_ext->buffer;
     int width_in_mbs = (mfc_context->surface_state.width + 15) / 16;
     int height_in_mbs = (mfc_context->surface_state.height + 15) / 16;
 
@@ -452,7 +452,7 @@ static void gen6_mfc_avc_slice_state(VADriverContextP ctx,
 {
     struct intel_batchbuffer *batch = gen6_encoder_context->base.batch;
     struct gen6_mfc_context *mfc_context = &gen6_encoder_context->mfc_context;
-    VAEncSliceParameterBufferH264Ext *pSliceParameter = (VAEncSliceParameterBufferH264Ext *)encode_state->slice_params_ext[0]->buffer; /* TODO: multi slices support */
+    VAEncSliceParameterBufferH264 *pSliceParameter = (VAEncSliceParameterBufferH264 *)encode_state->slice_params_ext[0]->buffer; /* TODO: multi slices support */
     int bit_rate_control_target;
     if ( slice_type == SLICE_TYPE_I )
         bit_rate_control_target = 0;
@@ -847,9 +847,9 @@ void gen6_mfc_avc_pipeline_programing(VADriverContextP ctx,
     struct intel_batchbuffer *batch = gen6_encoder_context->base.batch;
     struct gen6_mfc_context *mfc_context = &gen6_encoder_context->mfc_context;
     struct gen6_vme_context *vme_context = &gen6_encoder_context->vme_context;
-    VAEncSequenceParameterBufferH264Ext *pSequenceParameter = (VAEncSequenceParameterBufferH264Ext *)encode_state->seq_param_ext->buffer;
-    VAEncPictureParameterBufferH264Ext *pPicParameter = (VAEncPictureParameterBufferH264Ext *)encode_state->pic_param_ext->buffer;
-    VAEncSliceParameterBufferH264Ext *pSliceParameter = (VAEncSliceParameterBufferH264Ext *)encode_state->slice_params_ext[0]->buffer; /* FIXME: multi slices */
+    VAEncSequenceParameterBufferH264 *pSequenceParameter = (VAEncSequenceParameterBufferH264 *)encode_state->seq_param_ext->buffer;
+    VAEncPictureParameterBufferH264 *pPicParameter = (VAEncPictureParameterBufferH264 *)encode_state->pic_param_ext->buffer;
+    VAEncSliceParameterBufferH264 *pSliceParameter = (VAEncSliceParameterBufferH264 *)encode_state->slice_params_ext[0]->buffer; /* FIXME: multi slices */
     VAEncH264DecRefPicMarkingBuffer *pDecRefPicMarking = NULL;
     unsigned int *msg = NULL, offset = 0;
     int emit_new_state = 1, object_len_in_bytes;
@@ -1015,7 +1015,7 @@ gen6_mfc_free_avc_surface(void **data)
 static void gen6_mfc_bit_rate_control_context_init(struct encode_state *encode_state, 
                                                    struct gen6_mfc_context *mfc_context) 
 {
-    VAEncSequenceParameterBufferH264Ext *pSequenceParameter = (VAEncSequenceParameterBufferH264Ext *)encode_state->seq_param_ext->buffer;
+    VAEncSequenceParameterBufferH264 *pSequenceParameter = (VAEncSequenceParameterBufferH264 *)encode_state->seq_param_ext->buffer;
     
     int width_in_mbs = (mfc_context->surface_state.width + 15) / 16;
     int height_in_mbs = (mfc_context->surface_state.height + 15) / 16;
@@ -1057,7 +1057,7 @@ static int gen6_mfc_bit_rate_control_context_update(struct encode_state *encode_
                                                    struct gen6_mfc_context *mfc_context,
                                                    int current_frame_size) 
 {
-    VAEncSliceParameterBufferH264Ext *pSliceParameter = (VAEncSliceParameterBufferH264Ext *)encode_state->slice_params_ext[0]->buffer; 
+    VAEncSliceParameterBufferH264 *pSliceParameter = (VAEncSliceParameterBufferH264 *)encode_state->slice_params_ext[0]->buffer; 
     int control_index = 1 - (pSliceParameter->slice_type == SLICE_TYPE_I);
     int oldQp = mfc_context->bit_rate_control_context[control_index].QpPrimeY;
 
@@ -1104,7 +1104,7 @@ static VAStatus gen6_mfc_avc_prepare(VADriverContextP ctx,
     struct object_buffer *obj_buffer;
     struct gen6_mfc_avc_surface_aux* gen6_avc_surface;
     dri_bo *bo;
-    VAEncPictureParameterBufferH264Ext *pPicParameter = (VAEncPictureParameterBufferH264Ext *)encode_state->pic_param_ext->buffer;
+    VAEncPictureParameterBufferH264 *pPicParameter = (VAEncPictureParameterBufferH264 *)encode_state->pic_param_ext->buffer;
     VAStatus vaStatus = VA_STATUS_SUCCESS;
 	int i;
 
@@ -1251,7 +1251,7 @@ gen6_mfc_avc_encode_picture(VADriverContextP ctx,
                             struct encode_state *encode_state,
                             struct gen6_encoder_context *gen6_encoder_context)
 {
-    VAEncSequenceParameterBufferH264Ext *pSequenceParameter = (VAEncSequenceParameterBufferH264Ext *)encode_state->seq_param_ext->buffer;
+    VAEncSequenceParameterBufferH264 *pSequenceParameter = (VAEncSequenceParameterBufferH264 *)encode_state->seq_param_ext->buffer;
     struct gen6_mfc_context *mfc_context = &gen6_encoder_context->mfc_context;
     int rate_control_mode = pSequenceParameter->rate_control_method;  
     int MAX_CBR_INTERATE = 4;
diff --git a/src/gen6_vme.c b/src/gen6_vme.c
index 26b65c77..bcfbee51 100644
--- a/src/gen6_vme.c
+++ b/src/gen6_vme.c
@@ -255,8 +255,8 @@ gen6_vme_output_buffer_setup(VADriverContextP ctx,
     struct gen6_vme_context *vme_context = &gen6_encoder_context->vme_context;
     struct i965_surface_state *ss;
     dri_bo *bo;
-    VAEncSequenceParameterBufferH264Ext *pSequenceParameter = (VAEncSequenceParameterBufferH264Ext *)encode_state->seq_param_ext->buffer;
-    VAEncSliceParameterBufferH264Ext *pSliceParameter = (VAEncSliceParameterBufferH264Ext *)encode_state->slice_params_ext[0]->buffer;
+    VAEncSequenceParameterBufferH264 *pSequenceParameter = (VAEncSequenceParameterBufferH264 *)encode_state->seq_param_ext->buffer;
+    VAEncSliceParameterBufferH264 *pSliceParameter = (VAEncSliceParameterBufferH264 *)encode_state->slice_params_ext[0]->buffer;
     int is_intra = pSliceParameter->slice_type == SLICE_TYPE_I;
     int width_in_mbs = pSequenceParameter->picture_width_in_mbs;
     int height_in_mbs = pSequenceParameter->picture_height_in_mbs;
@@ -311,7 +311,7 @@ static VAStatus gen6_vme_surface_setup(VADriverContextP ctx,
 {
     struct i965_driver_data *i965 = i965_driver_data(ctx);
     struct object_surface *obj_surface;
-    VAEncPictureParameterBufferH264Ext *pPicParameter = (VAEncPictureParameterBufferH264Ext *)encode_state->pic_param_ext->buffer;
+    VAEncPictureParameterBufferH264 *pPicParameter = (VAEncPictureParameterBufferH264 *)encode_state->pic_param_ext->buffer;
 
     /*Setup surfaces state*/
     /* current picture for encoding */
@@ -492,8 +492,8 @@ gen7_vme_output_buffer_setup(VADriverContextP ctx,
     struct gen6_vme_context *vme_context = &gen6_encoder_context->vme_context;
     struct gen7_surface_state *ss;
     dri_bo *bo;
-    VAEncSequenceParameterBufferH264Ext *pSequenceParameter = (VAEncSequenceParameterBufferH264Ext *)encode_state->seq_param_ext->buffer;
-    VAEncSliceParameterBufferH264Ext *pSliceParameter = (VAEncSliceParameterBufferH264Ext *)encode_state->slice_params_ext[0]->buffer;
+    VAEncSequenceParameterBufferH264 *pSequenceParameter = (VAEncSequenceParameterBufferH264 *)encode_state->seq_param_ext->buffer;
+    VAEncSliceParameterBufferH264 *pSliceParameter = (VAEncSliceParameterBufferH264 *)encode_state->slice_params_ext[0]->buffer;
     int is_intra = pSliceParameter->slice_type == SLICE_TYPE_I;
     int width_in_mbs = pSequenceParameter->picture_width_in_mbs;
     int height_in_mbs = pSequenceParameter->picture_height_in_mbs;
@@ -553,7 +553,7 @@ static VAStatus gen7_vme_surface_setup(VADriverContextP ctx,
 {
     struct i965_driver_data *i965 = i965_driver_data(ctx);
     struct object_surface *obj_surface;
-    VAEncPictureParameterBufferH264Ext *pPicParameter = (VAEncPictureParameterBufferH264Ext *)encode_state->pic_param_ext->buffer;
+    VAEncPictureParameterBufferH264 *pPicParameter = (VAEncPictureParameterBufferH264 *)encode_state->pic_param_ext->buffer;
 
     /*Setup surfaces state*/
     /* current picture for encoding */
@@ -859,8 +859,8 @@ static void gen6_vme_pipeline_programing(VADriverContextP ctx,
                                          struct gen6_encoder_context *gen6_encoder_context)
 {
     struct intel_batchbuffer *batch = gen6_encoder_context->base.batch;
-    VAEncSliceParameterBufferH264Ext *pSliceParameter = (VAEncSliceParameterBufferH264Ext *)encode_state->slice_params_ext[0]->buffer;
-    VAEncSequenceParameterBufferH264Ext *pSequenceParameter = (VAEncSequenceParameterBufferH264Ext *)encode_state->seq_param_ext->buffer;
+    VAEncSliceParameterBufferH264 *pSliceParameter = (VAEncSliceParameterBufferH264 *)encode_state->slice_params_ext[0]->buffer;
+    VAEncSequenceParameterBufferH264 *pSequenceParameter = (VAEncSequenceParameterBufferH264 *)encode_state->seq_param_ext->buffer;
     int is_intra = pSliceParameter->slice_type == SLICE_TYPE_I;
     int width_in_mbs = pSequenceParameter->picture_width_in_mbs;
     int height_in_mbs = pSequenceParameter->picture_height_in_mbs;
@@ -910,7 +910,7 @@ static VAStatus gen6_vme_prepare(VADriverContextP ctx,
 {
     struct i965_driver_data *i965 = i965_driver_data(ctx);
     VAStatus vaStatus = VA_STATUS_SUCCESS;
-    VAEncSliceParameterBufferH264Ext *pSliceParameter = (VAEncSliceParameterBufferH264Ext *)encode_state->slice_params_ext[0]->buffer;
+    VAEncSliceParameterBufferH264 *pSliceParameter = (VAEncSliceParameterBufferH264 *)encode_state->slice_params_ext[0]->buffer;
     int is_intra = pSliceParameter->slice_type == SLICE_TYPE_I;
 	
     /*Setup all the memory object*/
diff --git a/src/i965_drv_video.c b/src/i965_drv_video.c
index 98955b36..57d0770c 100644
--- a/src/i965_drv_video.c
+++ b/src/i965_drv_video.c
@@ -1086,9 +1086,6 @@ i965_create_buffer_internal(VADriverContextP ctx,
     case VAEncSequenceParameterBufferType:
     case VAEncPictureParameterBufferType:
     case VAEncSliceParameterBufferType:
-    case VAEncSequenceParameterBufferExtType:
-    case VAEncPictureParameterBufferExtType:
-    case VAEncSliceParameterBufferExtType:
     case VAEncDecRefPicMarkingBufferH264Type:
     case VAEncPackedHeaderParameterBufferType:
     case VAEncPackedHeaderDataBufferType:
@@ -1594,22 +1591,6 @@ i965_encoder_render_picture(VADriverContextP ctx,
         assert(obj_buffer);
 
         switch (obj_buffer->type) {
-        case VAEncSequenceParameterBufferType:
-            vaStatus = I965_RENDER_ENCODE_BUFFER(sequence_parameter);
-            break;
-
-        case VAEncPictureParameterBufferType:
-            vaStatus = I965_RENDER_ENCODE_BUFFER(picture_parameter);
-            break;		
-
-        case VAEncSliceParameterBufferType:
-            vaStatus = I965_RENDER_ENCODE_BUFFER(slice_parameter);
-            break;
-
-        case VAPictureParameterBufferType:
-            vaStatus = I965_RENDER_ENCODE_BUFFER(picture_control);
-            break;
-
         case VAQMatrixBufferType:
             vaStatus = I965_RENDER_ENCODE_BUFFER(qmatrix);
             break;
@@ -1618,15 +1599,15 @@ i965_encoder_render_picture(VADriverContextP ctx,
             vaStatus = I965_RENDER_ENCODE_BUFFER(iqmatrix);
             break;
 
-        case VAEncSequenceParameterBufferExtType:
+        case VAEncSequenceParameterBufferType:
             vaStatus = I965_RENDER_ENCODE_BUFFER(sequence_parameter_ext);
             break;
 
-        case VAEncPictureParameterBufferExtType:
+        case VAEncPictureParameterBufferType:
             vaStatus = I965_RENDER_ENCODE_BUFFER(picture_parameter_ext);
             break;
 
-        case VAEncSliceParameterBufferExtType:
+        case VAEncSliceParameterBufferType:
             vaStatus = I965_RENDER_ENCODE_BUFFER(slice_parameter_ext);
             break;
 
diff --git a/src/i965_encoder_utils.c b/src/i965_encoder_utils.c
index ab120b57..3a93d8d8 100644
--- a/src/i965_encoder_utils.c
+++ b/src/i965_encoder_utils.c
@@ -191,9 +191,9 @@ static void nal_header(avc_bitstream *bs, int nal_ref_idc, int nal_unit_type)
 
 static void 
 slice_header(avc_bitstream *bs,
-             VAEncSequenceParameterBufferH264Ext *sps_param,
-             VAEncPictureParameterBufferH264Ext *pic_param,
-             VAEncSliceParameterBufferH264Ext *slice_param,
+             VAEncSequenceParameterBufferH264 *sps_param,
+             VAEncPictureParameterBufferH264 *pic_param,
+             VAEncSliceParameterBufferH264 *slice_param,
              VAEncH264DecRefPicMarkingBuffer *dec_ref_pic_marking_param)
 {
     int first_mb_in_slice = slice_param->starting_macroblock_address;
@@ -293,9 +293,9 @@ slice_header(avc_bitstream *bs,
 }
 
 int 
-build_avc_slice_header(VAEncSequenceParameterBufferH264Ext *sps_param,
-                       VAEncPictureParameterBufferH264Ext *pic_param,
-                       VAEncSliceParameterBufferH264Ext *slice_param,
+build_avc_slice_header(VAEncSequenceParameterBufferH264 *sps_param,
+                       VAEncPictureParameterBufferH264 *pic_param,
+                       VAEncSliceParameterBufferH264 *slice_param,
                        VAEncH264DecRefPicMarkingBuffer *dec_ref_pic_marking_param,
                        unsigned char **slice_header_buffer)
 {
diff --git a/src/i965_encoder_utils.h b/src/i965_encoder_utils.h
index 981b419c..62ac9059 100644
--- a/src/i965_encoder_utils.h
+++ b/src/i965_encoder_utils.h
@@ -2,9 +2,9 @@
 #define __I965_ENCODER_UTILS_H__
 
 int 
-build_avc_slice_header(VAEncSequenceParameterBufferH264Ext *sps_param,
-                       VAEncPictureParameterBufferH264Ext *pic_param,
-                       VAEncSliceParameterBufferH264Ext *slice_param,
+build_avc_slice_header(VAEncSequenceParameterBufferH264 *sps_param,
+                       VAEncPictureParameterBufferH264 *pic_param,
+                       VAEncSliceParameterBufferH264 *slice_param,
                        VAEncH264DecRefPicMarkingBuffer *dec_ref_pic_marking_param,
                        unsigned char **slice_header_buffer);