vp8/armv6: mc: avoid boolean expression in calculation

[ffmpeg] / libavcodec / simple_idct_template.c

diff --git a/libavcodec/simple_idct_template.c b/libavcodec/simple_idct_template.c
index 367bc34012530993fb5e4b14d11d06a3f139cccc..171cdf65ff1147f6cb3f3268acf7cbb6b64b5d24 100644 (file)
--- a/libavcodec/simple_idct_template.c
+++ b/libavcodec/simple_idct_template.c
@@ -25,10 +25,10 @@
  * simpleidct in C.
  */
 
-/*
-  based upon some outcommented c code from mpeg2dec (idct_mmx.c
-  written by Aaron Holtzman <aholtzma@ess.engr.uvic.ca>)
- */
+/* Based upon some commented-out C code from mpeg2dec (idct_mmx.c
+ * written by Aaron Holtzman <aholtzma@ess.engr.uvic.ca>). */
+
+#include "simple_idct.h"
 
 #include "bit_depth_template.c"
 
@@ -91,33 +91,35 @@ static inline void FUNC(idctRowCondDC)(int16_t *row, int extra_shift)
 
 #if HAVE_FAST_64BIT
 #define ROW0_MASK (0xffffLL << 48 * HAVE_BIGENDIAN)
-    if (((((uint64_t *)row)[0] & ~ROW0_MASK) | ((uint64_t *)row)[1]) == 0) {
+    if (((AV_RN64A(row) & ~ROW0_MASK) | AV_RN64A(row+4)) == 0) {
         uint64_t temp;
         if (DC_SHIFT - extra_shift > 0) {
-            temp = (row[0] << (DC_SHIFT - extra_shift)) & 0xffff;
+            temp = (row[0] * (1 << (DC_SHIFT - extra_shift))) & 0xffff;
         } else {
             temp = (row[0] >> (extra_shift - DC_SHIFT)) & 0xffff;
         }
-        temp += temp << 16;
-        temp += temp << 32;
-        ((uint64_t *)row)[0] = temp;
-        ((uint64_t *)row)[1] = temp;
+        temp += temp * (1 << 16);
+        temp += temp * ((uint64_t) 1 << 32);
+        AV_WN64A(row, temp);
+        AV_WN64A(row + 4, temp);
         return;
     }
 #else
-    if (!(((uint32_t*)row)[1] |
-          ((uint32_t*)row)[2] |
-          ((uint32_t*)row)[3] |
+    if (!(AV_RN32A(row+2) |
+          AV_RN32A(row+4) |
+          AV_RN32A(row+6) |
           row[1])) {
         uint32_t temp;
         if (DC_SHIFT - extra_shift > 0) {
-            temp = (row[0] << (DC_SHIFT - extra_shift)) & 0xffff;
+            temp = (row[0] * (1 << (DC_SHIFT - extra_shift))) & 0xffff;
         } else {
             temp = (row[0] >> (extra_shift - DC_SHIFT)) & 0xffff;
         }
-        temp += temp << 16;
-        ((uint32_t*)row)[0]=((uint32_t*)row)[1] =
-            ((uint32_t*)row)[2]=((uint32_t*)row)[3] = temp;
+        temp += temp * (1 << 16);
+        AV_WN32A(row, temp);
+        AV_WN32A(row+2, temp);
+        AV_WN32A(row+4, temp);
+        AV_WN32A(row+6, temp);
         return;
     }
 #endif