shithub: libvpx

Download patch

ref: 72a9f06ac2f276d55fc1111012a9b35f6e30b711
parent: b1e97c6a25d53fb2e62e2fb857fbf146bb19cbd3
author: James Zern <jzern@google.com>
date: Thu Feb 11 15:49:56 EST 2016 

vpx_highbd_lpf_vertical_8: remove unused count param

Change-Id: Id16f7259897654831d31642c2d5e0bbe5e13416c


--- a/test/lpf_8_test.cc
+++ b/test/lpf_8_test.cc
@@ -479,8 +479,8 @@
                    &vpx_highbd_lpf_horizontal_16_c, 8, 1),
         make_tuple(&vpx_highbd_lpf_horizontal_16_sse2,
                    &vpx_highbd_lpf_horizontal_16_c, 8, 2),
-        make_tuple(&vpx_highbd_lpf_vertical_8_sse2,
-                   &vpx_highbd_lpf_vertical_8_c, 8, 1),
+        make_tuple(&wrapper_nc<vpx_highbd_lpf_vertical_8_sse2>,
+                   &wrapper_nc<vpx_highbd_lpf_vertical_8_c>, 8, 1),
         make_tuple(&wrapper_nc<vpx_highbd_lpf_vertical_16_sse2>,
                    &wrapper_nc<vpx_highbd_lpf_vertical_16_c>, 8, 1),
         make_tuple(&vpx_highbd_lpf_horizontal_4_sse2,
@@ -493,8 +493,8 @@
                    &vpx_highbd_lpf_horizontal_16_c, 10, 1),
         make_tuple(&vpx_highbd_lpf_horizontal_16_sse2,
                    &vpx_highbd_lpf_horizontal_16_c, 10, 2),
-        make_tuple(&vpx_highbd_lpf_vertical_8_sse2,
-                   &vpx_highbd_lpf_vertical_8_c, 10, 1),
+        make_tuple(&wrapper_nc<vpx_highbd_lpf_vertical_8_sse2>,
+                   &wrapper_nc<vpx_highbd_lpf_vertical_8_c>, 10, 1),
         make_tuple(&wrapper_nc<vpx_highbd_lpf_vertical_16_sse2>,
                    &wrapper_nc<vpx_highbd_lpf_vertical_16_c>, 10, 1),
         make_tuple(&vpx_highbd_lpf_horizontal_4_sse2,
@@ -507,8 +507,8 @@
                    &vpx_highbd_lpf_horizontal_16_c, 12, 1),
         make_tuple(&vpx_highbd_lpf_horizontal_16_sse2,
                    &vpx_highbd_lpf_horizontal_16_c, 12, 2),
-        make_tuple(&vpx_highbd_lpf_vertical_8_sse2,
-                   &vpx_highbd_lpf_vertical_8_c, 12, 1),
+        make_tuple(&wrapper_nc<vpx_highbd_lpf_vertical_8_sse2>,
+                   &wrapper_nc<vpx_highbd_lpf_vertical_8_c>, 12, 1),
         make_tuple(&wrapper_nc<vpx_highbd_lpf_vertical_16_sse2>,
                    &wrapper_nc<vpx_highbd_lpf_vertical_16_c>, 12, 1),
         make_tuple(&wrapper_nc<vpx_highbd_lpf_vertical_16_dual_sse2>,
--- a/vp10/common/loopfilter.c
+++ b/vp10/common/loopfilter.c
@@ -444,10 +444,10 @@
                                          lfi1->hev_thr, bd);
         } else if (mask_8x8_0 & 1) {
           vpx_highbd_lpf_vertical_8(s, pitch, lfi0->mblim, lfi0->lim,
-                                    lfi0->hev_thr, 1, bd);
+                                    lfi0->hev_thr, bd);
         } else {
           vpx_highbd_lpf_vertical_8(s + 8 * pitch, pitch, lfi1->mblim,
-                                    lfi1->lim, lfi1->hev_thr, 1, bd);
+                                    lfi1->lim, lfi1->hev_thr, bd);
         }
       }
 
