Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

implement intensity compensation for VC-1 decoding for Ivybridge and better #234

Merged
merged 3 commits into from
Jul 28, 2017
Merged

implement intensity compensation for VC-1 decoding for Ivybridge and better #234

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c9989b6
implement intensity compensation for VC-1 decoding
carpalis Jul 24, 2017
794ae15
add VC-1 intensity compensation for SNB
carpalis Jul 26, 2017
4b2fe0b
Merge branch 'master' into master
xhaihao Jul 28, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 38 additions & 6 deletions src/gen6_mfd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1193,6 +1193,9 @@ gen6_mfd_init_vc1_surface(VADriverContextP ctx,
}

gen6_vc1_surface->picture_type = pic_param->picture_fields.bits.picture_type;
gen6_vc1_surface->intensity_compensation = 0;
gen6_vc1_surface->luma_scale = 0;
gen6_vc1_surface->luma_shift = 0;

if (gen6_vc1_surface->dmv == NULL) {
gen6_vc1_surface->dmv = dri_bo_alloc(i965->intel.bufmgr,
Expand All @@ -1213,17 +1216,33 @@ gen6_mfd_vc1_decode_init(VADriverContextP ctx,
dri_bo *bo;
int width_in_mbs;
int picture_type;
int intensity_compensation;

assert(decode_state->pic_param && decode_state->pic_param->buffer);
pic_param = (VAPictureParameterBufferVC1 *)decode_state->pic_param->buffer;
width_in_mbs = ALIGN(pic_param->coded_width, 16) / 16;
picture_type = pic_param->picture_fields.bits.picture_type;
intensity_compensation = (pic_param->mv_fields.bits.mv_mode == VAMvModeIntensityCompensation);

intel_update_vc1_frame_store_index(ctx,
decode_state,
pic_param,
gen6_mfd_context->reference_surface);

/* Forward reference picture */
obj_surface = decode_state->reference_objects[0];
if (pic_param->forward_reference_picture != VA_INVALID_ID &&
obj_surface &&
obj_surface->private_data) {
if (picture_type == 1 && intensity_compensation) { /* P picture */
struct gen6_vc1_surface *gen6_vc1_surface = obj_surface->private_data;

gen6_vc1_surface->intensity_compensation = intensity_compensation;
gen6_vc1_surface->luma_scale = pic_param->luma_scale;
gen6_vc1_surface->luma_shift = pic_param->luma_shift;
}
}

/* Current decoded picture */
obj_surface = decode_state->render_object;
i965_check_alloc_surface_bo(ctx, obj_surface, 1, VA_FOURCC_NV12, SUBSAMPLE_YUV420);
Expand Down Expand Up @@ -1573,11 +1592,15 @@ gen6_mfd_vc1_pred_pipe_state(VADriverContextP ctx,
{
struct intel_batchbuffer *batch = gen6_mfd_context->base.batch;
VAPictureParameterBufferVC1 *pic_param;
int picture_type;
int interpolation_mode = 0;
int intensitycomp_single;
int intensitycomp_single_fwd = 0;
int luma_scale1 = 0;
int luma_shift1 = 0;

assert(decode_state->pic_param && decode_state->pic_param->buffer);
pic_param = (VAPictureParameterBufferVC1 *)decode_state->pic_param->buffer;
picture_type = pic_param->picture_fields.bits.picture_type;

if (pic_param->mv_fields.bits.mv_mode == VAMvMode1MvHalfPelBilinear ||
(pic_param->mv_fields.bits.mv_mode == VAMvModeIntensityCompensation &&
Expand All @@ -1592,7 +1615,16 @@ gen6_mfd_vc1_pred_pipe_state(VADriverContextP ctx,

assert(decode_state->pic_param && decode_state->pic_param->buffer);
pic_param = (VAPictureParameterBufferVC1 *)decode_state->pic_param->buffer;
intensitycomp_single = (pic_param->mv_fields.bits.mv_mode == VAMvModeIntensityCompensation);

if (gen6_mfd_context->reference_surface[0].surface_id != VA_INVALID_ID) {
if (picture_type == 1 || picture_type == 2) { /* P/B picture */
struct gen6_vc1_surface *gen6_vc1_surface = gen6_mfd_context->reference_surface[0].obj_surface->private_data;

intensitycomp_single_fwd = gen6_vc1_surface->intensity_compensation;
luma_scale1 = gen6_vc1_surface->luma_scale;
luma_shift1 = gen6_vc1_surface->luma_shift;
}
}

BEGIN_BCS_BATCH(batch, 7);
OUT_BCS_BATCH(batch, MFX_VC1_PRED_PIPE_STATE | (7 - 2));
Expand All @@ -1601,8 +1633,8 @@ gen6_mfd_vc1_pred_pipe_state(VADriverContextP ctx,
pic_param->rounding_control << 4 |
va_to_gen6_vc1_profile[pic_param->sequence_fields.bits.profile] << 2);
OUT_BCS_BATCH(batch,
pic_param->luma_shift << 16 |
pic_param->luma_scale << 0); /* FIXME: Luma Scaling */
luma_shift1 << 16 |
luma_scale1 << 0);
OUT_BCS_BATCH(batch, 0);
OUT_BCS_BATCH(batch, 0);
OUT_BCS_BATCH(batch, 0);
Expand All @@ -1613,8 +1645,8 @@ gen6_mfd_vc1_pred_pipe_state(VADriverContextP ctx,
pic_param->range_reduction_frame << 16 |
0 << 6 | /* FIXME: double ??? */
0 << 4 |
intensitycomp_single << 2 |
intensitycomp_single << 0);
intensitycomp_single_fwd << 2 |
0 << 0);
ADVANCE_BCS_BATCH(batch);
}

Expand Down
3 changes: 3 additions & 0 deletions src/gen6_mfd.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,9 @@
struct gen6_vc1_surface {
dri_bo *dmv;
int picture_type;
int intensity_compensation;
int luma_scale;
int luma_shift;
};

struct hw_context;
Expand Down
44 changes: 38 additions & 6 deletions src/gen75_mfd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1518,6 +1518,9 @@ gen75_mfd_init_vc1_surface(VADriverContextP ctx,
}

gen7_vc1_surface->picture_type = pic_param->picture_fields.bits.picture_type;
gen7_vc1_surface->intensity_compensation = 0;
gen7_vc1_surface->luma_scale = 0;
gen7_vc1_surface->luma_shift = 0;

if (gen7_vc1_surface->dmv == NULL) {
gen7_vc1_surface->dmv = dri_bo_alloc(i965->intel.bufmgr,
Expand All @@ -1538,17 +1541,33 @@ gen75_mfd_vc1_decode_init(VADriverContextP ctx,
dri_bo *bo;
int width_in_mbs;
int picture_type;
int intensity_compensation;

assert(decode_state->pic_param && decode_state->pic_param->buffer);
pic_param = (VAPictureParameterBufferVC1 *)decode_state->pic_param->buffer;
width_in_mbs = ALIGN(pic_param->coded_width, 16) / 16;
picture_type = pic_param->picture_fields.bits.picture_type;
intensity_compensation = (pic_param->mv_fields.bits.mv_mode == VAMvModeIntensityCompensation);

intel_update_vc1_frame_store_index(ctx,
decode_state,
pic_param,
gen7_mfd_context->reference_surface);

/* Forward reference picture */
obj_surface = decode_state->reference_objects[0];
if (pic_param->forward_reference_picture != VA_INVALID_ID &&
obj_surface &&
obj_surface->private_data) {
if (picture_type == 1 && intensity_compensation) { /* P picture */
struct gen7_vc1_surface *gen7_vc1_surface = obj_surface->private_data;

gen7_vc1_surface->intensity_compensation = intensity_compensation;
gen7_vc1_surface->luma_scale = pic_param->luma_scale;
gen7_vc1_surface->luma_shift = pic_param->luma_shift;
}
}

/* Current decoded picture */
obj_surface = decode_state->render_object;
i965_check_alloc_surface_bo(ctx, obj_surface, 1, VA_FOURCC_NV12, SUBSAMPLE_YUV420);
Expand Down Expand Up @@ -1915,24 +1934,37 @@ gen75_mfd_vc1_pred_pipe_state(VADriverContextP ctx,
{
struct intel_batchbuffer *batch = gen7_mfd_context->base.batch;
VAPictureParameterBufferVC1 *pic_param;
int intensitycomp_single;
int picture_type;
int intensitycomp_single_fwd = 0;
int luma_scale1 = 0;
int luma_shift1 = 0;

assert(decode_state->pic_param && decode_state->pic_param->buffer);
pic_param = (VAPictureParameterBufferVC1 *)decode_state->pic_param->buffer;
intensitycomp_single = (pic_param->mv_fields.bits.mv_mode == VAMvModeIntensityCompensation);
picture_type = pic_param->picture_fields.bits.picture_type;

if (gen7_mfd_context->reference_surface[0].surface_id != VA_INVALID_ID) {
if (picture_type == 1 || picture_type == 2) { /* P/B picture */
struct gen7_vc1_surface *gen7_vc1_surface = gen7_mfd_context->reference_surface[0].obj_surface->private_data;

intensitycomp_single_fwd = gen7_vc1_surface->intensity_compensation;
luma_scale1 = gen7_vc1_surface->luma_scale;
luma_shift1 = gen7_vc1_surface->luma_shift;
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does P frame also use the parameters from the reference frame? the commit message only says all subsequent B-frames need to do intensity compensation.

Copy link
Contributor Author

@carpalis carpalis Jul 26, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The commit message only referenced the changes in intensity compensation. For P-frames intensity compensation was already working.

It is the P-frame that sets the parameters for its reference frame. Subsequently, the P-frame also uses this intensity compensated reference frame. Any B-frames that follow this P-frame and that reference that same reference frame also use the intensity compensation on the reference frame. (See 8.3.8 in VC-1 spec).

The patch stores the intensity compensation status with each surface. When such a surface is used as a reference, the stored intensity compensation status is used to program the graphics hardware.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks for the explanation in detail

}

BEGIN_BCS_BATCH(batch, 6);
OUT_BCS_BATCH(batch, MFX_VC1_PRED_PIPE_STATE | (6 - 2));
OUT_BCS_BATCH(batch,
0 << 14 | /* FIXME: double ??? */
0 << 12 |
intensitycomp_single << 10 |
intensitycomp_single << 8 |
intensitycomp_single_fwd << 10 |
0 << 8 |
0 << 4 | /* FIXME: interlace mode */
0);
OUT_BCS_BATCH(batch,
pic_param->luma_shift << 16 |
pic_param->luma_scale << 0); /* FIXME: Luma Scaling */
luma_shift1 << 16 |
luma_scale1 << 0);
OUT_BCS_BATCH(batch, 0);
OUT_BCS_BATCH(batch, 0);
OUT_BCS_BATCH(batch, 0);
Expand Down
44 changes: 38 additions & 6 deletions src/gen7_mfd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1253,6 +1253,9 @@ gen7_mfd_init_vc1_surface(VADriverContextP ctx,
}

gen7_vc1_surface->picture_type = pic_param->picture_fields.bits.picture_type;
gen7_vc1_surface->intensity_compensation = 0;
gen7_vc1_surface->luma_scale = 0;
gen7_vc1_surface->luma_shift = 0;

if (gen7_vc1_surface->dmv == NULL) {
gen7_vc1_surface->dmv = dri_bo_alloc(i965->intel.bufmgr,
Expand All @@ -1273,17 +1276,33 @@ gen7_mfd_vc1_decode_init(VADriverContextP ctx,
dri_bo *bo;
int width_in_mbs;
int picture_type;
int intensity_compensation;

assert(decode_state->pic_param && decode_state->pic_param->buffer);
pic_param = (VAPictureParameterBufferVC1 *)decode_state->pic_param->buffer;
width_in_mbs = ALIGN(pic_param->coded_width, 16) / 16;
picture_type = pic_param->picture_fields.bits.picture_type;
intensity_compensation = (pic_param->mv_fields.bits.mv_mode == VAMvModeIntensityCompensation);

intel_update_vc1_frame_store_index(ctx,
decode_state,
pic_param,
gen7_mfd_context->reference_surface);

/* Forward reference picture */
obj_surface = decode_state->reference_objects[0];
if (pic_param->forward_reference_picture != VA_INVALID_ID &&
obj_surface &&
obj_surface->private_data) {
if (picture_type == 1 && intensity_compensation) { /* P picture */
struct gen7_vc1_surface *gen7_vc1_surface = obj_surface->private_data;

gen7_vc1_surface->intensity_compensation = intensity_compensation;
gen7_vc1_surface->luma_scale = pic_param->luma_scale;
gen7_vc1_surface->luma_shift = pic_param->luma_shift;
}
}

/* Current decoded picture */
obj_surface = decode_state->render_object;
i965_check_alloc_surface_bo(ctx, obj_surface, 1, VA_FOURCC_NV12, SUBSAMPLE_YUV420);
Expand Down Expand Up @@ -1650,24 +1669,37 @@ gen7_mfd_vc1_pred_pipe_state(VADriverContextP ctx,
{
struct intel_batchbuffer *batch = gen7_mfd_context->base.batch;
VAPictureParameterBufferVC1 *pic_param;
int intensitycomp_single;
int picture_type;
int intensitycomp_single_fwd = 0;
int luma_scale1 = 0;
int luma_shift1 = 0;

assert(decode_state->pic_param && decode_state->pic_param->buffer);
pic_param = (VAPictureParameterBufferVC1 *)decode_state->pic_param->buffer;
intensitycomp_single = (pic_param->mv_fields.bits.mv_mode == VAMvModeIntensityCompensation);
picture_type = pic_param->picture_fields.bits.picture_type;

if (gen7_mfd_context->reference_surface[0].surface_id != VA_INVALID_ID) {
if (picture_type == 1 || picture_type == 2) { /* P/B picture */
struct gen7_vc1_surface *gen7_vc1_surface = gen7_mfd_context->reference_surface[0].obj_surface->private_data;

intensitycomp_single_fwd = gen7_vc1_surface->intensity_compensation;
luma_scale1 = gen7_vc1_surface->luma_scale;
luma_shift1 = gen7_vc1_surface->luma_shift;
}
}

BEGIN_BCS_BATCH(batch, 6);
OUT_BCS_BATCH(batch, MFX_VC1_PRED_PIPE_STATE | (6 - 2));
OUT_BCS_BATCH(batch,
0 << 14 | /* FIXME: double ??? */
0 << 12 |
intensitycomp_single << 10 |
intensitycomp_single << 8 |
intensitycomp_single_fwd << 10 |
0 << 8 |
0 << 4 | /* FIXME: interlace mode */
0);
OUT_BCS_BATCH(batch,
pic_param->luma_shift << 16 |
pic_param->luma_scale << 0); /* FIXME: Luma Scaling */
luma_shift1 << 16 |
luma_scale1 << 0);
OUT_BCS_BATCH(batch, 0);
OUT_BCS_BATCH(batch, 0);
OUT_BCS_BATCH(batch, 0);
Expand Down
3 changes: 3 additions & 0 deletions src/gen7_mfd.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,9 @@
struct gen7_vc1_surface {
dri_bo *dmv;
int picture_type;
int intensity_compensation;
int luma_scale;
int luma_shift;
};

struct hw_context;
Expand Down
44 changes: 38 additions & 6 deletions src/gen8_mfd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1297,6 +1297,9 @@ gen8_mfd_init_vc1_surface(VADriverContextP ctx,
}

gen7_vc1_surface->picture_type = pic_param->picture_fields.bits.picture_type;
gen7_vc1_surface->intensity_compensation = 0;
gen7_vc1_surface->luma_scale = 0;
gen7_vc1_surface->luma_shift = 0;

if (gen7_vc1_surface->dmv == NULL) {
gen7_vc1_surface->dmv = dri_bo_alloc(i965->intel.bufmgr,
Expand All @@ -1317,17 +1320,33 @@ gen8_mfd_vc1_decode_init(VADriverContextP ctx,
dri_bo *bo;
int width_in_mbs;
int picture_type;
int intensity_compensation;

assert(decode_state->pic_param && decode_state->pic_param->buffer);
pic_param = (VAPictureParameterBufferVC1 *)decode_state->pic_param->buffer;
width_in_mbs = ALIGN(pic_param->coded_width, 16) / 16;
picture_type = pic_param->picture_fields.bits.picture_type;
intensity_compensation = (pic_param->mv_fields.bits.mv_mode == VAMvModeIntensityCompensation);

intel_update_vc1_frame_store_index(ctx,
decode_state,
pic_param,
gen7_mfd_context->reference_surface);

/* Forward reference picture */
obj_surface = decode_state->reference_objects[0];
if (pic_param->forward_reference_picture != VA_INVALID_ID &&
obj_surface &&
obj_surface->private_data) {
if (picture_type == 1 && intensity_compensation) { /* P picture */
struct gen7_vc1_surface *gen7_vc1_surface = obj_surface->private_data;

gen7_vc1_surface->intensity_compensation = intensity_compensation;
gen7_vc1_surface->luma_scale = pic_param->luma_scale;
gen7_vc1_surface->luma_shift = pic_param->luma_shift;
}
}

/* Current decoded picture */
obj_surface = decode_state->render_object;
i965_check_alloc_surface_bo(ctx, obj_surface, 1, VA_FOURCC_NV12, SUBSAMPLE_YUV420);
Expand Down Expand Up @@ -1694,24 +1713,37 @@ gen8_mfd_vc1_pred_pipe_state(VADriverContextP ctx,
{
struct intel_batchbuffer *batch = gen7_mfd_context->base.batch;
VAPictureParameterBufferVC1 *pic_param;
int intensitycomp_single;
int picture_type;
int intensitycomp_single_fwd = 0;
int luma_scale1 = 0;
int luma_shift1 = 0;

assert(decode_state->pic_param && decode_state->pic_param->buffer);
pic_param = (VAPictureParameterBufferVC1 *)decode_state->pic_param->buffer;
intensitycomp_single = (pic_param->mv_fields.bits.mv_mode == VAMvModeIntensityCompensation);
picture_type = pic_param->picture_fields.bits.picture_type;

if (gen7_mfd_context->reference_surface[0].surface_id != VA_INVALID_ID) {
if (picture_type == 1 || picture_type == 2) { /* P/B picture */
struct gen7_vc1_surface *gen7_vc1_surface = gen7_mfd_context->reference_surface[0].obj_surface->private_data;

intensitycomp_single_fwd = gen7_vc1_surface->intensity_compensation;
luma_scale1 = gen7_vc1_surface->luma_scale;
luma_shift1 = gen7_vc1_surface->luma_shift;
}
}

BEGIN_BCS_BATCH(batch, 6);
OUT_BCS_BATCH(batch, MFX_VC1_PRED_PIPE_STATE | (6 - 2));
OUT_BCS_BATCH(batch,
0 << 14 | /* FIXME: double ??? */
0 << 12 |
intensitycomp_single << 10 |
intensitycomp_single << 8 |
intensitycomp_single_fwd << 10 |
0 << 8 |
0 << 4 | /* FIXME: interlace mode */
0);
OUT_BCS_BATCH(batch,
pic_param->luma_shift << 16 |
pic_param->luma_scale << 0); /* FIXME: Luma Scaling */
luma_shift1 << 16 |
luma_scale1 << 0);
OUT_BCS_BATCH(batch, 0);
OUT_BCS_BATCH(batch, 0);
OUT_BCS_BATCH(batch, 0);
Expand Down