commit e08527713749310b1779a5e8cc4d783696c7333b
author Wan-Teh Chang <wtc@google.com> Sat Sep 29 11:46:27 2018 -0700
committer Wan-Teh Chang <wtc@google.com> Sat Sep 29 12:27:33 2018 -0700
tree 889045d05a5b6fe7173daec413e6ba3af9d809f6
parent b69d8fe840c970432aa61982f4b6a6cd392f5b53

Fix Visual Studio warning C4244.

Fix Visual Studio warnings like these in pickrst.h and pickrst.c:
    warning C4244: 'return' : conversion from 'uint64_t' to 'uint8_t',
    possible loss of data

    warning C4244: '=' : conversion from 'const int64_t' to 'int16_t',
    possible loss of data

These warnings were introduced in commit
9042a3cd777a69d8bff9d142df46ed8d2647d7a8:
https://aomedia-review.googlesource.com/c/aom/+/71601

Change-Id: I35b1e6e43c930941451632981f56580d89648ae9

av1/encoder/pickrst.c

diff --git a/av1/encoder/pickrst.c b/av1/encoder/pickrst.c
index 5fe1cf4..fa109a4 100644
--- a/av1/encoder/pickrst.c
+++ b/av1/encoder/pickrst.c
@@ -701,7 +701,8 @@
       sum += src[i * stride + j];
     }
   }
-  return sum / ((v_end - v_start) * (h_end - h_start));
+  uint64_t avg = sum / ((v_end - v_start) * (h_end - h_start));
+  return (uint16_t)avg;
 }
 
 static AOM_FORCE_INLINE void compute_stats_highbd(
@@ -1005,9 +1006,9 @@
     const int64_t divisor = WIENER_TAP_SCALE_FACTOR;
     // Perform this division with proper rounding rather than truncation
     if (dividend < 0) {
-      fi[i] = (dividend - (divisor / 2)) / divisor;
+      fi[i] = (int16_t)((dividend - (divisor / 2)) / divisor);
     } else {
-      fi[i] = (dividend + (divisor / 2)) / divisor;
+      fi[i] = (int16_t)((dividend + (divisor / 2)) / divisor);
     }
   }
   // Specialize for 7-tap filter

av1/encoder/pickrst.h

diff --git a/av1/encoder/pickrst.h b/av1/encoder/pickrst.h
index 6559a2e..fce282d 100644
--- a/av1/encoder/pickrst.h
+++ b/av1/encoder/pickrst.h
@@ -33,7 +33,8 @@
       sum += src[i * stride + j];
     }
   }
-  return sum / ((v_end - v_start) * (h_end - h_start));
+  uint64_t avg = sum / ((v_end - v_start) * (h_end - h_start));
+  return (uint8_t)avg;
 }
 
 void av1_pick_filter_restoration(const YV12_BUFFER_CONFIG *sd, AV1_COMP *cpi);