diff options
| author | Gwenole Beauchesne <gwenole.beauchesne@intel.com> | 2012-06-27 11:14:29 +0200 |
|---|---|---|
| committer | Gwenole Beauchesne <gwenole.beauchesne@intel.com> | 2012-06-27 11:57:59 +0200 |
| commit | 603cdee0b8e850ed9e716c28e5815bef6e6c56db (patch) | |
| tree | e09f0a9d3023a5f45822f60b7733451a6385a17a | |
| parent | 25673c458932caa09ae3f47c6dbe7e040dbae032 (diff) | |
| download | libva-intel-driver-603cdee0b8e850ed9e716c28e5815bef6e6c56db.tar.gz | |
h264: fix 4K decoding (IVB).
Fix decoding of 4K videos on Ivy Bridge. Note that either dimension
shall not exceed 4096 pixels.
Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
| -rw-r--r-- | src/gen7_mfd.c | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/src/gen7_mfd.c b/src/gen7_mfd.c index b4584c43..d631e279 100644 --- a/src/gen7_mfd.c +++ b/src/gen7_mfd.c @@ -195,8 +195,8 @@ gen7_mfd_init_avc_surface(VADriverContextP ctx, int width_in_mbs, height_in_mbs; obj_surface->free_private_data = gen7_mfd_free_avc_surface; - width_in_mbs = ((pic_param->picture_width_in_mbs_minus1 + 1) & 0xff); - height_in_mbs = ((pic_param->picture_height_in_mbs_minus1 + 1) & 0xff); /* frame height */ + width_in_mbs = pic_param->picture_width_in_mbs_minus1 + 1; + height_in_mbs = pic_param->picture_height_in_mbs_minus1 + 1; /* frame height */ if (!gen7_avc_surface) { gen7_avc_surface = calloc(sizeof(struct gen7_avc_surface), 1); @@ -212,6 +212,7 @@ gen7_mfd_init_avc_surface(VADriverContextP ctx, "direct mv w/r buffer", width_in_mbs * height_in_mbs * 64, 0x1000); + assert(gen7_avc_surface->dmv_top); } if (gen7_avc_surface->dmv_bottom_flag && @@ -220,6 +221,7 @@ gen7_mfd_init_avc_surface(VADriverContextP ctx, "direct mv w/r buffer", width_in_mbs * height_in_mbs * 64, 0x1000); + assert(gen7_avc_surface->dmv_bottom); } } @@ -497,8 +499,8 @@ gen7_mfd_avc_img_state(VADriverContextP ctx, mbaff_frame_flag = (pic_param->seq_fields.bits.mb_adaptive_frame_field_flag && !pic_param->pic_fields.bits.field_pic_flag); - width_in_mbs = ((pic_param->picture_width_in_mbs_minus1 + 1) & 0xff); - height_in_mbs = ((pic_param->picture_height_in_mbs_minus1 + 1) & 0xff); /* frame height */ + width_in_mbs = pic_param->picture_width_in_mbs_minus1 + 1; + height_in_mbs = pic_param->picture_height_in_mbs_minus1 + 1; /* frame height */ /* MFX unit doesn't support 4:2:2 and 4:4:4 picture */ assert(pic_param->seq_fields.bits.chroma_format_idc == 0 || /* monochrome picture */ @@ -880,7 +882,7 @@ gen7_mfd_avc_decode_init(VADriverContextP ctx, struct object_surface *obj_surface; dri_bo *bo; int i, j, enable_avc_ildb = 0; - int width_in_mbs; + unsigned int width_in_mbs, height_in_mbs; for (j = 0; j < decode_state->num_slice_params && enable_avc_ildb == 0; j++) { assert(decode_state->slice_params && decode_state->slice_params[j]->buffer); @@ -906,7 +908,10 @@ gen7_mfd_avc_decode_init(VADriverContextP ctx, assert(decode_state->pic_param && decode_state->pic_param->buffer); pic_param = (VAPictureParameterBufferH264 *)decode_state->pic_param->buffer; gen7_mfd_avc_frame_store_index(ctx, pic_param, gen7_mfd_context); - width_in_mbs = ((pic_param->picture_width_in_mbs_minus1 + 1) & 0xff); + width_in_mbs = pic_param->picture_width_in_mbs_minus1 + 1; + height_in_mbs = pic_param->picture_height_in_mbs_minus1 + 1; + assert(width_in_mbs > 0 && width_in_mbs <= 256); /* 4K */ + assert(height_in_mbs > 0 && height_in_mbs <= 256); /* Current decoded picture */ va_pic = &pic_param->CurrPic; |