diff options
author | Zhao Yakui <yakui.zhao@intel.com> | 2013-01-14 10:45:09 +0800 |
---|---|---|
committer | Xiang, Haihao <haihao.xiang@intel.com> | 2013-01-17 13:08:40 +0800 |
commit | 74194dfb52c87bc50289ff0c2714480e3c52fd35 (patch) | |
tree | f451bcd5fff723833a4500716d375e6941be75bc | |
parent | b452f5fbea5fd4b29c337ad8b95688cb204fb154 (diff) | |
download | vaapi-intel-driver-74194dfb52c87bc50289ff0c2714480e3c52fd35.tar.gz vaapi-intel-driver-74194dfb52c87bc50289ff0c2714480e3c52fd35.tar.bz2 vaapi-intel-driver-74194dfb52c87bc50289ff0c2714480e3c52fd35.zip |
Keep the old indent style in file of gen7_vme/gen75_vme
Signed-off-by: Zhao Yakui <yakui.zhao@intel.com>
Asked-by: Xiang Haihao <haihao.xiang@intel.com>
-rw-r--r-- | src/gen75_vme.c | 52 | ||||
-rw-r--r-- | src/gen7_vme.c | 50 |
2 files changed, 51 insertions, 51 deletions
diff --git a/src/gen75_vme.c b/src/gen75_vme.c index b53155d..a263f58 100644 --- a/src/gen75_vme.c +++ b/src/gen75_vme.c @@ -761,17 +761,17 @@ static void gen75_vme_pipeline_programing(VADriverContextP ctx, break; } } - if ((pSliceParameter->slice_type == SLICE_TYPE_I) || - (pSliceParameter->slice_type == SLICE_TYPE_I)) { - kernel_shader = VME_INTRA_SHADER; - } else if ((pSliceParameter->slice_type == SLICE_TYPE_P) || - (pSliceParameter->slice_type == SLICE_TYPE_SP)) { - kernel_shader = VME_INTER_SHADER; - } else { - kernel_shader = VME_BINTER_SHADER; - if (!allow_hwscore) - kernel_shader = VME_INTER_SHADER; - } + if ((pSliceParameter->slice_type == SLICE_TYPE_I) || + (pSliceParameter->slice_type == SLICE_TYPE_I)) { + kernel_shader = VME_INTRA_SHADER; + } else if ((pSliceParameter->slice_type == SLICE_TYPE_P) || + (pSliceParameter->slice_type == SLICE_TYPE_SP)) { + kernel_shader = VME_INTER_SHADER; + } else { + kernel_shader = VME_BINTER_SHADER; + if (!allow_hwscore) + kernel_shader = VME_INTER_SHADER; + } if (allow_hwscore) gen75_vme_walker_fill_vme_batchbuffer(ctx, encode_state, @@ -1170,7 +1170,7 @@ Bool gen75_vme_context_init(VADriverContextP ctx, struct intel_encoder_context * break; } - vme_context->vme_kernel_sum = i965_kernel_num; + vme_context->vme_kernel_sum = i965_kernel_num; vme_context->gpe_context.surface_state_binding_table.length = (SURFACE_STATE_PADDED_SIZE + sizeof(unsigned int)) * MAX_MEDIA_SURFACES_GEN6; vme_context->gpe_context.idrt.max_entries = MAX_INTERFACE_DESC_GEN6; @@ -1184,24 +1184,24 @@ Bool gen75_vme_context_init(VADriverContextP ctx, struct intel_encoder_context * vme_context->gpe_context.vfe_state.urb_entry_size = 59 - 1; vme_context->gpe_context.vfe_state.curbe_allocation_size = CURBE_ALLOCATION_SIZE - 1; - vme_context->gpe_context.vfe_desc5.scoreboard0.enable = 1; - vme_context->gpe_context.vfe_desc5.scoreboard0.type = SCOREBOARD_STALLING; - vme_context->gpe_context.vfe_desc5.scoreboard0.mask = (MB_SCOREBOARD_A | + vme_context->gpe_context.vfe_desc5.scoreboard0.enable = 1; + vme_context->gpe_context.vfe_desc5.scoreboard0.type = SCOREBOARD_STALLING; + vme_context->gpe_context.vfe_desc5.scoreboard0.mask = (MB_SCOREBOARD_A | MB_SCOREBOARD_B | MB_SCOREBOARD_C); - /* In VME prediction the current mb depends on the neighbour - * A/B/C macroblock. So the left/up/up-right dependency should - * be considered. - */ - vme_context->gpe_context.vfe_desc6.scoreboard1.delta_x0 = -1; - vme_context->gpe_context.vfe_desc6.scoreboard1.delta_y0 = 0; - vme_context->gpe_context.vfe_desc6.scoreboard1.delta_x1 = 0; - vme_context->gpe_context.vfe_desc6.scoreboard1.delta_y1 = -1; - vme_context->gpe_context.vfe_desc6.scoreboard1.delta_x2 = 1; - vme_context->gpe_context.vfe_desc6.scoreboard1.delta_y2 = -1; + /* In VME prediction the current mb depends on the neighbour + * A/B/C macroblock. So the left/up/up-right dependency should + * be considered. + */ + vme_context->gpe_context.vfe_desc6.scoreboard1.delta_x0 = -1; + vme_context->gpe_context.vfe_desc6.scoreboard1.delta_y0 = 0; + vme_context->gpe_context.vfe_desc6.scoreboard1.delta_x1 = 0; + vme_context->gpe_context.vfe_desc6.scoreboard1.delta_y1 = -1; + vme_context->gpe_context.vfe_desc6.scoreboard1.delta_x2 = 1; + vme_context->gpe_context.vfe_desc6.scoreboard1.delta_y2 = -1; - vme_context->gpe_context.vfe_desc7.dword = 0; + vme_context->gpe_context.vfe_desc7.dword = 0; i965_gpe_load_kernels(ctx, &vme_context->gpe_context, diff --git a/src/gen7_vme.c b/src/gen7_vme.c index 9880eab..f05dcac 100644 --- a/src/gen7_vme.c +++ b/src/gen7_vme.c @@ -825,17 +825,17 @@ static void gen7_vme_pipeline_programing(VADriverContextP ctx, } } - if ((pSliceParameter->slice_type == SLICE_TYPE_I) || - (pSliceParameter->slice_type == SLICE_TYPE_I)) { - kernel_shader = AVC_VME_INTRA_SHADER; - } else if ((pSliceParameter->slice_type == SLICE_TYPE_P) || - (pSliceParameter->slice_type == SLICE_TYPE_SP)) { - kernel_shader = AVC_VME_INTER_SHADER; - } else { - kernel_shader = AVC_VME_BINTER_SHADER; - if (!allow_hwscore) - kernel_shader = AVC_VME_INTER_SHADER; - } + if ((pSliceParameter->slice_type == SLICE_TYPE_I) || + (pSliceParameter->slice_type == SLICE_TYPE_I)) { + kernel_shader = AVC_VME_INTRA_SHADER; + } else if ((pSliceParameter->slice_type == SLICE_TYPE_P) || + (pSliceParameter->slice_type == SLICE_TYPE_SP)) { + kernel_shader = AVC_VME_INTER_SHADER; + } else { + kernel_shader = AVC_VME_BINTER_SHADER; + if (!allow_hwscore) + kernel_shader = AVC_VME_INTER_SHADER; + } if (allow_hwscore) gen7_vme_walker_fill_vme_batchbuffer(ctx, @@ -1219,24 +1219,24 @@ Bool gen7_vme_context_init(VADriverContextP ctx, struct intel_encoder_context *e vme_context->gpe_context.vfe_state.urb_entry_size = 59 - 1; vme_context->gpe_context.vfe_state.curbe_allocation_size = CURBE_ALLOCATION_SIZE - 1; - vme_context->gpe_context.vfe_desc5.scoreboard0.enable = 1; - vme_context->gpe_context.vfe_desc5.scoreboard0.type = SCOREBOARD_STALLING; - vme_context->gpe_context.vfe_desc5.scoreboard0.mask = (MB_SCOREBOARD_A | + vme_context->gpe_context.vfe_desc5.scoreboard0.enable = 1; + vme_context->gpe_context.vfe_desc5.scoreboard0.type = SCOREBOARD_STALLING; + vme_context->gpe_context.vfe_desc5.scoreboard0.mask = (MB_SCOREBOARD_A | MB_SCOREBOARD_B | MB_SCOREBOARD_C); - /* In VME prediction the current mb depends on the neighbour - * A/B/C macroblock. So the left/up/up-right dependency should - * be considered. - */ - vme_context->gpe_context.vfe_desc6.scoreboard1.delta_x0 = -1; - vme_context->gpe_context.vfe_desc6.scoreboard1.delta_y0 = 0; - vme_context->gpe_context.vfe_desc6.scoreboard1.delta_x1 = 0; - vme_context->gpe_context.vfe_desc6.scoreboard1.delta_y1 = -1; - vme_context->gpe_context.vfe_desc6.scoreboard1.delta_x2 = 1; - vme_context->gpe_context.vfe_desc6.scoreboard1.delta_y2 = -1; + /* In VME prediction the current mb depends on the neighbour + * A/B/C macroblock. So the left/up/up-right dependency should + * be considered. + */ + vme_context->gpe_context.vfe_desc6.scoreboard1.delta_x0 = -1; + vme_context->gpe_context.vfe_desc6.scoreboard1.delta_y0 = 0; + vme_context->gpe_context.vfe_desc6.scoreboard1.delta_x1 = 0; + vme_context->gpe_context.vfe_desc6.scoreboard1.delta_y1 = -1; + vme_context->gpe_context.vfe_desc6.scoreboard1.delta_x2 = 1; + vme_context->gpe_context.vfe_desc6.scoreboard1.delta_y2 = -1; - vme_context->gpe_context.vfe_desc7.dword = 0; + vme_context->gpe_context.vfe_desc7.dword = 0; if(encoder_context->profile == VAProfileH264Baseline || encoder_context->profile == VAProfileH264Main || |