shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Define var threshold as unsigned int to match the type"

--- a/vp9/encoder/vp9_encodeframe.c

+++ b/vp9/encoder/vp9_encodeframe.c

@@ -1473,8 +1473,8 @@

     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];

--- a/vp9/encoder/vp9_speed_features.h

+++ b/vp9/encoder/vp9_speed_features.h

@@ -344,7 +344,7 @@

   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;