diff options
| author | Li, Xiaowei A <xiaowei.a.li@intel.com> | 2012-12-12 10:04:37 +0800 |
|---|---|---|
| committer | Xiang, Haihao <haihao.xiang@intel.com> | 2013-01-09 15:39:08 +0800 |
| commit | 1c21caff4046cff9f453eb8e42d8a6d31b22a96f (patch) | |
| tree | a223ef6ff10776c41fee790d4e16e858d87f920b | |
| parent | f750d1b69e1aae65463eab224013b506481d8459 (diff) | |
| download | vaapi-intel-driver-1c21caff4046cff9f453eb8e42d8a6d31b22a96f.tar.gz vaapi-intel-driver-1c21caff4046cff9f453eb8e42d8a6d31b22a96f.tar.bz2 vaapi-intel-driver-1c21caff4046cff9f453eb8e42d8a6d31b22a96f.zip | |
workaround to set VC1 overlap filter flag
Signed-off-by: Li,Xiaowei <xiaowei.a.li@intel.com>
(cherry picked from commit a6dfb8f7fb601f102b414ac0c9088b5b8e88060f)
| -rwxr-xr-x | src/gen6_mfd.c | 23 | ||||
| -rw-r--r-- | src/gen75_mfd.c | 23 | ||||
| -rwxr-xr-x | src/gen7_mfd.c | 23 |
3 files changed, 60 insertions, 9 deletions
diff --git a/src/gen6_mfd.c b/src/gen6_mfd.c index 986b38b..741a97e 100755 --- a/src/gen6_mfd.c +++ b/src/gen6_mfd.c @@ -1662,9 +1662,26 @@ gen6_mfd_vc1_pic_state(VADriverContextP ctx, brfd = 0; } - overlap = pic_param->sequence_fields.bits.overlap; - if (profile != GEN6_VC1_ADVANCED_PROFILE && pic_param->pic_quantizer_fields.bits.pic_quantizer_scale < 9) - overlap = 0; + overlap = 0; + if (profile != GEN6_VC1_ADVANCED_PROFILE){ + if (pic_param->pic_quantizer_fields.bits.pic_quantizer_scale >= 9){ + overlap = 1; + } + }else { + if (pic_param->picture_fields.bits.picture_type == GEN6_VC1_P_PICTURE && + pic_param->pic_quantizer_fields.bits.pic_quantizer_scale >= 9){ + overlap = 1; + } + if (pic_param->picture_fields.bits.picture_type == GEN6_VC1_I_PICTURE || + pic_param->picture_fields.bits.picture_type == GEN6_VC1_BI_PICTURE){ + if (pic_param->pic_quantizer_fields.bits.pic_quantizer_scale >= 9){ + overlap = 1; + }else if(pic_param->conditional_overlap_flag == 2 || + pic_param->conditional_overlap_flag == 3){ + overlap = 1; + } + } + } assert(pic_param->conditional_overlap_flag < 3); assert(pic_param->mv_fields.bits.mv_table < 4); /* FIXME: interlace mode */ diff --git a/src/gen75_mfd.c b/src/gen75_mfd.c index e53139a..1800ac5 100644 --- a/src/gen75_mfd.c +++ b/src/gen75_mfd.c @@ -1958,9 +1958,26 @@ gen75_mfd_vc1_pic_state(VADriverContextP ctx, brfd = 0; } - overlap = pic_param->sequence_fields.bits.overlap; - if (profile != GEN7_VC1_ADVANCED_PROFILE && pic_param->pic_quantizer_fields.bits.pic_quantizer_scale < 9) - overlap = 0; + overlap = 0; + if (profile != GEN7_VC1_ADVANCED_PROFILE){ + if (pic_param->pic_quantizer_fields.bits.pic_quantizer_scale >= 9){ + overlap = 1; + } + }else { + if (pic_param->picture_fields.bits.picture_type == GEN7_VC1_P_PICTURE && + pic_param->pic_quantizer_fields.bits.pic_quantizer_scale >= 9){ + overlap = 1; + } + if (pic_param->picture_fields.bits.picture_type == GEN7_VC1_I_PICTURE || + pic_param->picture_fields.bits.picture_type == GEN7_VC1_BI_PICTURE){ + if (pic_param->pic_quantizer_fields.bits.pic_quantizer_scale >= 9){ + overlap = 1; + }else if(pic_param->conditional_overlap_flag == 2 || + pic_param->conditional_overlap_flag == 3){ + overlap = 1; + } + } + } assert(pic_param->conditional_overlap_flag < 3); assert(pic_param->mv_fields.bits.mv_table < 4); /* FIXME: interlace mode */ diff --git a/src/gen7_mfd.c b/src/gen7_mfd.c index 0a0e44f..8c51017 100755 --- a/src/gen7_mfd.c +++ b/src/gen7_mfd.c @@ -1617,9 +1617,26 @@ gen7_mfd_vc1_pic_state(VADriverContextP ctx, brfd = 0; } - overlap = pic_param->sequence_fields.bits.overlap; - if (profile != GEN7_VC1_ADVANCED_PROFILE && pic_param->pic_quantizer_fields.bits.pic_quantizer_scale < 9) - overlap = 0; + overlap = 0; + if (profile != GEN7_VC1_ADVANCED_PROFILE){ + if (pic_param->pic_quantizer_fields.bits.pic_quantizer_scale >= 9){ + overlap = 1; + } + }else { + if (pic_param->picture_fields.bits.picture_type == GEN7_VC1_P_PICTURE && + pic_param->pic_quantizer_fields.bits.pic_quantizer_scale >= 9){ + overlap = 1; + } + if (pic_param->picture_fields.bits.picture_type == GEN7_VC1_I_PICTURE || + pic_param->picture_fields.bits.picture_type == GEN7_VC1_BI_PICTURE){ + if (pic_param->pic_quantizer_fields.bits.pic_quantizer_scale >= 9){ + overlap = 1; + }else if(pic_param->conditional_overlap_flag == 2 || + pic_param->conditional_overlap_flag == 3){ + overlap = 1; + } + } + } assert(pic_param->conditional_overlap_flag < 3); assert(pic_param->mv_fields.bits.mv_table < 4); /* FIXME: interlace mode */ |