Use the internal CondOver flag

Signed-off-by: Xiang, Haihao <haihao.xiang@intel.com>
(cherry picked from commit 2cb319923b6ae5c1b2c643534d7a97911b9bd54e)

diff --git a/src/gen6_mfd.c b/src/gen6_mfd.c
index bd35c5c..d3aae53 100755 (executable)
--- a/src/gen6_mfd.c
+++ b/src/gen6_mfd.c
@@ -1698,11 +1698,11 @@ gen6_mfd_vc1_pic_state(VADriverContextP ctx,
             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;
+             } else if (va_to_gen6_vc1_condover[pic_param->conditional_overlap_flag] == 2 ||
+                        va_to_gen6_vc1_condover[pic_param->conditional_overlap_flag] == 3) {
+                 overlap = 1;
              }
-         }
+        }
     } 
 
     assert(pic_param->conditional_overlap_flag < 3);

diff --git a/src/gen75_mfd.c b/src/gen75_mfd.c
index 7754c6b..19915c6 100644 (file)
--- a/src/gen75_mfd.c
+++ b/src/gen75_mfd.c
@@ -2008,11 +2008,11 @@ gen75_mfd_vc1_pic_state(VADriverContextP ctx,
             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;
+             } else if (va_to_gen7_vc1_condover[pic_param->conditional_overlap_flag] == 2 ||
+                        va_to_gen7_vc1_condover[pic_param->conditional_overlap_flag] == 3) {
+                 overlap = 1;
              }
-         }
+        }
     } 
 
     assert(pic_param->conditional_overlap_flag < 3);

diff --git a/src/gen7_mfd.c b/src/gen7_mfd.c
index 6b6aded..5b36c8d 100755 (executable)
--- a/src/gen7_mfd.c
+++ b/src/gen7_mfd.c
@@ -1676,11 +1676,11 @@ gen7_mfd_vc1_pic_state(VADriverContextP ctx,
             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;
+             } else if (va_to_gen7_vc1_condover[pic_param->conditional_overlap_flag] == 2 ||
+                        va_to_gen7_vc1_condover[pic_param->conditional_overlap_flag] == 3) {
+                 overlap = 1;
              }
-         }
+        }
     } 
 
     assert(pic_param->conditional_overlap_flag < 3);