From: Yunqing Wang Date: Thu, 10 Apr 2014 15:32:23 +0000 (-0700) Subject: Define var threshold as unsigned int to match the type X-Git-Tag: v1.4.0~1838^2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=eb505a3f3f3d55021ccb97835521ab096c2f04f8;p=libvpx Define var threshold as unsigned int to match the type Minor change to use matching type in comparison. Change-Id: I670cae2d584918c67c1af791a797629f392f599e --- diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c index c52e4f31e..a54fe79aa 100644 --- a/vp9/encoder/vp9_encodeframe.c +++ b/vp9/encoder/vp9_encodeframe.c @@ -1483,8 +1483,8 @@ static void set_source_var_based_partition(VP9_COMP *cpi, const int pre_offset = (mi_row * MI_SIZE) * pre_stride + (mi_col * MI_SIZE); const uint8_t *pre_src = cpi->Last_Source->y_buffer + pre_offset; - const int thr_32x32 = cpi->sf.source_var_thresh; - const int thr_64x64 = thr_32x32 << 1; + const unsigned int thr_32x32 = cpi->sf.source_var_thresh; + const unsigned int thr_64x64 = thr_32x32 << 1; int i, j; int index; diff d32[4]; diff --git a/vp9/encoder/vp9_speed_features.h b/vp9/encoder/vp9_speed_features.h index 72f548a04..55422979a 100644 --- a/vp9/encoder/vp9_speed_features.h +++ b/vp9/encoder/vp9_speed_features.h @@ -344,7 +344,7 @@ typedef struct { int search_type_check_frequency; // The threshold used in SOURCE_VAR_BASED_PARTITION search type. - int source_var_thresh; + unsigned int source_var_thresh; } SPEED_FEATURES; struct VP9_COMP;