generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "vp9_rdopt: correct size to vpx_sum_squares_2d_i16"

Browse Source
This commit is contained in:
James Zern
2017-03-23 00:53:21 +00:00
committed by Gerrit Code Review
parent ff0e0a76e8 5661cd8ff4
commit f16ea6a6eb
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
vp9/encoder/vp9_rdopt.c
View File

@@ -515,7 +515,8 @@ static int64_t sum_squares_visible(const MACROBLOCKD *xd,
pd->subsampling_y, blk_row); pd->subsampling_y, blk_row);
if (tx_bsize == BLOCK_4X4 || if (tx_bsize == BLOCK_4X4 ||
(b4x4s_to_right_edge >= tx_4x4_w && b4x4s_to_bottom_edge >= tx_4x4_h)) { (b4x4s_to_right_edge >= tx_4x4_w && b4x4s_to_bottom_edge >= tx_4x4_h)) {
sse = (int64_t)vpx_sum_squares_2d_i16(diff, diff_stride, tx_bsize); assert(tx_4x4_w == tx_4x4_h);
sse = (int64_t)vpx_sum_squares_2d_i16(diff, diff_stride, tx_4x4_w << 2);
} else { } else {
int r, c; int r, c;
int max_r = VPXMIN(b4x4s_to_bottom_edge, tx_4x4_h); int max_r = VPXMIN(b4x4s_to_bottom_edge, tx_4x4_h);
@@ -525,7 +526,8 @@ static int64_t sum_squares_visible(const MACROBLOCKD *xd,
for (r = 0; r < max_r; ++r) { for (r = 0; r < max_r; ++r) {
// Skip visiting the sub blocks that are wholly within the UMV. // Skip visiting the sub blocks that are wholly within the UMV.
for (c = 0; c < max_c; ++c) { for (c = 0; c < max_c; ++c) {
sse += (int64_t)vpx_sum_squares_2d_i16(diff, diff_stride, BLOCK_4X4); sse += (int64_t)vpx_sum_squares_2d_i16(
diff + r * diff_stride * 4 + c * 4, diff_stride, 4);
} }
} }
} }

1
vpx_dsp/x86/sum_squares_sse2.c
View File

@@ -123,6 +123,7 @@ uint64_t vpx_sum_squares_2d_i16_sse2(const int16_t *src, int stride, int size) {
return vpx_sum_squares_2d_i16_4x4_sse2(src, stride); return vpx_sum_squares_2d_i16_4x4_sse2(src, stride);
} else { } else {
// Generic case // Generic case
assert(size % 8 == 0);
return vpx_sum_squares_2d_i16_nxn_sse2(src, stride, size); return vpx_sum_squares_2d_i16_nxn_sse2(src, stride, size);
} }
} }