diff options
| author | Xiang, Haihao <haihao.xiang@intel.com> | 2018-03-13 13:58:50 +0800 |
|---|---|---|
| committer | Xiang, Haihao <haihao.xiang@intel.com> | 2018-03-14 23:12:08 +0800 |
| commit | cdeabaefb7e963f0387d44f52a80408517294473 (patch) | |
| tree | a1e52560f1bd1be07ae6c5db17d087e03fddb74e | |
| parent | 2ef2acb165a349c1c6ac6795b6f5a3fcc980aeb2 (diff) | |
| download | libva-intel-driver-cdeabaefb7e963f0387d44f52a80408517294473.tar.gz | |
Don't compare an unsigned variable with 0
For an unsigned variable xxx, 'xxx < 0U' is always false, and 'xxx >=
0U' is always true
In addition, this commit fixes a minor syntax error.
Signed-off-by: Xiang, Haihao <haihao.xiang@intel.com>
| -rw-r--r-- | src/gen10_hevc_enc_common.c | 4 | ||||
| -rw-r--r-- | src/gen6_mfc.c | 2 | ||||
| -rw-r--r-- | src/gen75_mfc.c | 2 | ||||
| -rw-r--r-- | src/gen8_mfc.c | 2 | ||||
| -rw-r--r-- | src/i965_encoder_vp8.c | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/src/gen10_hevc_enc_common.c b/src/gen10_hevc_enc_common.c index 5117bccf..60a00f73 100644 --- a/src/gen10_hevc_enc_common.c +++ b/src/gen10_hevc_enc_common.c @@ -863,7 +863,7 @@ gen10_hevc_enc_init_lambda_param(struct gen10_hevc_enc_lambda_param *param, lambda_double = lambda_double * 16 + 0.5; lambda = (uint32_t)floor(lambda_double); lambda_double = (lambda_double > 0xffff) ? 0xffff : lambda_double; - lambda = CLAMP(0, 0xffff, lambda); + lambda = MIN(0xffff, lambda); param->lambda_inter[i][qp] = (uint16_t)lambda; } } @@ -920,7 +920,7 @@ gen10_hevc_enc_hcp_set_qm_fqm_states(VADriverContextP ctx, uint8_t *real_qm; uint16_t *real_fqm; int comps, len; - int i , j, m; + int i, j, m; for (m = 0; m < 4; m++) { comps = (m == 3) ? 1 : 3; diff --git a/src/gen6_mfc.c b/src/gen6_mfc.c index c79053d1..54836f11 100644 --- a/src/gen6_mfc.c +++ b/src/gen6_mfc.c @@ -809,7 +809,7 @@ gen6_mfc_avc_pipeline_slice_programing(VADriverContextP ctx, /* only support for 8-bit pixel bit-depth */ assert(pSequenceParameter->bit_depth_luma_minus8 == 0); assert(pSequenceParameter->bit_depth_chroma_minus8 == 0); - assert(pPicParameter->pic_init_qp >= 0 && pPicParameter->pic_init_qp < 52); + assert(pPicParameter->pic_init_qp < 52); assert(qp >= 0 && qp < 52); gen6_mfc_avc_slice_state(ctx, diff --git a/src/gen75_mfc.c b/src/gen75_mfc.c index aa291d54..1c25673c 100644 --- a/src/gen75_mfc.c +++ b/src/gen75_mfc.c @@ -1185,7 +1185,7 @@ gen75_mfc_avc_pipeline_slice_programing(VADriverContextP ctx, /* only support for 8-bit pixel bit-depth */ assert(pSequenceParameter->bit_depth_luma_minus8 == 0); assert(pSequenceParameter->bit_depth_chroma_minus8 == 0); - assert(pPicParameter->pic_init_qp >= 0 && pPicParameter->pic_init_qp < 52); + assert(pPicParameter->pic_init_qp < 52); assert(qp >= 0 && qp < 52); gen75_mfc_avc_slice_state(ctx, diff --git a/src/gen8_mfc.c b/src/gen8_mfc.c index 542719a4..f11e3d9f 100644 --- a/src/gen8_mfc.c +++ b/src/gen8_mfc.c @@ -1294,7 +1294,7 @@ gen8_mfc_avc_pipeline_slice_programing(VADriverContextP ctx, /* only support for 8-bit pixel bit-depth */ assert(pSequenceParameter->bit_depth_luma_minus8 == 0); assert(pSequenceParameter->bit_depth_chroma_minus8 == 0); - assert(pPicParameter->pic_init_qp >= 0 && pPicParameter->pic_init_qp < 52); + assert(pPicParameter->pic_init_qp < 52); assert(qp >= 0 && qp < 52); gen8_mfc_avc_slice_state(ctx, diff --git a/src/i965_encoder_vp8.c b/src/i965_encoder_vp8.c index 3ac68a0e..37ae9260 100644 --- a/src/i965_encoder_vp8.c +++ b/src/i965_encoder_vp8.c @@ -3001,7 +3001,7 @@ i965_encoder_vp8_vme_me(VADriverContextP ctx, #define QUANT_INDEX(index, q_index, q_index_delta) \ do { \ index = quant_param->quantization_index[q_index] + quant_param->quantization_index_delta[q_index_delta]; \ - index = CLAMP(0, MAX_QP_VP8, index); \ + index = MIN(MAX_QP_VP8, index); \ } while (0) static void |