shithub: libvpx

Info  •  Files  •  Log  •  Branches

Adding consts to arguments of vp9_block_error().

Change-Id: Id145da99259866109cfee8b47a1d8f309944b937

--- a/vp9/common/vp9_rtcd_defs.sh

+++ b/vp9/common/vp9_rtcd_defs.sh

@@ -683,7 +683,7 @@

 specialize vp9_get_mb_ss mmx sse2

 # ENCODEMB INVOKE

-prototype int64_t vp9_block_error "int16_t *coeff, int16_t *dqcoeff, intptr_t block_size, int64_t *ssz"

+prototype int64_t vp9_block_error "const int16_t *coeff, const int16_t *dqcoeff, intptr_t block_size, int64_t *ssz"

 specialize vp9_block_error $sse2_x86inc

 prototype void vp9_subtract_block "int rows, int cols, int16_t *diff_ptr, ptrdiff_t diff_stride, const uint8_t *src_ptr, ptrdiff_t src_stride, const uint8_t *pred_ptr, ptrdiff_t pred_stride"

--- a/vp9/encoder/vp9_rdopt.c

+++ b/vp9/encoder/vp9_rdopt.c

@@ -525,15 +525,15 @@

   *out_dist_sum = dist_sum << 4;

 }

-int64_t vp9_block_error_c(int16_t *coeff, int16_t *dqcoeff,

+int64_t vp9_block_error_c(const int16_t *coeff, const int16_t *dqcoeff,

                           intptr_t block_size, int64_t *ssz) {

   int i;

   int64_t error = 0, sqcoeff = 0;

   for (i = 0; i < block_size; i++) {

-    int this_diff = coeff[i] - dqcoeff[i];

-    error += (unsigned)this_diff * this_diff;

-    sqcoeff += (unsigned) coeff[i] * coeff[i];

+    const int diff = coeff[i] - dqcoeff[i];

+    error +=  diff * diff;

+    sqcoeff += coeff[i] * coeff[i];

   }

   *ssz = sqcoeff;