ref: f7c2d2a3de1872451ce91e78c7f6b338f4e40be2
parent: e85607410e7c3ddf50b52944972ed8a48607117b
parent: f9a3d08f1b4c1a41d87d9d74b640d68e9dacda8d
author: Paul Wilkins <[email protected]>
date: Thu Jun 30 12:25:54 EDT 2016
Merge "Fix error in get_smooth_intra_threshold() for 10/12 bit."
--- a/vp9/encoder/vp9_firstpass.c
+++ b/vp9/encoder/vp9_firstpass.c
@@ -532,10 +532,10 @@
ret_val = SMOOTH_INTRA_THRESH;
break;
case VPX_BITS_10:
- ret_val = SMOOTH_INTRA_THRESH >> 2;
+ ret_val = SMOOTH_INTRA_THRESH << 4;
break;
case VPX_BITS_12:
- ret_val = SMOOTH_INTRA_THRESH >> 4;
+ ret_val = SMOOTH_INTRA_THRESH << 8;
break;
default:
assert(0 && "cm->bit_depth should be VPX_BITS_8, "