diff options
author | Dmitry Kovalev <dkovalev@google.com> | 2014-02-28 10:51:43 -0800 |
---|---|---|
committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-02-28 10:51:43 -0800 |
commit | 28bd1dd15e7cb613db0a14a0cda961c606e3229c (patch) | |
tree | c08f05a68c4b2f4feb32b84d0b8fedbff63ced2d | |
parent | 51e0e0c0a7b10020fd1263aaa56bc4834cc908a7 (diff) | |
parent | 791e9bdac9b64e4a1c4ff819551f08b065d90ef7 (diff) | |
download | libvpx-28bd1dd15e7cb613db0a14a0cda961c606e3229c.tar libvpx-28bd1dd15e7cb613db0a14a0cda961c606e3229c.tar.gz libvpx-28bd1dd15e7cb613db0a14a0cda961c606e3229c.tar.bz2 libvpx-28bd1dd15e7cb613db0a14a0cda961c606e3229c.zip |
Merge "Adding consts to arguments of vp9_block_error()."
-rw-r--r-- | vp9/common/vp9_rtcd_defs.sh | 2 | ||||
-rw-r--r-- | vp9/encoder/vp9_rdopt.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/vp9/common/vp9_rtcd_defs.sh b/vp9/common/vp9_rtcd_defs.sh index 4031bda55..83ee69b7e 100644 --- a/vp9/common/vp9_rtcd_defs.sh +++ b/vp9/common/vp9_rtcd_defs.sh @@ -683,7 +683,7 @@ prototype unsigned int vp9_get_mb_ss "const int16_t *" 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" diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c index 5d8ae59ff..b57b94806 100644 --- a/vp9/encoder/vp9_rdopt.c +++ b/vp9/encoder/vp9_rdopt.c @@ -520,15 +520,15 @@ static void model_rd_for_sb_y_tx(VP9_COMP *cpi, BLOCK_SIZE bsize, *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; |