summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYaowu Xu <yaowu@google.com>2016-06-28 16:55:44 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2016-06-28 16:55:44 +0000
commitb2d690187e0386546ba482a877770e67761f2f80 (patch)
treeecd563010af4228e0a46aa1941faee9ef369bfb0
parent10b4753179ee2a0e152ebd48131f294594983db7 (diff)
parentd34b49d7b9d6d32d5e291e9c47687e744d893017 (diff)
downloadlibvpx-b2d690187e0386546ba482a877770e67761f2f80.tar
libvpx-b2d690187e0386546ba482a877770e67761f2f80.tar.gz
libvpx-b2d690187e0386546ba482a877770e67761f2f80.tar.bz2
libvpx-b2d690187e0386546ba482a877770e67761f2f80.zip
Merge "psnr.c: use int64_t for sum of differences"
-rw-r--r--vpx_dsp/psnr.c4
1 files changed, 2 insertions, 2 deletions
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;