genX_mfd: change order within if-else

Signed-off-by: Jerome Borsboom <jerome.borsboom@carpalis.nl>

diff --git a/src/gen6_mfd.c b/src/gen6_mfd.c
index f0dc89b..35b570b 100644 (file)
--- a/src/gen6_mfd.c
+++ b/src/gen6_mfd.c
@@ -1514,12 +1514,7 @@ gen6_mfd_vc1_pic_state(VADriverContextP ctx,
     }
 
     if (pic_param->sequence_fields.bits.overlap) {
-        if (profile != GEN6_VC1_ADVANCED_PROFILE) {
-            if (pic_param->pic_quantizer_fields.bits.pic_quantizer_scale >= 9 &&
-                picture_type != GEN6_VC1_B_PICTURE) {
-                overlap = 1;
-            }
-        } else {
+        if (profile == GEN6_VC1_ADVANCED_PROFILE) {
             if (picture_type == GEN6_VC1_P_PICTURE &&
                 pic_param->pic_quantizer_fields.bits.pic_quantizer_scale >= 9) {
                 overlap = 1;
@@ -1533,6 +1528,11 @@ gen6_mfd_vc1_pic_state(VADriverContextP ctx,
                     overlap = 1;
                 }
             }
+        } else {
+            if (pic_param->pic_quantizer_fields.bits.pic_quantizer_scale >= 9 &&
+                picture_type != GEN6_VC1_B_PICTURE) {
+                overlap = 1;
+            }
         }
     }
 

diff --git a/src/gen75_mfd.c b/src/gen75_mfd.c
index 10b4859..84ae856 100644 (file)
--- a/src/gen75_mfd.c
+++ b/src/gen75_mfd.c
@@ -1840,12 +1840,7 @@ gen75_mfd_vc1_pic_state(VADriverContextP ctx,
     }
 
     if (pic_param->sequence_fields.bits.overlap) {
-        if (profile != GEN7_VC1_ADVANCED_PROFILE) {
-            if (pic_param->pic_quantizer_fields.bits.pic_quantizer_scale >= 9 &&
-                picture_type != GEN7_VC1_B_PICTURE) {
-                overlap = 1;
-            }
-        } else {
+        if (profile == GEN7_VC1_ADVANCED_PROFILE) {
             if (picture_type == GEN7_VC1_P_PICTURE &&
                 pic_param->pic_quantizer_fields.bits.pic_quantizer_scale >= 9) {
                 overlap = 1;
@@ -1859,6 +1854,11 @@ gen75_mfd_vc1_pic_state(VADriverContextP ctx,
                     overlap = 1;
                 }
             }
+        } else {
+            if (pic_param->pic_quantizer_fields.bits.pic_quantizer_scale >= 9 &&
+                picture_type != GEN7_VC1_B_PICTURE) {
+                overlap = 1;
+            }
         }
     }
 

diff --git a/src/gen7_mfd.c b/src/gen7_mfd.c
index c398b28..80be4f6 100644 (file)
--- a/src/gen7_mfd.c
+++ b/src/gen7_mfd.c
@@ -1575,12 +1575,7 @@ gen7_mfd_vc1_pic_state(VADriverContextP ctx,
     }
 
     if (pic_param->sequence_fields.bits.overlap) {
-        if (profile != GEN7_VC1_ADVANCED_PROFILE) {
-            if (pic_param->pic_quantizer_fields.bits.pic_quantizer_scale >= 9 &&
-                picture_type != GEN7_VC1_B_PICTURE) {
-                overlap = 1;
-            }
-        } else {
+        if (profile == GEN7_VC1_ADVANCED_PROFILE) {
             if (picture_type == GEN7_VC1_P_PICTURE &&
                 pic_param->pic_quantizer_fields.bits.pic_quantizer_scale >= 9) {
                 overlap = 1;
@@ -1594,6 +1589,11 @@ gen7_mfd_vc1_pic_state(VADriverContextP ctx,
                     overlap = 1;
                 }
             }
+        } else {
+            if (pic_param->pic_quantizer_fields.bits.pic_quantizer_scale >= 9 &&
+                picture_type != GEN7_VC1_B_PICTURE) {
+                overlap = 1;
+            }
         }
     }
 

diff --git a/src/gen8_mfd.c b/src/gen8_mfd.c
index 3b106c3..962cb15 100644 (file)
--- a/src/gen8_mfd.c
+++ b/src/gen8_mfd.c
@@ -1619,12 +1619,7 @@ gen8_mfd_vc1_pic_state(VADriverContextP ctx,
     }
 
     if (pic_param->sequence_fields.bits.overlap) {
-        if (profile != GEN7_VC1_ADVANCED_PROFILE) {
-            if (pic_param->pic_quantizer_fields.bits.pic_quantizer_scale >= 9 &&
-                picture_type != GEN7_VC1_B_PICTURE) {
-                overlap = 1;
-            }
-        } else {
+        if (profile == GEN7_VC1_ADVANCED_PROFILE) {
             if (picture_type == GEN7_VC1_P_PICTURE &&
                 pic_param->pic_quantizer_fields.bits.pic_quantizer_scale >= 9) {
                 overlap = 1;
@@ -1638,6 +1633,11 @@ gen8_mfd_vc1_pic_state(VADriverContextP ctx,
                     overlap = 1;
                 }
             }
+        } else {
+            if (pic_param->pic_quantizer_fields.bits.pic_quantizer_scale >= 9 &&
+                picture_type != GEN7_VC1_B_PICTURE) {
+                overlap = 1;
+            }
         }
     }