diff options
| -rw-r--r-- | vp9/common/blockd.h | 3 | ||||
| -rw-r--r-- | vp9/common/findnearmv.c | 10 |
2 files changed, 8 insertions, 5 deletions
diff --git a/vp9/common/blockd.h b/vp9/common/blockd.h index 523ee225c..b3c8ff33c 100644 --- a/vp9/common/blockd.h +++ b/vp9/common/blockd.h @@ -505,6 +505,9 @@ static TX_TYPE get_tx_type_8x8(const MACROBLOCKD *xd, const BLOCKD *b) { static TX_TYPE get_tx_type_16x16(const MACROBLOCKD *xd, const BLOCKD *b) { TX_TYPE tx_type = DCT_DCT; if (xd->mode_info_context->mbmi.mode < I8X8_PRED && +#if CONFIG_SUPERBLOCKS + !xd->mode_info_context->mbmi.encoded_as_sb && +#endif xd->q_index < ACTIVE_HT16) { tx_type = txfm_map(pred_mode_conv(xd->mode_info_context->mbmi.mode)); } diff --git a/vp9/common/findnearmv.c b/vp9/common/findnearmv.c index a2bb0f207..2daa344d7 100644 --- a/vp9/common/findnearmv.c +++ b/vp9/common/findnearmv.c @@ -155,7 +155,7 @@ unsigned int vp9_variance2x32_c(const unsigned char *src_ptr, variance(src_ptr, source_stride, ref_ptr, recon_stride, 2, 32, &var, &avg); *sse = var; - return (var - (((unsigned int)avg * avg) >> 5)); + return (var - (((unsigned int)avg * avg) >> 6)); } unsigned int vp9_variance32x2_c(const unsigned char *src_ptr, @@ -168,7 +168,7 @@ unsigned int vp9_variance32x2_c(const unsigned char *src_ptr, variance(src_ptr, source_stride, ref_ptr, recon_stride, 32, 2, &var, &avg); *sse = var; - return (var - (((unsigned int)avg * avg) >> 5)); + return (var - (((unsigned int)avg * avg) >> 6)); } unsigned int vp9_sub_pixel_variance32x2_c(const unsigned char *src_ptr, @@ -189,10 +189,10 @@ unsigned int vp9_sub_pixel_variance32x2_c(const unsigned char *src_ptr, src_pixels_per_line, 1, 3, 32, HFilter); var_filter_block2d_bil_second_pass(FData3, temp2, 32, 32, 2, 32, VFilter); - return vp9_variance16x2_c(temp2, 32, dst_ptr, dst_pixels_per_line, sse); + return vp9_variance32x2_c(temp2, 32, dst_ptr, dst_pixels_per_line, sse); } -unsigned int vp9_sub_pixel_variance2x16_c(const unsigned char *src_ptr, +unsigned int vp9_sub_pixel_variance2x32_c(const unsigned char *src_ptr, const int src_pixels_per_line, const int xoffset, const int yoffset, @@ -210,7 +210,7 @@ unsigned int vp9_sub_pixel_variance2x16_c(const unsigned char *src_ptr, src_pixels_per_line, 1, 33, 2, HFilter); var_filter_block2d_bil_second_pass(FData3, temp2, 2, 2, 32, 2, VFilter); - return vp9_variance2x16_c(temp2, 2, dst_ptr, dst_pixels_per_line, sse); + return vp9_variance2x32_c(temp2, 2, dst_ptr, dst_pixels_per_line, sse); } #endif #endif |