From 0ba6e29515cf703eb9f2a37043c68c1e8ca1459a Mon Sep 17 00:00:00 2001 From: Tim Kopp Date: Tue, 3 Jun 2014 15:56:39 -0700 Subject: s/INT_MAX/UINT_MAX/ where appropriate Change-Id: I0156d85671305326525c4644510e240021eca461 --- vp8/encoder/pickinter.c | 4 ++-- vp8/encoder/rdopt.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/vp8/encoder/pickinter.c b/vp8/encoder/pickinter.c index cf6a82f5a..817c9efa3 100644 --- a/vp8/encoder/pickinter.c +++ b/vp8/encoder/pickinter.c @@ -590,9 +590,9 @@ void vp8_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset, int distortion2; int bestsme = INT_MAX; int best_mode_index = 0; - unsigned int sse = INT_MAX, best_rd_sse = INT_MAX; + unsigned int sse = UINT_MAX, best_rd_sse = UINT_MAX; #if CONFIG_TEMPORAL_DENOISING - unsigned int zero_mv_sse = INT_MAX, best_sse = INT_MAX; + unsigned int zero_mv_sse = UINT_MAX, best_sse = UINT_MAX; #endif int sf_improved_mv_pred = cpi->sf.improved_mv_pred; diff --git a/vp8/encoder/rdopt.c b/vp8/encoder/rdopt.c index d9f39b507..f145d0909 100644 --- a/vp8/encoder/rdopt.c +++ b/vp8/encoder/rdopt.c @@ -1973,8 +1973,8 @@ void vp8_rd_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset, cpi->common.y1dc_delta_q); #if CONFIG_TEMPORAL_DENOISING - unsigned int zero_mv_sse = INT_MAX, best_sse = INT_MAX, - best_rd_sse = INT_MAX; + unsigned int zero_mv_sse = UINT_MAX, best_sse = UINT_MAX, + best_rd_sse = UINT_MAX; #endif mode_mv = mode_mv_sb[sign_bias]; -- cgit v1.2.3 From dd1443e6c9eed51cf01e1c299490ed2a87e7c113 Mon Sep 17 00:00:00 2001 From: Tim Kopp Date: Wed, 4 Jun 2014 13:45:23 -0700 Subject: Made MACROBLOCK.increase_denoising cond-compiled Change-Id: I59ef7c49f72d2d40bbe5b56af11bdf5f9ae2f1b8 --- vp8/encoder/block.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vp8/encoder/block.h b/vp8/encoder/block.h index 34879cf2a..1f212cae8 100644 --- a/vp8/encoder/block.h +++ b/vp8/encoder/block.h @@ -125,9 +125,9 @@ typedef struct macroblock int optimize; int q_index; - int increase_denoising; #if CONFIG_TEMPORAL_DENOISING + int increase_denoising; MB_PREDICTION_MODE best_sse_inter_mode; int_mv best_sse_mv; MV_REFERENCE_FRAME best_reference_frame; -- cgit v1.2.3