diff options
| -rw-r--r-- | build/make/configure.sh | 6 | ||||
| -rw-r--r-- | vpx_dsp/psnr.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/build/make/configure.sh b/build/make/configure.sh index 4f0071bb5..f2b8b3765 100644 --- a/build/make/configure.sh +++ b/build/make/configure.sh @@ -1153,13 +1153,13 @@ EOF if [ -n "${tune_cpu}" ]; then case ${tune_cpu} in p5600) - check_add_cflags -mips32r5 -funroll-loops -mload-store-pairs + check_add_cflags -mips32r5 -mload-store-pairs check_add_cflags -msched-weight -mhard-float -mfp64 check_add_asflags -mips32r5 -mhard-float -mfp64 check_add_ldflags -mfp64 ;; - i6400) - check_add_cflags -mips64r6 -mabi=64 -funroll-loops -msched-weight + i6400|p6600) + check_add_cflags -mips64r6 -mabi=64 -msched-weight check_add_cflags -mload-store-pairs -mhard-float -mfp64 check_add_asflags -mips64r6 -mabi=64 -mhard-float -mfp64 check_add_ldflags -mips64r6 -mabi=64 -mfp64 diff --git a/vpx_dsp/psnr.c b/vpx_dsp/psnr.c index 1655f116c..5bf786271 100644 --- a/vpx_dsp/psnr.c +++ b/vpx_dsp/psnr.c @@ -51,7 +51,7 @@ static void encoder_variance(const uint8_t *a, int a_stride, static void encoder_highbd_variance64(const uint8_t *a8, int a_stride, const uint8_t *b8, int b_stride, int w, int h, uint64_t *sse, - uint64_t *sum) { + int64_t *sum) { int i, j; uint16_t *a = CONVERT_TO_SHORTPTR(a8); @@ -75,7 +75,7 @@ static void encoder_highbd_8_variance(const uint8_t *a8, int a_stride, int w, int h, unsigned int *sse, int *sum) { uint64_t sse_long = 0; - uint64_t sum_long = 0; + int64_t sum_long = 0; encoder_highbd_variance64(a8, a_stride, b8, b_stride, w, h, &sse_long, &sum_long); *sse = (unsigned int)sse_long; |