Optimal parameters for Intra prediction mode

diff --git a/src/gen6_vme.c b/src/gen6_vme.c
index 5a0ef63..832e59c 100644 (file)
--- a/src/gen6_vme.c
+++ b/src/gen6_vme.c
@@ -327,6 +327,79 @@ static VAStatus gen6_vme_constant_setup(VADriverContextP ctx,
     return VA_STATUS_SUCCESS;
 }
 
+static const unsigned int intra_mb_mode_cost_table[] = {
+    0x31110001, // for qp0
+    0x09110001, // for qp1
+    0x15030001, // for qp2
+    0x0b030001, // for qp3
+    0x0d030011, // for qp4
+    0x17210011, // for qp5
+    0x41210011, // for qp6
+    0x19210011, // for qp7
+    0x25050003, // for qp8
+    0x1b130003, // for qp9
+    0x1d130003, // for qp10
+    0x27070021, // for qp11
+    0x51310021, // for qp12
+    0x29090021, // for qp13
+    0x35150005, // for qp14
+    0x2b0b0013, // for qp15
+    0x2d0d0013, // for qp16
+    0x37170007, // for qp17
+    0x61410031, // for qp18
+    0x39190009, // for qp19
+    0x45250015, // for qp20
+    0x3b1b000b, // for qp21
+    0x3d1d000d, // for qp22
+    0x47270017, // for qp23
+    0x71510041, // for qp24 ! center for qp=0..30
+    0x49290019, // for qp25
+    0x55350025, // for qp26
+    0x4b2b001b, // for qp27
+    0x4d2d001d, // for qp28
+    0x57370027, // for qp29
+    0x81610051, // for qp30
+    0x57270017, // for qp31
+    0x81510041, // for qp32 ! center for qp=31..51
+    0x59290019, // for qp33
+    0x65350025, // for qp34
+    0x5b2b001b, // for qp35
+    0x5d2d001d, // for qp36
+    0x67370027, // for qp37
+    0x91610051, // for qp38
+    0x69390029, // for qp39
+    0x75450035, // for qp40
+    0x6b3b002b, // for qp41
+    0x6d3d002d, // for qp42
+    0x77470037, // for qp43
+    0xa1710061, // for qp44
+    0x79490039, // for qp45
+    0x85550045, // for qp46
+    0x7b4b003b, // for qp47
+    0x7d4d003d, // for qp48
+    0x87570047, // for qp49
+    0xb1810071, // for qp50
+    0x89590049  // for qp51
+};
+
+static void gen6_vme_state_setup_fixup(VADriverContextP ctx,
+                                       struct encode_state *encode_state,
+                                       struct intel_encoder_context *encoder_context,
+                                       unsigned int *vme_state_message)
+{
+    VAEncPictureParameterBufferH264 *pic_param = (VAEncPictureParameterBufferH264 *)encode_state->pic_param_ext->buffer;
+    VAEncSliceParameterBufferH264 *slice_param = (VAEncSliceParameterBufferH264 *)encode_state->slice_params_ext[0]->buffer;
+
+    if (encoder_context->rate_control_mode != VA_RC_CQP)
+        return;
+
+    if (slice_param->slice_type != SLICE_TYPE_I &&
+        slice_param->slice_type != SLICE_TYPE_SI)
+        return;
+
+    vme_state_message[16] = intra_mb_mode_cost_table[pic_param->pic_init_qp + slice_param->slice_qp_delta];
+}
+
 static VAStatus gen6_vme_vme_state_setup(VADriverContextP ctx,
                                          struct encode_state *encode_state,
                                          int is_intra,
@@ -340,34 +413,36 @@ static VAStatus gen6_vme_vme_state_setup(VADriverContextP ctx,
     dri_bo_map(vme_context->vme_state.bo, 1);
     assert(vme_context->vme_state.bo->virtual);
     vme_state_message = (unsigned int *)vme_context->vme_state.bo->virtual;
-       
-       vme_state_message[0] = 0x01010101;
-       vme_state_message[1] = 0x10010101;
-       vme_state_message[2] = 0x0F0F0F0F;
-       vme_state_message[3] = 0x100F0F0F;
-       vme_state_message[4] = 0x01010101;
-       vme_state_message[5] = 0x00010101;
-       vme_state_message[6] = 0x01010101;
-       vme_state_message[7] = 0x10010101;
-       vme_state_message[8] = 0x0F0F0F0F;
-       vme_state_message[9] = 0x100F0F0F;
-       vme_state_message[10] = 0x01010101;
-       vme_state_message[11] = 0x00010101;
-        vme_state_message[12] = 0x00;
-        vme_state_message[13] = 0x00;
-
-        vme_state_message[14] = 0x4a4a;
-        vme_state_message[15] = 0x0;
-        vme_state_message[16] = 0x4a4a4a4a;
-        vme_state_message[17] = 0x4a4a4a4a;
-        vme_state_message[18] = 0x22120200;
-        vme_state_message[19] = 0x62524232;
-
-        for(i = 20; i < 32; i++) {
-            vme_state_message[i] = 0;
-        }
+
+    vme_state_message[0] = 0x01010101;
+    vme_state_message[1] = 0x10010101;
+    vme_state_message[2] = 0x0F0F0F0F;
+    vme_state_message[3] = 0x100F0F0F;
+    vme_state_message[4] = 0x01010101;
+    vme_state_message[5] = 0x00010101;
+    vme_state_message[6] = 0x01010101;
+    vme_state_message[7] = 0x10010101;
+    vme_state_message[8] = 0x0F0F0F0F;
+    vme_state_message[9] = 0x100F0F0F;
+    vme_state_message[10] = 0x01010101;
+    vme_state_message[11] = 0x00010101;
+    vme_state_message[12] = 0x00;
+    vme_state_message[13] = 0x00;
+
+    vme_state_message[14] = 0x4a4a;
+    vme_state_message[15] = 0x0;
+    vme_state_message[16] = 0x4a4a4a4a;
+    vme_state_message[17] = 0x4a4a4a4a;
+    vme_state_message[18] = 0x22120200;
+    vme_state_message[19] = 0x62524232;
+
+    for(i = 20; i < 32; i++) {
+        vme_state_message[i] = 0;
+    }
     //vme_state_message[16] = 0x42424242;                      //cost function LUT set 0 for Intra
 
+    gen6_vme_state_setup_fixup(ctx, encode_state, encoder_context, vme_state_message);
+
     dri_bo_unmap( vme_context->vme_state.bo);
     return VA_STATUS_SUCCESS;
 }