diff options
| author | Tim Kopp <tkopp@google.com> | 2014-06-05 09:56:04 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-06-05 09:56:04 -0700 |
| commit | c1ae80c4c594c61180814f1551ab39b10cf8a105 (patch) | |
| tree | 293a7733896c3ffc007d0f56e07f63942c208868 | |
| parent | 4e6c555995e22f83706a066bcb9fa7db5075d3e7 (diff) | |
| parent | dd1443e6c9eed51cf01e1c299490ed2a87e7c113 (diff) | |
| download | libvpx-c1ae80c4c594c61180814f1551ab39b10cf8a105.tar libvpx-c1ae80c4c594c61180814f1551ab39b10cf8a105.tar.gz libvpx-c1ae80c4c594c61180814f1551ab39b10cf8a105.tar.bz2 libvpx-c1ae80c4c594c61180814f1551ab39b10cf8a105.zip | |
Merge changes I59ef7c49,I0156d856
* changes:
Made MACROBLOCK.increase_denoising cond-compiled
s/INT_MAX/UINT_MAX/ where appropriate
| -rw-r--r-- | vp8/encoder/block.h | 2 | ||||
| -rw-r--r-- | vp8/encoder/pickinter.c | 4 | ||||
| -rw-r--r-- | vp8/encoder/rdopt.c | 4 |
3 files changed, 5 insertions, 5 deletions
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; 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]; |