shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Silience -wextra warnings in vp9_reconintra.c"

--- a/vp9/common/vp9_reconintra.c

+++ b/vp9/common/vp9_reconintra.c

@@ -31,6 +31,9 @@

   ADST_ADST,  // TM

 };

+// This serves as a wrapper function, so that all the prediction functions

+// can be unified and accessed as a pointer array. Note that the boundary

+// above and left are not necessarily used all the time.

 #define intra_pred_sized(type, size) \

   void vp9_##type##_predictor_##size##x##size##_c(uint8_t *dst, \

                                                   ptrdiff_t stride, \

@@ -48,7 +51,7 @@

 static INLINE void d207_predictor(uint8_t *dst, ptrdiff_t stride, int bs,

                                   const uint8_t *above, const uint8_t *left) {

   int r, c;

-

+  (void) above;

   // first column

   for (r = 0; r < bs - 1; ++r)

     dst[r * stride] = ROUND_POWER_OF_TWO(left[r] + left[r + 1], 1);

@@ -77,6 +80,7 @@

 static INLINE void d63_predictor(uint8_t *dst, ptrdiff_t stride, int bs,

                                  const uint8_t *above, const uint8_t *left) {

   int r, c;

+  (void) left;

   for (r = 0; r < bs; ++r) {

     for (c = 0; c < bs; ++c)

       dst[c] = r & 1 ? ROUND_POWER_OF_TWO(above[r/2 + c] +

@@ -92,6 +96,7 @@

 static INLINE void d45_predictor(uint8_t *dst, ptrdiff_t stride, int bs,

                                  const uint8_t *above, const uint8_t *left) {

   int r, c;

+  (void) left;

   for (r = 0; r < bs; ++r) {

     for (c = 0; c < bs; ++c)

       dst[c] = r + c + 2 < bs * 2 ?  ROUND_POWER_OF_TWO(above[r + c] +

@@ -184,6 +189,7 @@

 static INLINE void v_predictor(uint8_t *dst, ptrdiff_t stride, int bs,

                                const uint8_t *above, const uint8_t *left) {

   int r;

+  (void) left;

   for (r = 0; r < bs; r++) {

     vpx_memcpy(dst, above, bs);

@@ -195,6 +201,7 @@

 static INLINE void h_predictor(uint8_t *dst, ptrdiff_t stride, int bs,

                                const uint8_t *above, const uint8_t *left) {

   int r;

+  (void) above;

   for (r = 0; r < bs; r++) {

     vpx_memset(dst, left[r], bs);

@@ -219,6 +226,8 @@

 static INLINE void dc_128_predictor(uint8_t *dst, ptrdiff_t stride, int bs,

                                     const uint8_t *above, const uint8_t *left) {

   int r;

+  (void) above;

+  (void) left;

   for (r = 0; r < bs; r++) {

     vpx_memset(dst, 128, bs);

@@ -231,6 +240,7 @@

                                      const uint8_t *above,

                                      const uint8_t *left) {

   int i, r, expected_dc, sum = 0;

+  (void) above;

   for (i = 0; i < bs; i++)

     sum += left[i];

@@ -246,6 +256,7 @@

 static INLINE void dc_top_predictor(uint8_t *dst, ptrdiff_t stride, int bs,

                                     const uint8_t *above, const uint8_t *left) {

   int i, r, expected_dc, sum = 0;

+  (void) left;

   for (i = 0; i < bs; i++)

     sum += above[i];