Skip to content

L
libva
Commit daf6ed6f authored by Xiang, Haihao's avatar Xiang, Haihao
Browse files
Options

i965_drv_video: [H.264] fix the start of a slice for a MBAFF picture

parent 40ff5b2a
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 6 deletions
i965_drv_video/i965_avc_bsd.c
View file @ daf6ed6f
...@@ -629,11 +629,9 @@ g4x_avc_bsd_object(VADriverContextP ctx, ...@@ -629,11 +629,9 @@ g4x_avc_bsd_object(VADriverContextP ctx,
else if (slice_type == SLICE_TYPE_B) else if (slice_type == SLICE_TYPE_B)
weighted_pred_idc = pic_param->pic_fields.bits.weighted_bipred_idc; weighted_pred_idc = pic_param->pic_fields.bits.weighted_bipred_idc;
first_mb_in_slice = slice_param->first_mb_in_slice; first_mb_in_slice = slice_param->first_mb_in_slice << mbaff_picture;
slice_hor_pos = first_mb_in_slice % width_in_mbs; slice_hor_pos = first_mb_in_slice % width_in_mbs;
slice_ver_pos = first_mb_in_slice / width_in_mbs; slice_ver_pos = first_mb_in_slice / width_in_mbs;
first_mb_in_slice = (slice_ver_pos << mbaff_picture) * width_in_mbs + slice_hor_pos;
slice_hor_pos <<= mbaff_picture;
BEGIN_BCS_BATCH(ctx, cmd_len); BEGIN_BCS_BATCH(ctx, cmd_len);
OUT_BCS_BATCH(ctx, CMD_AVC_BSD_OBJECT | (cmd_len - 2)); OUT_BCS_BATCH(ctx, CMD_AVC_BSD_OBJECT | (cmd_len - 2));
...@@ -755,11 +753,9 @@ ironlake_avc_bsd_object(VADriverContextP ctx, ...@@ -755,11 +753,9 @@ ironlake_avc_bsd_object(VADriverContextP ctx,
else if (slice_type == SLICE_TYPE_B) else if (slice_type == SLICE_TYPE_B)
weighted_pred_idc = pic_param->pic_fields.bits.weighted_bipred_idc; weighted_pred_idc = pic_param->pic_fields.bits.weighted_bipred_idc;
first_mb_in_slice = slice_param->first_mb_in_slice; first_mb_in_slice = slice_param->first_mb_in_slice << mbaff_picture;
slice_hor_pos = first_mb_in_slice % width_in_mbs; slice_hor_pos = first_mb_in_slice % width_in_mbs;
slice_ver_pos = first_mb_in_slice / width_in_mbs; slice_ver_pos = first_mb_in_slice / width_in_mbs;
first_mb_in_slice = (slice_ver_pos << mbaff_picture) * width_in_mbs + slice_hor_pos;
slice_hor_pos <<= mbaff_picture;
BEGIN_BCS_BATCH(ctx, 16); BEGIN_BCS_BATCH(ctx, 16);
OUT_BCS_BATCH(ctx, CMD_AVC_BSD_OBJECT | (16 - 2)); OUT_BCS_BATCH(ctx, CMD_AVC_BSD_OBJECT | (16 - 2));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment