diff options
author | Deb Mukherjee <debargha@google.com> | 2014-10-03 11:37:47 -0700 |
---|---|---|
committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-10-03 11:37:47 -0700 |
commit | 2c7b94f6ecb7c1b3a6807259dcfd23dfa471d0c4 (patch) | |
tree | 8dc4652dc40bfbe96fdef1e3a9f166307486561a | |
parent | 00a4b20fbecc1137ff9a0421d51f4131013bb70a (diff) | |
parent | 431cdc33eee902bbc1c4272a8551e3734fe4a16f (diff) | |
download | libvpx-2c7b94f6ecb7c1b3a6807259dcfd23dfa471d0c4.tar libvpx-2c7b94f6ecb7c1b3a6807259dcfd23dfa471d0c4.tar.gz libvpx-2c7b94f6ecb7c1b3a6807259dcfd23dfa471d0c4.tar.bz2 libvpx-2c7b94f6ecb7c1b3a6807259dcfd23dfa471d0c4.zip |
Merge "Prevent negative cost for highbitdepth"
-rw-r--r-- | vp9/encoder/vp9_rdopt.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c index b14ff0822..0ae0d5757 100644 --- a/vp9/encoder/vp9_rdopt.c +++ b/vp9/encoder/vp9_rdopt.c @@ -491,7 +491,9 @@ static void block_rd_txfm(int plane, int block, BLOCK_SIZE plane_bsize, if (x->plane[plane].eobs[block]) { int64_t dc_correct = coeff[0] * coeff[0] - (coeff[0] - dqcoeff[0]) * (coeff[0] - dqcoeff[0]); - +#if CONFIG_VP9_HIGHBITDEPTH + dc_correct >>= ((xd->bd - 8) * 2); +#endif if (tx_size != TX_32X32) dc_correct >>= 2; |