diff options
| -rw-r--r-- | src/gen75_mfd.c | 17 | ||||
| -rw-r--r-- | src/gen7_mfd.c | 17 | ||||
| -rw-r--r-- | src/gen8_mfd.c | 17 |
3 files changed, 33 insertions, 18 deletions
diff --git a/src/gen75_mfd.c b/src/gen75_mfd.c index aa3aa4c4..bd461a85 100644 --- a/src/gen75_mfd.c +++ b/src/gen75_mfd.c @@ -2140,12 +2140,17 @@ gen75_mfd_vc1_pic_state(VADriverContextP ctx, } } - if (pic_param->mv_fields.bits.mv_mode == VAMvMode1MvHalfPelBilinear || - (pic_param->mv_fields.bits.mv_mode == VAMvModeIntensityCompensation && - pic_param->mv_fields.bits.mv_mode2 == VAMvMode1MvHalfPelBilinear)) - interpolation_mode = 8 | pic_param->fast_uvmc_flag; - else - interpolation_mode = 0 | pic_param->fast_uvmc_flag; + if ((!pic_param->sequence_fields.bits.interlace || + pic_param->picture_fields.bits.frame_coding_mode != 1) && /* Progressive or Field-Interlace */ + (picture_type == GEN7_VC1_P_PICTURE || + picture_type == GEN7_VC1_B_PICTURE)) { + if (pic_param->mv_fields.bits.mv_mode == VAMvMode1MvHalfPelBilinear || + (pic_param->mv_fields.bits.mv_mode == VAMvModeIntensityCompensation && + pic_param->mv_fields.bits.mv_mode2 == VAMvMode1MvHalfPelBilinear)) + interpolation_mode = 8 | pic_param->fast_uvmc_flag; + else + interpolation_mode = 0 | pic_param->fast_uvmc_flag; + } BEGIN_BCS_BATCH(batch, 6); OUT_BCS_BATCH(batch, MFD_VC1_LONG_PIC_STATE | (6 - 2)); diff --git a/src/gen7_mfd.c b/src/gen7_mfd.c index 48b0c266..facdee5b 100644 --- a/src/gen7_mfd.c +++ b/src/gen7_mfd.c @@ -1874,12 +1874,17 @@ gen7_mfd_vc1_pic_state(VADriverContextP ctx, } } - if (pic_param->mv_fields.bits.mv_mode == VAMvMode1MvHalfPelBilinear || - (pic_param->mv_fields.bits.mv_mode == VAMvModeIntensityCompensation && - pic_param->mv_fields.bits.mv_mode2 == VAMvMode1MvHalfPelBilinear)) - interpolation_mode = 8 | pic_param->fast_uvmc_flag; - else - interpolation_mode = 0 | pic_param->fast_uvmc_flag; + if ((!pic_param->sequence_fields.bits.interlace || + pic_param->picture_fields.bits.frame_coding_mode != 1) && /* Progressive or Field-Interlace */ + (picture_type == GEN7_VC1_P_PICTURE || + picture_type == GEN7_VC1_B_PICTURE)) { + if (pic_param->mv_fields.bits.mv_mode == VAMvMode1MvHalfPelBilinear || + (pic_param->mv_fields.bits.mv_mode == VAMvModeIntensityCompensation && + pic_param->mv_fields.bits.mv_mode2 == VAMvMode1MvHalfPelBilinear)) + interpolation_mode = 8 | pic_param->fast_uvmc_flag; + else + interpolation_mode = 0 | pic_param->fast_uvmc_flag; + } BEGIN_BCS_BATCH(batch, 6); OUT_BCS_BATCH(batch, MFD_VC1_LONG_PIC_STATE | (6 - 2)); diff --git a/src/gen8_mfd.c b/src/gen8_mfd.c index 2bc97cf6..c9c06987 100644 --- a/src/gen8_mfd.c +++ b/src/gen8_mfd.c @@ -1919,12 +1919,17 @@ gen8_mfd_vc1_pic_state(VADriverContextP ctx, } } - if (pic_param->mv_fields.bits.mv_mode == VAMvMode1MvHalfPelBilinear || - (pic_param->mv_fields.bits.mv_mode == VAMvModeIntensityCompensation && - pic_param->mv_fields.bits.mv_mode2 == VAMvMode1MvHalfPelBilinear)) - interpolation_mode = 8 | pic_param->fast_uvmc_flag; - else - interpolation_mode = 0 | pic_param->fast_uvmc_flag; + if ((!pic_param->sequence_fields.bits.interlace || + pic_param->picture_fields.bits.frame_coding_mode != 1) && /* Progressive or Field-Interlace */ + (picture_type == GEN7_VC1_P_PICTURE || + picture_type == GEN7_VC1_B_PICTURE)) { + if (pic_param->mv_fields.bits.mv_mode == VAMvMode1MvHalfPelBilinear || + (pic_param->mv_fields.bits.mv_mode == VAMvModeIntensityCompensation && + pic_param->mv_fields.bits.mv_mode2 == VAMvMode1MvHalfPelBilinear)) + interpolation_mode = 8 | pic_param->fast_uvmc_flag; + else + interpolation_mode = 0 | pic_param->fast_uvmc_flag; + } BEGIN_BCS_BATCH(batch, 6); OUT_BCS_BATCH(batch, MFD_VC1_LONG_PIC_STATE | (6 - 2)); |