shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge changes Iebe9842f,I174b67a5,I80ed1a16

* changes:
  vpx_convolve_neon: prefer != 0 to > 0 in tests
  vpx_convolve_avg_neon: prefer != 0 to > 0 in tests
  vpx_convolve_copy_neon: prefer != 0 to > 0 in tests

--- a/vpx_dsp/arm/vpx_convolve8_neon.c

+++ b/vpx_dsp/arm/vpx_convolve8_neon.c

@@ -145,7 +145,7 @@

       src += 4;

       dst += 4;

       w -= 4;

-    } while (w > 0);

+    } while (w != 0);

   } else {

     const int16x8_t filter3 = vdupq_lane_s16(vget_low_s16(filters), 3);

     const int16x8_t filter4 = vdupq_lane_s16(vget_high_s16(filters), 0);

@@ -296,7 +296,7 @@

           s += 8;

           d += 8;

           width -= 8;

-        } while (width > 0);

+        } while (width != 0);

         src += 8 * src_stride;

         dst += 8 * dst_stride;

         h -= 8;

@@ -402,7 +402,7 @@

       src += 4;

       dst += 4;

       w -= 4;

-    } while (w > 0);

+    } while (w != 0);

   } else {

     const int16x8_t filter3 = vdupq_lane_s16(vget_low_s16(filters), 3);

     const int16x8_t filter4 = vdupq_lane_s16(vget_high_s16(filters), 0);

@@ -586,7 +586,7 @@

           s += 8;

           d += 8;

           width -= 8;

-        } while (width > 0);

+        } while (width != 0);

         src += 8 * src_stride;

         dst += 8 * dst_stride;

         h -= 8;

@@ -679,7 +679,7 @@

       s5 = s9;

       s6 = s10;

       h -= 4;

-    } while (h > 0);

+    } while (h != 0);

   } else {

     const int16x8_t filter3 = vdupq_lane_s16(vget_low_s16(filters), 3);

     const int16x8_t filter4 = vdupq_lane_s16(vget_high_s16(filters), 0);

@@ -759,11 +759,11 @@

         s5 = s9;

         s6 = s10;

         height -= 4;

-      } while (height > 0);

+      } while (height != 0);

       src += 8;

       dst += 8;

       w -= 8;

-    } while (w > 0);

+    } while (w != 0);

   }

 }

@@ -860,7 +860,7 @@

       s5 = s9;

       s6 = s10;

       h -= 4;

-    } while (h > 0);

+    } while (h != 0);

   } else {

     const int16x8_t filter3 = vdupq_lane_s16(vget_low_s16(filters), 3);

     const int16x8_t filter4 = vdupq_lane_s16(vget_high_s16(filters), 0);

@@ -950,10 +950,10 @@

         s5 = s9;

         s6 = s10;

         height -= 4;

-      } while (height > 0);

+      } while (height != 0);

       src += 8;

       dst += 8;

       w -= 8;

-    } while (w > 0);

+    } while (w != 0);

   }

 }

--- a/vpx_dsp/arm/vpx_convolve_avg_neon.c

+++ b/vpx_dsp/arm/vpx_convolve_avg_neon.c

@@ -43,7 +43,7 @@

       vst1_lane_u32((uint32_t *)dst, vreinterpret_u32_u8(dd0), 1);

       dst += dst_stride;

       h -= 2;

-    } while (h > 0);

+    } while (h != 0);

   } else if (w == 8) {  // avg8

     uint8x8_t s0, s1, d0, d1;

     uint8x16_t s01, d01;

@@ -64,7 +64,7 @@

       vst1_u8(dst, vget_high_u8(d01));

       dst += dst_stride;

       h -= 2;

-    } while (h > 0);

+    } while (h != 0);

   } else if (w < 32) {  // avg16

     uint8x16_t s0, s1, d0, d1;

     do {

@@ -83,7 +83,7 @@

       vst1q_u8(dst, d1);

       dst += dst_stride;

       h -= 2;

-    } while (h > 0);

+    } while (h != 0);

   } else if (w == 32) {  // avg32

     uint8x16_t s0, s1, s2, s3, d0, d1, d2, d3;

     do {

@@ -110,7 +110,7 @@

       vst1q_u8(dst + 16, d3);

       dst += dst_stride;

       h -= 2;

-    } while (h > 0);

+    } while (h != 0);

   } else {  // avg64

     uint8x16_t s0, s1, s2, s3, d0, d1, d2, d3;

     do {

--- a/vpx_dsp/arm/vpx_convolve_copy_neon.c

+++ b/vpx_dsp/arm/vpx_convolve_copy_neon.c

@@ -33,7 +33,7 @@

       src += src_stride;

       dst += dst_stride;

       h -= 2;

-    } while (h > 0);

+    } while (h != 0);

   } else if (w == 8) {  // copy8

     uint8x8_t s0, s1;

     do {

@@ -47,7 +47,7 @@

       vst1_u8(dst, s1);

       dst += dst_stride;

       h -= 2;

-    } while (h > 0);

+    } while (h != 0);

   } else if (w < 32) {  // copy16

     uint8x16_t s0, s1;

     do {

@@ -61,7 +61,7 @@

       vst1q_u8(dst, s1);

       dst += dst_stride;

       h -= 2;

-    } while (h > 0);

+    } while (h != 0);

   } else if (w == 32) {  // copy32

     uint8x16_t s0, s1, s2, s3;

     do {

@@ -79,7 +79,7 @@

       vst1q_u8(dst + 16, s3);

       dst += dst_stride;

       h -= 2;

-    } while (h > 0);

+    } while (h != 0);

   } else {  // copy64

     uint8x16_t s0, s1, s2, s3;

     do {