@@ -1161,7 +1161,7 @@
                                    lfi->hev_thr, bd);
       } else if (mask_8x8 & 1) {
         vpx_highbd_lpf_vertical_8(s, pitch, lfi->mblim, lfi->lim,
-                                  lfi->hev_thr, 1, bd);
+                                  lfi->hev_thr, bd);
       } else if (mask_4x4 & 1) {
         vpx_highbd_lpf_vertical_4(s, pitch, lfi->mblim, lfi->lim,
                                 lfi->hev_thr, 1, bd);
--- a/vp9/common/vp9_loopfilter.c
+++ b/vp9/common/vp9_loopfilter.c
@@ -444,10 +444,10 @@
                                          lfi1->hev_thr, bd);
         } else if (mask_8x8_0 & 1) {
           vpx_highbd_lpf_vertical_8(s, pitch, lfi0->mblim, lfi0->lim,
-                                    lfi0->hev_thr, 1, bd);
+                                    lfi0->hev_thr, bd);
         } else {
           vpx_highbd_lpf_vertical_8(s + 8 * pitch, pitch, lfi1->mblim,
-                                    lfi1->lim, lfi1->hev_thr, 1, bd);
+                                    lfi1->lim, lfi1->hev_thr, bd);
         }
       }
 
@@ -1136,7 +1136,7 @@
                                    lfi->hev_thr, bd);
       } else if (mask_8x8 & 1) {
         vpx_highbd_lpf_vertical_8(s, pitch, lfi->mblim, lfi->lim,
-                                  lfi->hev_thr, 1, bd);
+                                  lfi->hev_thr, bd);
       } else if (mask_4x4 & 1) {
         vpx_highbd_lpf_vertical_4(s, pitch, lfi->mblim, lfi->lim,
                                 lfi->hev_thr, 1, bd);
--- a/vpx_dsp/loopfilter.c
+++ b/vpx_dsp/loopfilter.c
@@ -565,10 +565,10 @@
 
 void vpx_highbd_lpf_vertical_8_c(uint16_t *s, int pitch, const uint8_t *blimit,
                                  const uint8_t *limit, const uint8_t *thresh,
-                                 int count, int bd) {
+                                 int bd) {
   int i;
 
-  for (i = 0; i < 8 * count; ++i) {
+  for (i = 0; i < 8; ++i) {
     const uint16_t p3 = s[-4], p2 = s[-3], p1 = s[-2], p0 = s[-1];
     const uint16_t q0 = s[0], q1 = s[1], q2 = s[2], q3 = s[3];
     const int8_t mask = highbd_filter_mask(*limit, *blimit,
@@ -591,9 +591,9 @@
                                       const uint8_t *limit1,
                                       const uint8_t *thresh1,
                                       int bd) {
-  vpx_highbd_lpf_vertical_8_c(s, pitch, blimit0, limit0, thresh0, 1, bd);
+  vpx_highbd_lpf_vertical_8_c(s, pitch, blimit0, limit0, thresh0, bd);
   vpx_highbd_lpf_vertical_8_c(s + 8 * pitch, pitch, blimit1, limit1,
-                              thresh1, 1, bd);
+                              thresh1, bd);
 }
 
 static INLINE void highbd_filter16(int8_t mask, uint8_t thresh,
--- a/vpx_dsp/vpx_dsp_rtcd_defs.pl
+++ b/vpx_dsp/vpx_dsp_rtcd_defs.pl
@@ -572,7 +572,7 @@
   add_proto qw/void vpx_highbd_lpf_vertical_16_dual/, "uint16_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh, int bd";
   specialize qw/vpx_highbd_lpf_vertical_16_dual sse2/;
 
-  add_proto qw/void vpx_highbd_lpf_vertical_8/, "uint16_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh, int count, int bd";
+  add_proto qw/void vpx_highbd_lpf_vertical_8/, "uint16_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh, int bd";
   specialize qw/vpx_highbd_lpf_vertical_8 sse2/;
 
   add_proto qw/void vpx_highbd_lpf_vertical_8_dual/, "uint16_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, const uint8_t *thresh1, int bd";
--- a/vpx_dsp/x86/highbd_loopfilter_sse2.c
+++ b/vpx_dsp/x86/highbd_loopfilter_sse2.c
@@ -1112,11 +1112,10 @@
                                     const uint8_t *blimit,
                                     const uint8_t *limit,
                                     const uint8_t *thresh,
-                                    int count, int bd) {
+                                    int bd) {
   DECLARE_ALIGNED(16, uint16_t, t_dst[8 * 8]);
   uint16_t *src[1];
   uint16_t *dst[1];
-  (void)count;
 
   // Transpose 8x8
   src[0] = s - 4;