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

variance: call C comp_avg_pred

Browse Source 
Keep optimized code out of the reference implementation. This matches
the style of the other sub calls.

Change-Id: I3da6acd4f2c647b029c420e22ac9410a18259689
This commit is contained in:
Johann
2017-07-14 11:29:32 -07:00
committed by Johann Koenig
parent 666e394d41
commit 4b9a848bb3
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
vpx_dsp/variance.c
View File

@@ -164,7 +164,7 @@ static void var_filter_block2d_bil_second_pass(const uint16_t *a, uint8_t *b,
var_filter_block2d_bil_second_pass(fdata3, temp2, W, W, H, W, \ var_filter_block2d_bil_second_pass(fdata3, temp2, W, W, H, W, \
bilinear_filters[yoffset]); \ bilinear_filters[yoffset]); \
\ \
vpx_comp_avg_pred(temp3, second_pred, W, H, temp2, W); \ vpx_comp_avg_pred_c(temp3, second_pred, W, H, temp2, W); \
\ \
return vpx_variance##W##x##H##_c(temp3, W, b, b_stride, sse); \ return vpx_variance##W##x##H##_c(temp3, W, b, b_stride, sse); \
} }
@@ -463,7 +463,7 @@ static void highbd_var_filter_block2d_bil_second_pass(
highbd_var_filter_block2d_bil_second_pass(fdata3, temp2, W, W, H, W, \ highbd_var_filter_block2d_bil_second_pass(fdata3, temp2, W, W, H, W, \
bilinear_filters[yoffset]); \ bilinear_filters[yoffset]); \
\ \
vpx_highbd_comp_avg_pred(temp3, second_pred, W, H, \ vpx_highbd_comp_avg_pred_c(temp3, second_pred, W, H, \
CONVERT_TO_BYTEPTR(temp2), W); \ CONVERT_TO_BYTEPTR(temp2), W); \
\ \
return vpx_highbd_8_variance##W##x##H##_c(CONVERT_TO_BYTEPTR(temp3), W, \ return vpx_highbd_8_variance##W##x##H##_c(CONVERT_TO_BYTEPTR(temp3), W, \
@@ -483,7 +483,7 @@ static void highbd_var_filter_block2d_bil_second_pass(
highbd_var_filter_block2d_bil_second_pass(fdata3, temp2, W, W, H, W, \ highbd_var_filter_block2d_bil_second_pass(fdata3, temp2, W, W, H, W, \
bilinear_filters[yoffset]); \ bilinear_filters[yoffset]); \
\ \
vpx_highbd_comp_avg_pred(temp3, second_pred, W, H, \ vpx_highbd_comp_avg_pred_c(temp3, second_pred, W, H, \
CONVERT_TO_BYTEPTR(temp2), W); \ CONVERT_TO_BYTEPTR(temp2), W); \
\ \
return vpx_highbd_10_variance##W##x##H##_c(CONVERT_TO_BYTEPTR(temp3), W, \ return vpx_highbd_10_variance##W##x##H##_c(CONVERT_TO_BYTEPTR(temp3), W, \
@@ -503,7 +503,7 @@ static void highbd_var_filter_block2d_bil_second_pass(
highbd_var_filter_block2d_bil_second_pass(fdata3, temp2, W, W, H, W, \ highbd_var_filter_block2d_bil_second_pass(fdata3, temp2, W, W, H, W, \
bilinear_filters[yoffset]); \ bilinear_filters[yoffset]); \
\ \
vpx_highbd_comp_avg_pred(temp3, second_pred, W, H, \ vpx_highbd_comp_avg_pred_c(temp3, second_pred, W, H, \
CONVERT_TO_BYTEPTR(temp2), W); \ CONVERT_TO_BYTEPTR(temp2), W); \
\ \
return vpx_highbd_12_variance##W##x##H##_c(CONVERT_TO_BYTEPTR(temp3), W, \ return vpx_highbd_12_variance##W##x##H##_c(CONVERT_TO_BYTEPTR(temp3), W, \