Merge branch 'vaapi-ext' into staging-work
authorXiang, Haihao <haihao.xiang@intel.com>
Tue, 13 Mar 2012 00:47:44 +0000 (08:47 +0800)
committerXiang, Haihao <haihao.xiang@intel.com>
Tue, 13 Mar 2012 00:47:44 +0000 (08:47 +0800)
Conflicts:
src/gen6_mfc.c
src/gen6_vme.c
src/gen7_mfc.c
src/gen7_mfc.h

Signed-off-by: Xiang, Haihao <haihao.xiang@intel.com>
1  2 
configure.ac
src/gen6_mfc.c

diff --cc configure.ac
Simple merge
diff --cc src/gen6_mfc.c
@@@ -341,38 -377,38 +377,39 @@@ gen6_mfc_avc_slice_state(VADriverContex
      }
  
      OUT_BCS_BATCH(batch, 
 -                  (slice_param->direct_spatial_mv_pred_flag << 29) |             /*Direct Prediction Type*/
 -                  (0 << 24) |                /*Enable deblocking operation*/
 -                  (qp << 16) |                        /*Slice Quantization Parameter*/
 -                  (0x0202 << 0));
 -    OUT_BCS_BATCH(batch, (beginy << 24) |                     /*First MB X&Y , the begin postion of current slice*/
 +                  (slice_param->direct_spatial_mv_pred_flag<<29) |             /*Direct Prediction Type*/
 +                  (0<<24) |                /*Enable deblocking operation*/
 +                  (qp<<16) |                  /*Slice Quantization Parameter*/
 +                  0x0202 );
-     OUT_BCS_BATCH(batch, (beginy << 24) |                     /*First MB X&Y , the begin postion of current slice*/
-                          (beginx << 16) |
-                          slice_param->macroblock_address );
++    OUT_BCS_BATCH(batch,
++                  (beginy << 24) |                    /*First MB X&Y , the begin postion of current slice*/
+                   (beginx << 16) |
 -                  slice_param->starting_macroblock_address );
++                  slice_param->macroblock_address );
      OUT_BCS_BATCH(batch, (nexty << 16) | nextx);                       /*Next slice first MB X&Y*/
      OUT_BCS_BATCH(batch, 
-                   (rate_control_enable<<31) |         /*in CBR mode RateControlCounterEnable = enable*/
-                   (1<<30) |           /*ResetRateControlCounter*/
-                   (0<<28) |           /*RC Triggle Mode = Always Rate Control*/
-                   (4<<24) |     /*RC Stable Tolerance, middle level*/
-                   (rate_control_enable<<23) |     /*RC Panic Enable*/                 
-                   (0<<22) |     /*QP mode, don't modfiy CBP*/
-                   (0<<21) |     /*MB Type Direct Conversion Enabled*/ 
-                   (0<<20) |     /*MB Type Skip Conversion Enabled*/ 
+                   (rate_control_enable << 31) |               /*in CBR mode RateControlCounterEnable = enable*/
+                   (1 << 30) |         /*ResetRateControlCounter*/
+                   (0 << 28) |         /*RC Triggle Mode = Always Rate Control*/
+                   (4 << 24) |     /*RC Stable Tolerance, middle level*/
+                   (rate_control_enable << 23) |     /*RC Panic Enable*/                 
+                   (0 << 22) |     /*QP mode, don't modfiy CBP*/
+                   (0 << 21) |     /*MB Type Direct Conversion Enabled*/ 
+                   (0 << 20) |     /*MB Type Skip Conversion Enabled*/ 
                    (last_slice << 19) |     /*IsLastSlice*/
-                   (0<<18) |   /*BitstreamOutputFlag Compressed BitStream Output Disable Flag 0:enable 1:disable*/
-                   (1<<17) |       /*HeaderPresentFlag*/       
-                   (1<<16) |       /*SliceData PresentFlag*/
-                   (1<<15) |       /*TailPresentFlag*/
-                   (1<<13) |       /*RBSP NAL TYPE*/   
-                   (0<<12) );    /*CabacZeroWordInsertionEnable*/
-       
+                   (0 << 18) |         /*BitstreamOutputFlag Compressed BitStream Output Disable Flag 0:enable 1:disable*/
+                   (1 << 17) |     /*HeaderPresentFlag*/       
+                   (1 << 16) |     /*SliceData PresentFlag*/
+                   (1 << 15) |     /*TailPresentFlag*/
+                   (1 << 13) |     /*RBSP NAL TYPE*/   
+                   (0 << 12) );    /*CabacZeroWordInsertionEnable*/
      OUT_BCS_BATCH(batch, mfc_context->mfc_indirect_pak_bse_object.offset);
