ref: 94bba48525d6a1ff333c2336896b9482247f7c83
parent: 2b2fc812f1a1606039ce041836adf53ac5518703
parent: 54293ee3c7be3fd1b7880e2049fd07370a52d10f
author: Adrian Grange <agrange@google.com>
date: Fri Feb 27 10:42:08 EST 2015
Merge "Fix calc_highbd_psnr"
--- a/vp9/encoder/vp9_encoder.c
+++ b/vp9/encoder/vp9_encoder.c
@@ -2002,8 +2002,10 @@
PSNR_STATS *psnr,
unsigned int bit_depth,
unsigned int in_bit_depth) {
- const int widths[3] = {a->y_width, a->uv_width, a->uv_width };
- const int heights[3] = {a->y_height, a->uv_height, a->uv_height};
+ const int widths[3] =
+ {a->y_crop_width, a->uv_crop_width, a->uv_crop_width };
+ const int heights[3] =
+ {a->y_crop_height, a->uv_crop_height, a->uv_crop_height};
const uint8_t *a_planes[3] = {a->y_buffer, a->u_buffer, a->v_buffer };
const int a_strides[3] = {a->y_stride, a->uv_stride, a->uv_stride};
const uint8_t *b_planes[3] = {b->y_buffer, b->u_buffer, b->v_buffer };