From 4d889a69690a772f2b1dbd34ffd88152ed6ed775 Mon Sep 17 00:00:00 2001 From: Chandler Chen Date: Mon, 6 May 2024 15:47:14 +0800 Subject: [PATCH] chore[hal_h265d]: use INT_MAX for poc distance initiation INT_MAX already defined in Signed-off-by: Chandler Chen Change-Id: I98a12ccc81f2e390fe1528835124d05a8c5598b3 --- mpp/hal/rkdec/h265d/hal_h265d_com.h | 1 + mpp/hal/rkdec/h265d/hal_h265d_vdpu34x.c | 3 +-- mpp/hal/rkdec/h265d/hal_h265d_vdpu382.c | 3 +-- mpp/hal/rkdec/h265d/hal_h265d_vdpu383.c | 3 +-- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/mpp/hal/rkdec/h265d/hal_h265d_com.h b/mpp/hal/rkdec/h265d/hal_h265d_com.h index 84dd76fb..2a106308 100644 --- a/mpp/hal/rkdec/h265d/hal_h265d_com.h +++ b/mpp/hal/rkdec/h265d/hal_h265d_com.h @@ -19,6 +19,7 @@ #define __HAL_H265D_COM_H__ #include "rk_type.h" +#include #define SCALING_LIST_SIZE (81 * 1360) #define RPS_SIZE (600 * 32) diff --git a/mpp/hal/rkdec/h265d/hal_h265d_vdpu34x.c b/mpp/hal/rkdec/h265d/hal_h265d_vdpu34x.c index 02c026e8..32325a6f 100644 --- a/mpp/hal/rkdec/h265d/hal_h265d_vdpu34x.c +++ b/mpp/hal/rkdec/h265d/hal_h265d_vdpu34x.c @@ -847,7 +847,6 @@ static void hal_h265d_rcb_info_update(void *hal, void *dxva, }while(0) #define pocdistance(a, b) (((a) > (b)) ? ((a) - (b)) : ((b) - (a))) -#define MAX_INT 2147483647 static MPP_RET hal_h265d_vdpu34x_gen_regs(void *hal, HalTaskInfo *syn) { @@ -864,7 +863,7 @@ static MPP_RET hal_h265d_vdpu34x_gen_regs(void *hal, HalTaskInfo *syn) HalBuf *mv_buf = NULL; RK_S32 fd = -1; RK_U32 mv_size = 0; - RK_S32 distance = MAX_INT; + RK_S32 distance = INT_MAX; h265d_dxva2_picture_context_t *dxva_cxt = (h265d_dxva2_picture_context_t *)syn->dec.syntax.data; HalH265dCtx *reg_ctx = ( HalH265dCtx *)hal; diff --git a/mpp/hal/rkdec/h265d/hal_h265d_vdpu382.c b/mpp/hal/rkdec/h265d/hal_h265d_vdpu382.c index 8c63d384..d4652bd9 100644 --- a/mpp/hal/rkdec/h265d/hal_h265d_vdpu382.c +++ b/mpp/hal/rkdec/h265d/hal_h265d_vdpu382.c @@ -628,7 +628,6 @@ static void hal_h265d_rcb_info_update(void *hal, void *dxva, }while(0) #define pocdistance(a, b) (((a) > (b)) ? ((a) - (b)) : ((b) - (a))) -#define MAX_INT 2147483647 static MPP_RET hal_h265d_vdpu382_setup_colmv_buf(void *hal, HalTaskInfo *syn) { @@ -683,7 +682,7 @@ static MPP_RET hal_h265d_vdpu382_gen_regs(void *hal, HalTaskInfo *syn) MppBuffer framebuf = NULL; HalBuf *mv_buf = NULL; RK_S32 fd = -1; - RK_S32 distance = MAX_INT; + RK_S32 distance = INT_MAX; h265d_dxva2_picture_context_t *dxva_cxt = (h265d_dxva2_picture_context_t *)syn->dec.syntax.data; HalH265dCtx *reg_ctx = ( HalH265dCtx *)hal; diff --git a/mpp/hal/rkdec/h265d/hal_h265d_vdpu383.c b/mpp/hal/rkdec/h265d/hal_h265d_vdpu383.c index e6a1a40e..06dbd2c1 100644 --- a/mpp/hal/rkdec/h265d/hal_h265d_vdpu383.c +++ b/mpp/hal/rkdec/h265d/hal_h265d_vdpu383.c @@ -68,7 +68,6 @@ static const FilterdColBufRatio filterd_fbc_off[CTU][FMT] = { #define SCALIST_OFFSET(pos) (RPS_OFFSET(pos) + RPS_ALIGEND_SIZE) #define pocdistance(a, b) (((a) > (b)) ? ((a) - (b)) : ((b) - (a))) -#define MAX_INT 2147483647 static RK_U32 rkv_len_align_422(RK_U32 val) { @@ -901,7 +900,7 @@ static MPP_RET hal_h265d_vdpu383_gen_regs(void *hal, HalTaskInfo *syn) HalBuf *mv_buf = NULL; RK_S32 fd = -1; RK_U32 mv_size = 0; - RK_S32 distance = MAX_INT; + RK_S32 distance = INT_MAX; (void) fd; if (syn->dec.flags.parse_err ||