-     OUT_BCS_BATCH(batch, (maxQpN<<24) |     /*Target QP - 24 is lowest QP*/ 
-                   (maxQpP<<16) |     /*Target QP + 20 is highest QP*/
-                   (shrink<<8)  |
-                   (grow<<0));   
-     OUT_BCS_BATCH(batch, (correct[5] << 20) |
+     OUT_BCS_BATCH(batch,
+                   (maxQpN << 24) |     /*Target QP - 24 is lowest QP*/ 
+                   (maxQpP << 16) |     /*Target QP + 20 is highest QP*/
+                   (shrink << 8)  |
+                   (grow << 0));   
+     OUT_BCS_BATCH(batch,
+                   (correct[5] << 20) |
                    (correct[4] << 16) |
                    (correct[3] << 12) |
                    (correct[2] << 8) |
@@@ -628,54 -585,58 +586,57 @@@ static void gen6_mfc_init(VADriverConte
  }
  
  static void gen6_mfc_avc_pipeline_header_programing(VADriverContextP ctx,
-                                       struct encode_state *encode_state,
-                                       struct intel_encoder_context *encoder_context)
+                                                     struct encode_state *encode_state,
+                                                     struct intel_encoder_context *encoder_context,
+                                                     struct intel_batchbuffer *slice_batch)
  {
+     struct gen6_mfc_context *mfc_context = encoder_context->mfc_context;
      static int count = 0;
--    VAEncSequenceParameterBufferH264 *pSequenceParameter = (VAEncSequenceParameterBufferH264 *)encode_state->seq_param_ext->buffer;
 -    int rate_control_mode = pSequenceParameter->rate_control_method;   
 +    unsigned int rate_control_mode = encoder_context->rate_control_mode;
  
 -    if (encode_state->packed_header_data[VAEncPackedHeaderSPS]) {
 +    if (encode_state->packed_header_data[VAEncPackedHeaderH264_SPS]) {
          VAEncPackedHeaderParameterBuffer *param = NULL;
 -        unsigned int *header_data = (unsigned int *)encode_state->packed_header_data[VAEncPackedHeaderSPS]->buffer;
 +        unsigned int *header_data = (unsigned int *)encode_state->packed_header_data[VAEncPackedHeaderH264_SPS]->buffer;
          unsigned int length_in_bits;
  
 -        assert(encode_state->packed_header_param[VAEncPackedHeaderSPS]);
 -        param = (VAEncPackedHeaderParameterBuffer *)encode_state->packed_header_param[VAEncPackedHeaderSPS]->buffer;
 -        length_in_bits = param->length_in_bits[0];
 +        assert(encode_state->packed_header_param[VAEncPackedHeaderH264_SPS]);
 +        param = (VAEncPackedHeaderParameterBuffer *)encode_state->packed_header_param[VAEncPackedHeaderH264_SPS]->buffer;
 +        length_in_bits = param->bit_length;
  
-         gen6_mfc_avc_insert_object(ctx, 
+         mfc_context->insert_object(ctx,
                                     encoder_context,
                                     header_data,
                                     ALIGN(length_in_bits, 32) >> 5,
                                     length_in_bits & 0x1f,
 -                                   param->skip_emulation_check_count,
 +                                   5,   /* FIXME: check it */
                                     0,
                                     0,
-                                    !param->has_emulation_bytes);
 -                                   param->insert_emulation_bytes,
++                                   !param->has_emulation_bytes,
+                                    slice_batch);
      }
  
 -    if (encode_state->packed_header_data[VAEncPackedHeaderPPS]) {
 +    if (encode_state->packed_header_data[VAEncPackedHeaderH264_PPS]) {
          VAEncPackedHeaderParameterBuffer *param = NULL;
 -        unsigned int *header_data = (unsigned int *)encode_state->packed_header_data[VAEncPackedHeaderPPS]->buffer;
 +        unsigned int *header_data = (unsigned int *)encode_state->packed_header_data[VAEncPackedHeaderH264_PPS]->buffer;
          unsigned int length_in_bits;
  
 -        assert(encode_state->packed_header_param[VAEncPackedHeaderPPS]);
 -        param = (VAEncPackedHeaderParameterBuffer *)encode_state->packed_header_param[VAEncPackedHeaderPPS]->buffer;
 -        length_in_bits = param->length_in_bits[0];
 +        assert(encode_state->packed_header_param[VAEncPackedHeaderH264_PPS]);
 +        param = (VAEncPackedHeaderParameterBuffer *)encode_state->packed_header_param[VAEncPackedHeaderH264_PPS]->buffer;
 +        length_in_bits = param->bit_length;
  
-         gen6_mfc_avc_insert_object(ctx, 
+         mfc_context->insert_object(ctx,
                                     encoder_context,
                                     header_data,
                                     ALIGN(length_in_bits, 32) >> 5,
                                     length_in_bits & 0x1f,
 -                                   param->skip_emulation_check_count,
 +                                   5, /* FIXME: check it */
                                     0,
                                     0,
-                                    !param->has_emulation_bytes);
 -                                   param->insert_emulation_bytes,
++                                   !param->has_emulation_bytes,
+                                    slice_batch);
      }
      
 -    if ( (rate_control_mode == 0) && encode_state->packed_header_data[VAEncPackedHeaderSPS]) {       // this is frist AU
 +    if ( (rate_control_mode == VA_RC_CBR) && encode_state->packed_header_data[VAEncPackedHeaderH264_SPS]) {       // this is frist AU
          struct gen6_mfc_context *mfc_context = encoder_context->mfc_context;
  
          unsigned char *sei_data = NULL;
@@@ -985,8 -838,8 +839,7 @@@ static VAStatus gen6_mfc_avc_prepare(VA
      struct gen6_mfc_avc_surface_aux* gen6_avc_surface;
      dri_bo *bo;
      VAEncPictureParameterBufferH264 *pPicParameter = (VAEncPictureParameterBufferH264 *)encode_state->pic_param_ext->buffer;
--    VAEncSequenceParameterBufferH264 *pSequenceParameter = (VAEncSequenceParameterBufferH264 *)encode_state->seq_param_ext->buffer;
 -    int rate_control_mode = pSequenceParameter->rate_control_method;   
 +    unsigned int rate_control_mode = encoder_context->rate_control_mode;
      VAStatus vaStatus = VA_STATUS_SUCCESS;
      int i;
  
          gen6_mfc_bit_rate_control_context_init(encode_state, mfc_context);
  
      /*Programing HRD control */
 -    if ( (rate_control_mode == 0) && (mfc_context->vui_hrd.i_cpb_size_value == 0) )
 -        gen6_mfc_hrd_context_init(encode_state, mfc_context);
 +    if ( (rate_control_mode == VA_RC_CBR) && (mfc_context->vui_hrd.i_cpb_size_value == 0) )
 +        gen6_mfc_hrd_context_init(encode_state, encoder_context);
  
-     /*Programing bcs pipeline*/
-     gen6_mfc_avc_pipeline_programing(ctx, encode_state, encoder_context);     //filling the pipeline
-       
      return vaStatus;
  }
  
@@@ -1133,29 -984,683 +984,675 @@@ gen6_mfc_stop(VADriverContextP ctx
      return VA_STATUS_SUCCESS;
  }
  
- static VAStatus
- gen6_mfc_avc_encode_picture(VADriverContextP ctx, 
-                             struct encode_state *encode_state,
-                             struct intel_encoder_context *encoder_context)
+ #if __SOFTWARE__
+ static int
+ gen6_mfc_avc_pak_object_intra(VADriverContextP ctx, int x, int y, int end_mb, int qp,unsigned int *msg,
+                               struct intel_encoder_context *encoder_context,
+                               unsigned char target_mb_size, unsigned char max_mb_size,
+                               struct intel_batchbuffer *batch)
  {
-     VAEncSequenceParameterBufferH264 *pSequenceParameter = (VAEncSequenceParameterBufferH264 *)encode_state->seq_param_ext->buffer;
-     struct gen6_mfc_context *mfc_context = encoder_context->mfc_context;
-     int rate_control_mode = encoder_context->rate_control_mode;
-     int MAX_CBR_INTERATE = 4;
-     int current_frame_bits_size;
-     int i;
-  
-     for(i = 0; i < MAX_CBR_INTERATE; i++) {
-         gen6_mfc_init(ctx, encoder_context);
-         gen6_mfc_avc_prepare(ctx, encode_state, encoder_context);
-         gen6_mfc_run(ctx, encode_state, encoder_context);
-         gen6_mfc_stop(ctx, encode_state, encoder_context, &current_frame_bits_size);
-         if (rate_control_mode == VA_RC_CBR) {
-             //gen6_mfc_hrd_context_check(encode_state, mfc_context);
-             if ( gen6_mfc_bit_rate_control_context_update( encode_state, mfc_context, current_frame_bits_size) ) {
-                 gen6_mfc_hrd_context_update(encode_state, mfc_context);
-                 break;
-             }
+     int len_in_dwords = 11;
+     if (batch == NULL)
+         batch = encoder_context->base.batch;
+     BEGIN_BCS_BATCH(batch, len_in_dwords);
+     OUT_BCS_BATCH(batch, MFC_AVC_PAK_OBJECT | (len_in_dwords - 2));
+     OUT_BCS_BATCH(batch, 0);
+     OUT_BCS_BATCH(batch, 0);
+     OUT_BCS_BATCH(batch, 
+                   (0 << 24) |         /* PackedMvNum, Debug*/
+                   (0 << 20) |                 /* No motion vector */
+                   (1 << 19) |         /* CbpDcY */
+                   (1 << 18) |         /* CbpDcU */
+                   (1 << 17) |         /* CbpDcV */
+                   (msg[0] & 0xFFFF) );
+     OUT_BCS_BATCH(batch, (0xFFFF << 16) | (y << 8) | x);              /* Code Block Pattern for Y*/
+     OUT_BCS_BATCH(batch, 0x000F000F);                                                 /* Code Block Pattern */                
+     OUT_BCS_BATCH(batch, (0 << 27) | (end_mb << 26) | qp);    /* Last MB */
+     /*Stuff for Intra MB*/
+     OUT_BCS_BATCH(batch, msg[1]);                     /* We using Intra16x16 no 4x4 predmode*/        
+     OUT_BCS_BATCH(batch, msg[2]);     
+     OUT_BCS_BATCH(batch, msg[3]&0xFC);                
+     
+     /*MaxSizeInWord and TargetSzieInWord*/
+     OUT_BCS_BATCH(batch, (max_mb_size << 24) |
+                   (target_mb_size << 16) );
+     ADVANCE_BCS_BATCH(batch);
+     return len_in_dwords;
+ }
+ static int
+ gen6_mfc_avc_pak_object_inter(VADriverContextP ctx, int x, int y, int end_mb, int qp, unsigned int offset,
+                               struct intel_encoder_context *encoder_context,
+                               unsigned char target_mb_size,unsigned char max_mb_size, int slice_type,
+                               struct intel_batchbuffer *batch)
+ {
+     int len_in_dwords = 11;
+     if (batch == NULL)
+         batch = encoder_context->base.batch;
+     BEGIN_BCS_BATCH(batch, len_in_dwords);
+     OUT_BCS_BATCH(batch, MFC_AVC_PAK_OBJECT | (len_in_dwords - 2));
+     OUT_BCS_BATCH(batch, 32);         /* 32 MV*/
+     OUT_BCS_BATCH(batch, offset);
+     OUT_BCS_BATCH(batch, 
+                   (1 << 24) |     /* PackedMvNum, Debug*/
+                   (4 << 20) |     /* 8 MV, SNB don't use it*/
+                   (1 << 19) |     /* CbpDcY */
+                   (1 << 18) |     /* CbpDcU */
+                   (1 << 17) |     /* CbpDcV */
+                   (0 << 15) |     /* Transform8x8Flag = 0*/
+                   (0 << 14) |     /* Frame based*/
+                   (0 << 13) |     /* Inter MB */
+                   (1 << 8)  |     /* MbType = P_L0_16x16 */   
+                   (0 << 7)  |     /* MBZ for frame */
+                   (0 << 6)  |     /* MBZ */
+                   (2 << 4)  |     /* MBZ for inter*/
+                   (0 << 3)  |     /* MBZ */
+                   (0 << 2)  |     /* SkipMbFlag */
+                   (0 << 0));      /* InterMbMode */
+     OUT_BCS_BATCH(batch, (0xFFFF<<16) | (y << 8) | x);        /* Code Block Pattern for Y*/
+     OUT_BCS_BATCH(batch, 0x000F000F);                         /* Code Block Pattern */  
+ #if 0 
+     if ( slice_type == SLICE_TYPE_B) {
+         OUT_BCS_BATCH(batch, (0xF<<28) | (end_mb << 26) | qp);        /* Last MB */
+     } else {
+         OUT_BCS_BATCH(batch, (end_mb << 26) | qp);    /* Last MB */
+     }
+ #else
+     OUT_BCS_BATCH(batch, (end_mb << 26) | qp);        /* Last MB */
+ #endif
+     /*Stuff for Inter MB*/
+     OUT_BCS_BATCH(batch, 0x0);        
+     OUT_BCS_BATCH(batch, 0x0);    
+     OUT_BCS_BATCH(batch, 0x0);        
+     /*MaxSizeInWord and TargetSzieInWord*/
+     OUT_BCS_BATCH(batch, (max_mb_size << 24) |
+                   (target_mb_size << 16) );
+     ADVANCE_BCS_BATCH(batch);
+     return len_in_dwords;
+ }
+ static void 
+ gen6_mfc_avc_pipeline_slice_programing(VADriverContextP ctx,
+                                        struct encode_state *encode_state,
+                                        struct intel_encoder_context *encoder_context,
+                                        int slice_index,
+                                        struct intel_batchbuffer *slice_batch)
+ {
+     struct gen6_mfc_context *mfc_context = encoder_context->mfc_context;
+     struct gen6_vme_context *vme_context = encoder_context->vme_context;
+     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[slice_index]->buffer; 
 -    VAEncH264DecRefPicMarkingBuffer *pDecRefPicMarking = NULL;
+     unsigned int *msg = NULL, offset = 0;
+     int is_intra = pSliceParameter->slice_type == SLICE_TYPE_I;
+     int width_in_mbs = (mfc_context->surface_state.width + 15) / 16;
+     int height_in_mbs = (mfc_context->surface_state.height + 15) / 16;
 -    int last_slice = (pSliceParameter->starting_macroblock_address + pSliceParameter->number_of_mbs) == (width_in_mbs * height_in_mbs);
++    int last_slice = (pSliceParameter->macroblock_address + pSliceParameter->num_macroblocks) == (width_in_mbs * height_in_mbs);
+     int i,x,y;
+     int qp = pPicParameter->pic_init_qp + pSliceParameter->slice_qp_delta;
 -    int rate_control_mode = pSequenceParameter->rate_control_method;   
++    unsigned int rate_control_mode = encoder_context->rate_control_mode;
+     unsigned char *slice_header = NULL;
+     int slice_header_length_in_bits = 0;
+     unsigned int tail_data[] = { 0x0, 0x0 };
+     gen6_mfc_avc_slice_state(ctx, pSliceParameter,
+                              encode_state, encoder_context,
 -                             (rate_control_mode == 0), qp, slice_batch);
++                             (rate_control_mode == VA_RC_CBR), qp, slice_batch);
+     if ( slice_index == 0) 
+         gen6_mfc_avc_pipeline_header_programing(ctx, encode_state, encoder_context, slice_batch);
 -    if (encode_state->dec_ref_pic_marking)
 -        pDecRefPicMarking = (VAEncH264DecRefPicMarkingBuffer *)encode_state->dec_ref_pic_marking->buffer;
 -    slice_header_length_in_bits = build_avc_slice_header(pSequenceParameter, pPicParameter, pSliceParameter, pDecRefPicMarking, &slice_header);
++    slice_header_length_in_bits = build_avc_slice_header(pSequenceParameter, pPicParameter, pSliceParameter, &slice_header);
+     // slice hander
+     mfc_context->insert_object(ctx, encoder_context,
+                                (unsigned int *)slice_header, ALIGN(slice_header_length_in_bits, 32) >> 5, slice_header_length_in_bits & 0x1f,
+                                5,  /* first 5 bytes are start code + nal unit type */
+                                1, 0, 1, slice_batch);
 -    if ( rate_control_mode == 0) {
++    if ( rate_control_mode == VA_RC_CBR) {
+         qp = mfc_context->bit_rate_control_context[1-is_intra].QpPrimeY;
+     }
+     if (is_intra) {
+         dri_bo_map(vme_context->vme_output.bo , 1);
+         msg = (unsigned int *)vme_context->vme_output.bo->virtual;
+     }
+    
 -    for (i = pSliceParameter->starting_macroblock_address; 
 -         i < pSliceParameter->starting_macroblock_address + pSliceParameter->number_of_mbs; i++) {
 -        int last_mb = (i == (pSliceParameter->starting_macroblock_address + pSliceParameter->number_of_mbs - 1) );
++    for (i = pSliceParameter->macroblock_address; 
++         i < pSliceParameter->macroblock_address + pSliceParameter->num_macroblocks; i++) {
++        int last_mb = (i == (pSliceParameter->macroblock_address + pSliceParameter->num_macroblocks - 1) );
+         x = i % width_in_mbs;
+         y = i / width_in_mbs;
+         if (is_intra) {
+             assert(msg);
+             gen6_mfc_avc_pak_object_intra(ctx, x, y, last_mb, qp, msg, encoder_context, 0, 0, slice_batch);
+             msg += 4;
+         } else {
+             gen6_mfc_avc_pak_object_inter(ctx, x, y, last_mb, qp, offset, encoder_context, 0, 0, pSliceParameter->slice_type, slice_batch);
+             offset += 64;
+         }
+     }
+    
+     if (is_intra)
+         dri_bo_unmap(vme_context->vme_output.bo);
+     if ( last_slice ) {    
+         mfc_context->insert_object(ctx, encoder_context,
+                                    tail_data, 2, 8,
+                                    2, 1, 1, 0, slice_batch);
+     } else {
+         mfc_context->insert_object(ctx, encoder_context,
+                                    tail_data, 1, 8,
+                                    1, 1, 1, 0, slice_batch);
+     }
+     free(slice_header);
+ }
+ static dri_bo *
+ gen6_mfc_avc_software_batchbuffer(VADriverContextP ctx,
+                                   struct encode_state *encode_state,
+                                   struct intel_encoder_context *encoder_context)
+ {
+     struct i965_driver_data *i965 = i965_driver_data(ctx);
+     struct intel_batchbuffer *batch = intel_batchbuffer_new(&i965->intel, I915_EXEC_BSD);
+     dri_bo *batch_bo = batch->buffer;
+     int i, used;
+     for (i = 0; i < encode_state->num_slice_params_ext; i++) {
+         gen6_mfc_avc_pipeline_slice_programing(ctx, encode_state, encoder_context, i, batch);
+     }
+     used = intel_batchbuffer_used_size(batch);
+     if ((used & 4) == 0) {
+         BEGIN_BCS_BATCH(batch, 2);
+         OUT_BCS_BATCH(batch, 0);
+         OUT_BCS_BATCH(batch, MI_BATCH_BUFFER_END);
+     }
+     dri_bo_reference(batch_bo);
+     intel_batchbuffer_free(batch);
+     return batch_bo;
+ }
+ #else
+ static void
+ gen6_mfc_batchbuffer_surfaces_input(VADriverContextP ctx,
+                                     struct encode_state *encode_state,
+                                     struct intel_encoder_context *encoder_context)
+ {
+     struct gen6_vme_context *vme_context = encoder_context->vme_context;
+     struct gen6_mfc_context *mfc_context = encoder_context->mfc_context;
+     assert(vme_context->vme_output.bo);
+     mfc_context->buffer_suface_setup(ctx,
+                                      &mfc_context->gpe_context,
+                                      &vme_context->vme_output,
+                                      BINDING_TABLE_OFFSET(BIND_IDX_VME_OUTPUT),
+                                      SURFACE_STATE_OFFSET(BIND_IDX_VME_OUTPUT));
+     assert(mfc_context->aux_batchbuffer_surface.bo);
+     mfc_context->buffer_suface_setup(ctx,
+                                      &mfc_context->gpe_context,
+                                      &mfc_context->aux_batchbuffer_surface,
+                                      BINDING_TABLE_OFFSET(BIND_IDX_MFC_SLICE_HEADER),
+                                      SURFACE_STATE_OFFSET(BIND_IDX_MFC_SLICE_HEADER));
+ }
+ static void
+ gen6_mfc_batchbuffer_surfaces_output(VADriverContextP ctx,
+                                      struct encode_state *encode_state,
+                                      struct intel_encoder_context *encoder_context)
+ {
+     struct i965_driver_data *i965 = i965_driver_data(ctx);
+     struct gen6_mfc_context *mfc_context = encoder_context->mfc_context;
+     VAEncSequenceParameterBufferH264 *pSequenceParameter = (VAEncSequenceParameterBufferH264 *)encode_state->seq_param_ext->buffer;
+     int width_in_mbs = pSequenceParameter->picture_width_in_mbs;
+     int height_in_mbs = pSequenceParameter->picture_height_in_mbs;
+     mfc_context->mfc_batchbuffer_surface.num_blocks = width_in_mbs * height_in_mbs + encode_state->num_slice_params_ext * 2 + 1;
+     mfc_context->mfc_batchbuffer_surface.size_block = 48; /* 3 OWORDs */
+     mfc_context->mfc_batchbuffer_surface.pitch = 16;
+     mfc_context->mfc_batchbuffer_surface.bo = dri_bo_alloc(i965->intel.bufmgr, 
+                                                            "MFC batchbuffer",
+                                                            mfc_context->mfc_batchbuffer_surface.num_blocks * mfc_context->mfc_batchbuffer_surface.size_block,
+                                                            0x1000);
+     mfc_context->buffer_suface_setup(ctx,
+                                      &mfc_context->gpe_context,
+                                      &mfc_context->mfc_batchbuffer_surface,
+                                      BINDING_TABLE_OFFSET(BIND_IDX_MFC_BATCHBUFFER),
+                                      SURFACE_STATE_OFFSET(BIND_IDX_MFC_BATCHBUFFER));
+ }
+ static void
+ gen6_mfc_batchbuffer_surfaces_setup(VADriverContextP ctx, 
+                                     struct encode_state *encode_state,
+                                     struct intel_encoder_context *encoder_context)
+ {
+     gen6_mfc_batchbuffer_surfaces_input(ctx, encode_state, encoder_context);
+     gen6_mfc_batchbuffer_surfaces_output(ctx, encode_state, encoder_context);
+ }
+ static void
+ gen6_mfc_batchbuffer_idrt_setup(VADriverContextP ctx, 
+                                 struct encode_state *encode_state,
+                                 struct intel_encoder_context *encoder_context)
+ {
+     struct gen6_mfc_context *mfc_context = encoder_context->mfc_context;
+     struct gen6_interface_descriptor_data *desc;   
+     int i;
+     dri_bo *bo;
+     bo = mfc_context->gpe_context.idrt.bo;
+     dri_bo_map(bo, 1);
+     assert(bo->virtual);
+     desc = bo->virtual;
+     for (i = 0; i < mfc_context->gpe_context.num_kernels; i++) {
+         struct i965_kernel *kernel;
+         kernel = &mfc_context->gpe_context.kernels[i];
+         assert(sizeof(*desc) == 32);
+         /*Setup the descritor table*/
+         memset(desc, 0, sizeof(*desc));
+         desc->desc0.kernel_start_pointer = (kernel->bo->offset >> 6);
+         desc->desc2.sampler_count = 0;
+         desc->desc2.sampler_state_pointer = 0;
+         desc->desc3.binding_table_entry_count = 2;
+         desc->desc3.binding_table_pointer = (BINDING_TABLE_OFFSET(0) >> 5);
+         desc->desc4.constant_urb_entry_read_offset = 0;
+         desc->desc4.constant_urb_entry_read_length = 4;
+               
+         /*kernel start*/
+         dri_bo_emit_reloc(bo, 
+                           I915_GEM_DOMAIN_INSTRUCTION, 0,
+                           0,
+                           i * sizeof(*desc) + offsetof(struct gen6_interface_descriptor_data, desc0),
+                           kernel->bo);
+         desc++;
+     }
+     dri_bo_unmap(bo);
+ }
+ static void
+ gen6_mfc_batchbuffer_constant_setup(VADriverContextP ctx, 
+                                     struct encode_state *encode_state,
+                                     struct intel_encoder_context *encoder_context)
+ {
+     struct gen6_mfc_context *mfc_context = encoder_context->mfc_context;
+     
+     (void)mfc_context;
+ }
+ static void
+ gen6_mfc_batchbuffer_emit_object_command(struct intel_batchbuffer *batch,
+                                          int index,
+                                          int head_offset,
+                                          int batchbuffer_offset,
+                                          int head_size,
+                                          int tail_size,
+                                          int number_mb_cmds,
+                                          int first_object,
+                                          int last_object,
+                                          int last_slice,
+                                          int mb_x,
+                                          int mb_y,
+                                          int width_in_mbs,
+                                          int qp)
+ {
+     BEGIN_BATCH(batch, 12);
+     
+     OUT_BATCH(batch, CMD_MEDIA_OBJECT | (12 - 2));
+     OUT_BATCH(batch, index);
+     OUT_BATCH(batch, 0);
+     OUT_BATCH(batch, 0);
+     OUT_BATCH(batch, 0);
+     OUT_BATCH(batch, 0);
+    
+     /*inline data */
+     OUT_BATCH(batch, head_offset);
+     OUT_BATCH(batch, batchbuffer_offset);
+     OUT_BATCH(batch, 
+               head_size << 16 |
+               tail_size);
+     OUT_BATCH(batch,
+               number_mb_cmds << 16 |
+               first_object << 2 |
+               last_object << 1 |
+               last_slice);
+     OUT_BATCH(batch,
+               mb_y << 8 |
+               mb_x);
+     OUT_BATCH(batch,
+               qp << 16 |
+               width_in_mbs);
+     ADVANCE_BATCH(batch);
+ }
+ static void
+ gen6_mfc_avc_batchbuffer_slice_command(VADriverContextP ctx,
+                                        struct intel_encoder_context *encoder_context,
+                                        VAEncSliceParameterBufferH264 *slice_param,
+                                        int head_offset,
+                                        unsigned short head_size,
+                                        unsigned short tail_size,
+                                        int batchbuffer_offset,
+                                        int qp,
+                                        int last_slice)
+ {
+     struct intel_batchbuffer *batch = encoder_context->base.batch;
+     struct gen6_mfc_context *mfc_context = encoder_context->mfc_context;
+     int width_in_mbs = (mfc_context->surface_state.width + 15) / 16;
 -    int total_mbs = slice_param->number_of_mbs;
++    int total_mbs = slice_param->num_macroblocks;
+     int number_mb_cmds = 512;
+     int starting_mb = 0;
+     int last_object = 0;
+     int first_object = 1;
+     int i;
+     int mb_x, mb_y;
+     int index = (slice_param->slice_type == SLICE_TYPE_I) ? MFC_BATCHBUFFER_AVC_INTRA : MFC_BATCHBUFFER_AVC_INTER;
+     for (i = 0; i < total_mbs / number_mb_cmds; i++) {
+         last_object = (total_mbs - starting_mb) == number_mb_cmds;
 -        mb_x = (slice_param->starting_macroblock_address + starting_mb) % width_in_mbs;
 -        mb_y = (slice_param->starting_macroblock_address + starting_mb) / width_in_mbs;
++        mb_x = (slice_param->macroblock_address + starting_mb) % width_in_mbs;
++        mb_y = (slice_param->macroblock_address + starting_mb) / width_in_mbs;
+         assert(mb_x <= 255 && mb_y <= 255);
+         starting_mb += number_mb_cmds;
+         gen6_mfc_batchbuffer_emit_object_command(batch,
+                                                  index,
+                                                  head_offset,
+                                                  batchbuffer_offset,
+                                                  head_size,
+                                                  tail_size,
+                                                  number_mb_cmds,
+                                                  first_object,
+                                                  last_object,
+                                                  last_slice,
+                                                  mb_x,
+                                                  mb_y,
+                                                  width_in_mbs,
+                                                  qp);
+         if (first_object) {
+             head_offset += head_size;
+             batchbuffer_offset += head_size;
+         }
+         if (last_object) {
+             head_offset += tail_size;
+             batchbuffer_offset += tail_size;
+         }
+         batchbuffer_offset += number_mb_cmds * 3;
+         first_object = 0;
+     }
+     if (!last_object) {
+         last_object = 1;
+         number_mb_cmds = total_mbs % number_mb_cmds;
 -        mb_x = (slice_param->starting_macroblock_address + starting_mb) % width_in_mbs;
 -        mb_y = (slice_param->starting_macroblock_address + starting_mb) / width_in_mbs;
++        mb_x = (slice_param->macroblock_address + starting_mb) % width_in_mbs;
++        mb_y = (slice_param->macroblock_address + starting_mb) / width_in_mbs;
+         assert(mb_x <= 255 && mb_y <= 255);
+         starting_mb += number_mb_cmds;
+         gen6_mfc_batchbuffer_emit_object_command(batch,
+                                                  index,
+                                                  head_offset,
+                                                  batchbuffer_offset,
+                                                  head_size,
+                                                  tail_size,
+                                                  number_mb_cmds,
+                                                  first_object,
+                                                  last_object,
+                                                  last_slice,
+                                                  mb_x,
+                                                  mb_y,
+                                                  width_in_mbs,
+                                                  qp);
+     }
+ }
+                           
+ /*
+  * return size in Owords (16bytes)
+  */         
+ static int
+ gen6_mfc_avc_batchbuffer_slice(VADriverContextP ctx,
+                                struct encode_state *encode_state,
+                                struct intel_encoder_context *encoder_context,
+                                int slice_index,
+                                int batchbuffer_offset)
+ {
+     struct gen6_mfc_context *mfc_context = encoder_context->mfc_context;
+     struct intel_batchbuffer *slice_batch = mfc_context->aux_batchbuffer;
+     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[slice_index]->buffer; 
 -    VAEncH264DecRefPicMarkingBuffer *pDecRefPicMarking = NULL;
+     int is_intra = pSliceParameter->slice_type == SLICE_TYPE_I;
+     int width_in_mbs = (mfc_context->surface_state.width + 15) / 16;
+     int height_in_mbs = (mfc_context->surface_state.height + 15) / 16;
 -    int last_slice = (pSliceParameter->starting_macroblock_address + pSliceParameter->number_of_mbs) == (width_in_mbs * height_in_mbs);
++    int last_slice = (pSliceParameter->macroblock_address + pSliceParameter->num_macroblocks) == (width_in_mbs * height_in_mbs);
+     int qp = pPicParameter->pic_init_qp + pSliceParameter->slice_qp_delta;
 -    int rate_control_mode = pSequenceParameter->rate_control_method;   
++    unsigned int rate_control_mode = encoder_context->rate_control_mode;
+     unsigned char *slice_header = NULL;
+     int slice_header_length_in_bits = 0;
+     unsigned int tail_data[] = { 0x0, 0x0 };
+     long head_offset;
+     int old_used = intel_batchbuffer_used_size(slice_batch), used;
+     unsigned short head_size, tail_size;
+     head_offset = old_used / 16;
+     gen6_mfc_avc_slice_state(ctx,
+                              pSliceParameter,
+                              encode_state,
+                              encoder_context,
 -                             (rate_control_mode == 0),
++                             (rate_control_mode == VA_RC_CBR),
+                              qp,
+                              slice_batch);
+     if (slice_index == 0)
+         gen6_mfc_avc_pipeline_header_programing(ctx, encode_state, encoder_context, slice_batch);
 -    if (encode_state->dec_ref_pic_marking)
 -        pDecRefPicMarking = (VAEncH264DecRefPicMarkingBuffer *)encode_state->dec_ref_pic_marking->buffer;
 -
 -    slice_header_length_in_bits = build_avc_slice_header(pSequenceParameter, pPicParameter, pSliceParameter, pDecRefPicMarking, &slice_header);
++    slice_header_length_in_bits = build_avc_slice_header(pSequenceParameter, pPicParameter, pSliceParameter, &slice_header);
+     // slice hander
+     mfc_context->insert_object(ctx,
+                                encoder_context,
+                                (unsigned int *)slice_header,
+                                ALIGN(slice_header_length_in_bits, 32) >> 5,
+                                slice_header_length_in_bits & 0x1f,
+                                5,  /* first 5 bytes are start code + nal unit type */
+                                1,
+                                0,
+                                1,
+                                slice_batch);
+     free(slice_header);
+     intel_batchbuffer_align(slice_batch, 16); /* aligned by an Oword */
+     used = intel_batchbuffer_used_size(slice_batch);
+     head_size = (used - old_used) / 16;
+     old_used = used;
 -    if (rate_control_mode == 0) {
++    if (rate_control_mode == VA_RC_CBR) {
+         qp = mfc_context->bit_rate_control_context[1 - is_intra].QpPrimeY;
+     }
+     /* tail */
+     if (last_slice) {    
+         mfc_context->insert_object(ctx,
+                                    encoder_context,
+                                    tail_data,
+                                    2,
+                                    8,
+                                    2,
+                                    1,
+                                    1,
+                                    0,
+                                    slice_batch);
+     } else {
+         mfc_context->insert_object(ctx,
+                                    encoder_context,
+                                    tail_data,
+                                    1,
+                                    8,
+                                    1,
+                                    1,
+                                    1,
+                                    0,
+                                    slice_batch);
+     }
+     intel_batchbuffer_align(slice_batch, 16); /* aligned by an Oword */
+     used = intel_batchbuffer_used_size(slice_batch);
+     tail_size = (used - old_used) / 16;
+    
+     gen6_mfc_avc_batchbuffer_slice_command(ctx,
+                                            encoder_context,
+                                            pSliceParameter,
+                                            head_offset,
+                                            head_size,
+                                            tail_size,
+                                            batchbuffer_offset,
+                                            qp,
+                                            last_slice);
 -    return head_size + tail_size + pSliceParameter->number_of_mbs * 3;
++    return head_size + tail_size + pSliceParameter->num_macroblocks * 3;
+ }
+ static void
+ gen6_mfc_avc_batchbuffer_pipeline(VADriverContextP ctx,
+                                   struct encode_state *encode_state,
+                                   struct intel_encoder_context *encoder_context)
+ {
+     struct gen6_mfc_context *mfc_context = encoder_context->mfc_context;
+     struct intel_batchbuffer *batch = encoder_context->base.batch;
+     int i, size, offset = 0;
+     intel_batchbuffer_start_atomic(batch, 0x4000); 
+     gen6_gpe_pipeline_setup(ctx, &mfc_context->gpe_context, batch);
+     for ( i = 0; i < encode_state->num_slice_params_ext; i++) {
+         size = gen6_mfc_avc_batchbuffer_slice(ctx, encode_state, encoder_context, i, offset);
+         offset += size;
+     }
+     intel_batchbuffer_end_atomic(batch);
+     intel_batchbuffer_flush(batch);
+ }
+ static void
+ gen6_mfc_build_avc_batchbuffer(VADriverContextP ctx, 
+                                struct encode_state *encode_state,
+                                struct intel_encoder_context *encoder_context)
+ {
+     gen6_mfc_batchbuffer_surfaces_setup(ctx, encode_state, encoder_context);
+     gen6_mfc_batchbuffer_idrt_setup(ctx, encode_state, encoder_context);
+     gen6_mfc_batchbuffer_constant_setup(ctx, encode_state, encoder_context);
+     gen6_mfc_avc_batchbuffer_pipeline(ctx, encode_state, encoder_context);
+ }
+ static dri_bo *
+ gen6_mfc_avc_hardware_batchbuffer(VADriverContextP ctx,
+                                   struct encode_state *encode_state,
+                                   struct intel_encoder_context *encoder_context)
+ {
+     struct gen6_mfc_context *mfc_context = encoder_context->mfc_context;
+     gen6_mfc_build_avc_batchbuffer(ctx, encode_state, encoder_context);
+     dri_bo_reference(mfc_context->mfc_batchbuffer_surface.bo);
+     return mfc_context->mfc_batchbuffer_surface.bo;
+ }
+ #endif
+ static void
+ gen6_mfc_avc_pipeline_programing(VADriverContextP ctx,
+                                  struct encode_state *encode_state,
+                                  struct intel_encoder_context *encoder_context)
+ {
+     struct intel_batchbuffer *batch = encoder_context->base.batch;
+ #if __SOFTWARE__
+     dri_bo *slice_batch_bo = gen6_mfc_avc_software_batchbuffer(ctx, encode_state, encoder_context);
+ #else
+     dri_bo *slice_batch_bo = gen6_mfc_avc_hardware_batchbuffer(ctx, encode_state, encoder_context);
+ #endif
+     // begin programing
+     intel_batchbuffer_start_atomic_bcs(batch, 0x4000); 
+     intel_batchbuffer_emit_mi_flush(batch);
+     
+     // picture level programing
+     gen6_mfc_avc_pipeline_picture_programing(ctx, encode_state, encoder_context);
+     BEGIN_BCS_BATCH(batch, 2);
+     OUT_BCS_BATCH(batch, MI_BATCH_BUFFER_START | (1 << 8));
+     OUT_BCS_RELOC(batch,
+                   slice_batch_bo,
+                   I915_GEM_DOMAIN_COMMAND, 0, 
+                   0);
+     ADVANCE_BCS_BATCH(batch);
+     // end programing
+     intel_batchbuffer_end_atomic(batch);
+     dri_bo_unreference(slice_batch_bo);
+ }
+ static VAStatus
+ gen6_mfc_avc_encode_picture(VADriverContextP ctx, 
+                             struct encode_state *encode_state,
+                             struct intel_encoder_context *encoder_context)
+ {
 -    VAEncSequenceParameterBufferH264 *pSequenceParameter = (VAEncSequenceParameterBufferH264 *)encode_state->seq_param_ext->buffer;
+     struct gen6_mfc_context *mfc_context = encoder_context->mfc_context;
 -    int rate_control_mode = pSequenceParameter->rate_control_method;  
++    unsigned int rate_control_mode = encoder_context->rate_control_mode;
+     int MAX_CBR_INTERATE = 4;
+     int current_frame_bits_size;
+     int i;
+  
+     for(i = 0; i < MAX_CBR_INTERATE; i++) {
+         gen6_mfc_init(ctx, encoder_context);
+         gen6_mfc_avc_prepare(ctx, encode_state, encoder_context);
+         /*Programing bcs pipeline*/
+         gen6_mfc_avc_pipeline_programing(ctx, encode_state, encoder_context); //filling the pipeline
+         gen6_mfc_run(ctx, encode_state, encoder_context);
+         gen6_mfc_stop(ctx, encode_state, encoder_context, &current_frame_bits_size);
 -        if ( rate_control_mode == 0) {
++        if ( rate_control_mode == VA_RC_CBR) {
+             //gen6_mfc_hrd_context_check(encode_state, mfc_context);
+             if ( gen6_mfc_bit_rate_control_context_update( encode_state, mfc_context, current_frame_bits_size) ) {
+                 gen6_mfc_hrd_context_update(encode_state, mfc_context);
+                 break;
+             }
          } else {
              break;
          }