diff options
| author | carpalis <jerome.borsboom@carpalis.nl> | 2017-10-23 10:13:59 +0200 |
|---|---|---|
| committer | Xiang, Haihao <haihao.xiang@intel.com> | 2018-01-05 14:57:31 +0800 |
| commit | b708e8f58583fc1aa04694bcd7b61e7969107720 (patch) | |
| tree | a65a2ce7e3d2f270cacf4ca71a1f3bfb4c00e1da | |
| parent | a1c8e874d7da8c9429257c7a4199b66596496c1a (diff) | |
| download | libva-intel-driver-b708e8f58583fc1aa04694bcd7b61e7969107720.tar.gz | |
genX_mfd: change order within if-else
Signed-off-by: Jerome Borsboom <jerome.borsboom@carpalis.nl>
| -rw-r--r-- | src/gen6_mfd.c | 12 | ||||
| -rw-r--r-- | src/gen75_mfd.c | 12 | ||||
| -rw-r--r-- | src/gen7_mfd.c | 12 | ||||
| -rw-r--r-- | src/gen8_mfd.c | 12 |
4 files changed, 24 insertions, 24 deletions
diff --git a/src/gen6_mfd.c b/src/gen6_mfd.c index f0dc89bc..35b570b5 100644 --- 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 10b4859b..84ae8567 100644 --- 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 c398b28b..80be4f61 100644 --- 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 3b106c35..962cb153 100644 --- 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; + } } } |