Commit c1ae80c4 authored by Tim Kopp's avatar Tim Kopp Committed by Gerrit Code Review
Browse files

Merge changes I59ef7c49,I0156d856

* changes:
  Made MACROBLOCK.increase_denoising cond-compiled
  s/INT_MAX/UINT_MAX/ where appropriate
parents 4e6c5559 dd1443e6
...@@ -125,9 +125,9 @@ typedef struct macroblock ...@@ -125,9 +125,9 @@ typedef struct macroblock
int optimize; int optimize;
int q_index; int q_index;
int increase_denoising;
#if CONFIG_TEMPORAL_DENOISING #if CONFIG_TEMPORAL_DENOISING
int increase_denoising;
MB_PREDICTION_MODE best_sse_inter_mode; MB_PREDICTION_MODE best_sse_inter_mode;
int_mv best_sse_mv; int_mv best_sse_mv;
MV_REFERENCE_FRAME best_reference_frame; MV_REFERENCE_FRAME best_reference_frame;
......
...@@ -590,9 +590,9 @@ void vp8_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset, ...@@ -590,9 +590,9 @@ void vp8_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset,
int distortion2; int distortion2;
int bestsme = INT_MAX; int bestsme = INT_MAX;
int best_mode_index = 0; 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 #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 #endif
int sf_improved_mv_pred = cpi->sf.improved_mv_pred; int sf_improved_mv_pred = cpi->sf.improved_mv_pred;
......
...@@ -1973,8 +1973,8 @@ void vp8_rd_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset, ...@@ -1973,8 +1973,8 @@ void vp8_rd_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset,
cpi->common.y1dc_delta_q); cpi->common.y1dc_delta_q);
#if CONFIG_TEMPORAL_DENOISING #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,
best_rd_sse = INT_MAX; best_rd_sse = UINT_MAX;
#endif #endif
mode_mv = mode_mv_sb[sign_bias]; mode_mv = mode_mv_sb[sign_bias];
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment