Revert "fix msvc build warnings and errors"

This reverts commit 32dbdff1.

Change-Id: I94ef281223f7abceb156714e8192d5ea5fdc2581

aom_dsp/bitreader.h

@@ -74,7 +74,7 @@ static INLINE int aom_reader_init(aom_reader *r, const uint8_t *buffer,
   (void)decrypt_cb;
   (void)decrypt_state;
   assert(size <= INT_MAX);
-  return ans_read_init(r, buffer, (int)size);
+  return ans_read_init(r, buffer, size);
 #elif CONFIG_DAALA_EC
   (void)decrypt_cb;
   (void)decrypt_state;

aom_dsp/x86/synonyms.h

@@ -89,7 +89,7 @@ static INLINE __m128i xx_roundn_epi32(__m128i v_val_d, int bits) {
   return _mm_srai_epi32(v_tmp_d, bits);
 }
 
-#if HAVE_SSSE3
+#ifdef __SSSE3__
 static INLINE int32_t xx_hsum_epi32_si32(__m128i v_d) {
   v_d = _mm_hadd_epi32(v_d, v_d);
   v_d = _mm_hadd_epi32(v_d, v_d);
@@ -115,6 +115,6 @@ static INLINE int64_t xx_hsum_epi32_si64(__m128i v_d) {
   const __m128i v_1_q = _mm_unpackhi_epi32(v_d, v_sign_d);
   return xx_hsum_epi64_si64(_mm_add_epi64(v_0_q, v_1_q));
 }
-#endif  // HAVE_SSSE3
+#endif  // __SSSE3__
 
 #endif  // AOM_DSP_X86_SYNONYMS_H_

av1/common/dering.c

@@ -85,16 +85,14 @@ static INLINE void copy_8x8_16bit_to_8bit(uint8_t *dst, int dstride,
                                           int16_t *src, int sstride) {
   int i, j;
   for (i = 0; i < 8; i++)
-    for (j = 0; j < 8; j++)
-      dst[i * dstride + j] = (uint8_t)src[i * sstride + j];
+    for (j = 0; j < 8; j++) dst[i * dstride + j] = src[i * sstride + j];
 }
 
 static INLINE void copy_4x4_16bit_to_8bit(uint8_t *dst, int dstride,
                                           int16_t *src, int sstride) {
   int i, j;
   for (i = 0; i < 4; i++)
-    for (j = 0; j < 4; j++)
-      dst[i * dstride + j] = (uint8_t)src[i * sstride + j];
+    for (j = 0; j < 4; j++) dst[i * dstride + j] = src[i * sstride + j];
 }
 
 /* TODO: Optimize this function for SSE. */

av1/decoder/detokenize.c

@@ -333,12 +333,7 @@ void av1_decode_palette_tokens(MACROBLOCKD *const xd, int plane,
 int av1_decode_block_tokens(MACROBLOCKD *const xd, int plane,
                             const SCAN_ORDER *sc, int x, int y, TX_SIZE tx_size,
                             TX_TYPE tx_type, int16_t *max_scan_line,
-#if CONFIG_ANS
-                            struct AnsDecoder *const r,
-#else
-                            aom_reader *r,
-#endif  // CONFIG_ANS
-                            int seg_id) {
+                            aom_reader *r, int seg_id) {
   struct macroblockd_plane *const pd = &xd->plane[plane];
   const int16_t *const dequant = pd->seg_dequant[seg_id];
   const int ctx =

av1/encoder/clpf_rdo.c

@@ -207,10 +207,10 @@ static int clpf_rdo(int y, int x, const YV12_BUFFER_CONFIG *rec,
     w2 = AOMMIN(w - (1 << (fb_size_log2 - bslog)), w >> 1);
     h2 = AOMMIN(h - (1 << (fb_size_log2 - bslog)), h >> 1);
     i = get_msb(MAX_FB_SIZE) - fb_size_log2;
-    sum1 = (int)res[i][1];
-    sum2 = (int)res[i][2];
-    sum3 = (int)res[i][3];
-    oldfiltered = (int)res[i][0];
+    sum1 = res[i][1];
+    sum2 = res[i][2];
+    sum3 = res[i][3];
+    oldfiltered = res[i][0];
     res[i][0] = 0;
 
     filtered |= clpf_rdo(y, x, rec, org, cm, block_size, fb_size_log2, w1, h1,