commit f06f641fd7763f89cbff9ba7639c2eb0d20f77ef
author Yaowu Xu <yaowu@google.com> Fri Feb 02 13:47:55 2018 -0800
committer Yaowu Xu <yaowu@google.com> Sat Feb 03 00:51:28 2018 +0000
tree ec5de965a8756f454bb9d016532e776167346d1d
parent b785b95af3c10556ee93c15f3be36293d8fdce43

Replace 64 bit operations with 32 bit ones

Change-Id: Ic51231510fc8bb897f8ca771dd4e750d0e1cd693

aom_dsp/blend_a64_mask.c

diff --git a/aom_dsp/blend_a64_mask.c b/aom_dsp/blend_a64_mask.c
index 0ada244..f8f9a1c 100644
--- a/aom_dsp/blend_a64_mask.c
+++ b/aom_dsp/blend_a64_mask.c
@@ -40,40 +40,40 @@
   if (subw == 0 && subh == 0) {
     for (i = 0; i < h; ++i) {
       for (j = 0; j < w; ++j) {
-        const int64_t m = mask[i * mask_stride + j];
-        dst[i * dst_stride + j] = (int32_t)AOM_BLEND_A64(
-            m, src0[i * src0_stride + j], src1[i * src1_stride + j]);
+        const int m = mask[i * mask_stride + j];
+        dst[i * dst_stride + j] = AOM_BLEND_A64(m, src0[i * src0_stride + j],
+                                                src1[i * src1_stride + j]);
       }
     }
   } else if (subw == 1 && subh == 1) {
     for (i = 0; i < h; ++i) {
       for (j = 0; j < w; ++j) {
-        const int64_t m = ROUND_POWER_OF_TWO(
+        const int m = ROUND_POWER_OF_TWO(
             mask[(2 * i) * mask_stride + (2 * j)] +
                 mask[(2 * i + 1) * mask_stride + (2 * j)] +
                 mask[(2 * i) * mask_stride + (2 * j + 1)] +
                 mask[(2 * i + 1) * mask_stride + (2 * j + 1)],
             2);
-        dst[i * dst_stride + j] = (int32_t)AOM_BLEND_A64(
-            m, src0[i * src0_stride + j], src1[i * src1_stride + j]);
+        dst[i * dst_stride + j] = AOM_BLEND_A64(m, src0[i * src0_stride + j],
+                                                src1[i * src1_stride + j]);
       }
     }
   } else if (subw == 1 && subh == 0) {
     for (i = 0; i < h; ++i) {
       for (j = 0; j < w; ++j) {
-        const int64_t m = AOM_BLEND_AVG(mask[i * mask_stride + (2 * j)],
-                                        mask[i * mask_stride + (2 * j + 1)]);
-        dst[i * dst_stride + j] = (int32_t)AOM_BLEND_A64(
-            m, src0[i * src0_stride + j], src1[i * src1_stride + j]);
+        const int m = AOM_BLEND_AVG(mask[i * mask_stride + (2 * j)],
+                                    mask[i * mask_stride + (2 * j + 1)]);
+        dst[i * dst_stride + j] = AOM_BLEND_A64(m, src0[i * src0_stride + j],
+                                                src1[i * src1_stride + j]);
       }
     }
   } else {
     for (i = 0; i < h; ++i) {
       for (j = 0; j < w; ++j) {
-        const int64_t m = AOM_BLEND_AVG(mask[(2 * i) * mask_stride + j],
-                                        mask[(2 * i + 1) * mask_stride + j]);
-        dst[i * dst_stride + j] = (int32_t)AOM_BLEND_A64(
-            m, src0[i * src0_stride + j], src1[i * src1_stride + j]);
+        const int m = AOM_BLEND_AVG(mask[(2 * i) * mask_stride + j],
+                                    mask[(2 * i + 1) * mask_stride + j]);
+        dst[i * dst_stride + j] = AOM_BLEND_A64(m, src0[i * src0_stride + j],
+                                                src1[i * src1_stride + j]);
       }
     }
   }